Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@
"@cozy/minilog": "^1.0.0",
"@sentry/integrations": "^7.114.0",
"@sentry/react": "^8.5.0",
"cozy-bar": "^27.0.0",
"cozy-client": "^60.14.0",
"cozy-bar": "^29.2.0",
"cozy-client": "^60.21.1",
"cozy-dataproxy-lib": "4.11.0",
"cozy-device-helper": "^3.8.0",
"cozy-devtools": "^1.4.1",
Expand All @@ -79,10 +79,10 @@
"cozy-minilog": "^3.10.0",
"cozy-pouch-link": "^60.13.0",
"cozy-realtime": "^5.8.0",
"cozy-search": "^0.13.3",
"cozy-stack-client": "^60.6.0",
"cozy-ui": "^133.0.1",
"cozy-ui-plus": "^2.1.1",
"cozy-search": "^0.16.2",
"cozy-stack-client": "^60.21.1",
"cozy-ui": "^136.0.0",
"cozy-ui-plus": "^4.5.1",
"emoji-js": "3.7.0",
"focus-trap-react": "4.0.1",
"fuse.js": "6.5.3",
Expand All @@ -103,6 +103,7 @@
"redux-raven-middleware": "1.2.0",
"redux-thunk": "2.3.0",
"sinon": "7.5.0",
"twake-i18n": "^0.3.1",
"url-search-params-polyfill": "7.0.1"
}
}
2 changes: 1 addition & 1 deletion src/ducks/AlternativeStore/useAlternativeStore.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { useMemo } from 'react'
import { useExtendI18n } from 'twake-i18n'

import { useQueryAll } from 'cozy-client'
import { IOCozyFile } from 'cozy-client/types/types'
import flag from 'cozy-flags'
import { useExtendI18n } from 'cozy-ui/transpiled/react/providers/I18n'

import { generateI18nConfig } from '@/ducks/AlternativeStore/helpers'
import { transformData } from '@/ducks/AlternativeStore/transformData'
Expand Down
3 changes: 1 addition & 2 deletions src/ducks/apps/Containers.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { connect } from 'react-redux'

import { translate } from 'cozy-ui/transpiled/react/providers/I18n'
import { translate } from 'twake-i18n'

import { getInstalledApps, getRegistryApps } from './index'

Expand Down
2 changes: 1 addition & 1 deletion src/ducks/apps/components/AppInstallation.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import pickBy from 'lodash/pickBy'
import React, { Component } from 'react'
import { PropTypes } from 'react-proptypes'
import { connect } from 'react-redux'
import { translate } from 'twake-i18n'

import { withClient } from 'cozy-client'
import flags from 'cozy-flags'
Expand All @@ -17,7 +18,6 @@ import {
ModalHeader,
ModalFooter
} from 'cozy-ui/transpiled/react/deprecated/Modal'
import { translate } from 'cozy-ui/transpiled/react/providers/I18n'

import storeConfig from '@/config/index.json'
import { APP_TYPE, getAppBySlug, installAppFromRegistry } from '@/ducks/apps'
Expand Down
2 changes: 1 addition & 1 deletion src/ducks/apps/components/ApplicationPage/Details.jsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import PropTypes from 'prop-types'
import React, { useState } from 'react'
import { useLocation, useNavigate } from 'react-router-dom'
import { useI18n } from 'twake-i18n'

import { useClient } from 'cozy-client'
import Button from 'cozy-ui/transpiled/react/Buttons'
import Icon from 'cozy-ui/transpiled/react/Icon'
import Toggle from 'cozy-ui/transpiled/react/Toggle'
import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n'

import androidIcon from '@/assets/icons/platforms/icon-android.svg'
import iosIcon from '@/assets/icons/platforms/icon-ios.svg'
Expand Down
2 changes: 1 addition & 1 deletion src/ducks/apps/components/ApplicationPage/Gallery.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { Component } from 'react'
import { translate } from 'twake-i18n'

import Modal, { ModalContent } from 'cozy-ui/transpiled/react/deprecated/Modal'
import { translate } from 'cozy-ui/transpiled/react/providers/I18n'

export class Gallery extends Component {
constructor(props) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React from 'react'
import { Link, useLocation } from 'react-router-dom'
import { useI18n } from 'twake-i18n'

import { useClient } from 'cozy-client'
import { isFlagshipApp } from 'cozy-device-helper'
Expand All @@ -8,7 +9,6 @@ import Button from 'cozy-ui/transpiled/react/Buttons'
import Icon from 'cozy-ui/transpiled/react/Icon'
import CloudIcon from 'cozy-ui/transpiled/react/Icons/Cloud'
import useBreakpoints from 'cozy-ui/transpiled/react/providers/Breakpoints'
import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n'

import { handleIntent } from './helpers'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { useState } from 'react'
import { useI18n } from 'twake-i18n'

import { useClient, useFetchShortcut } from 'cozy-client'
import { move } from 'cozy-client/dist/models/file'
Expand All @@ -8,7 +9,6 @@ import Icon from 'cozy-ui/transpiled/react/Icon'
import CloudIcon from 'cozy-ui/transpiled/react/Icons/Cloud'
import { useAlert } from 'cozy-ui/transpiled/react/providers/Alert'
import useBreakpoints from 'cozy-ui/transpiled/react/providers/Breakpoints'
import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n'

import { buildFileFromPathQuery } from '@/ducks/queries'

Expand Down
3 changes: 1 addition & 2 deletions src/ducks/apps/components/ApplicationPage/Maintenance.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import React from 'react'

import { translate } from 'cozy-ui/transpiled/react/providers/I18n'
import { translate } from 'twake-i18n'

import maintenanceIllu from '@/assets/illustrations/maintenance.svg'
import ReactMarkdownWrapper from '@/ducks/components/ReactMarkdownWrapper'
Expand Down
2 changes: 1 addition & 1 deletion src/ducks/apps/components/ApplicationPage/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ import FocusTrap from 'focus-trap-react'
import PropTypes from 'prop-types'
import React, { Component } from 'react'
import { Link, useMatch, useParams } from 'react-router-dom'
import { translate } from 'twake-i18n'

import { BarCenter } from 'cozy-bar'
import Button from 'cozy-ui/transpiled/react/Buttons'
import Icon from 'cozy-ui/transpiled/react/Icon'
import Left from 'cozy-ui/transpiled/react/Icons/Left'
import withBreakpoints from 'cozy-ui/transpiled/react/helpers/withBreakpoints'
import { translate } from 'cozy-ui/transpiled/react/providers/I18n'
import AppIcon from 'cozy-ui-plus/dist/AppIcon'

import { getAppIconProps } from '@/ducks/apps'
Expand Down
2 changes: 1 addition & 1 deletion src/ducks/apps/components/ChannelModal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ import compose from 'lodash/flowRight'
import PropTypes from 'prop-types'
import React, { Component } from 'react'
import { connect } from 'react-redux'
import { translate } from 'twake-i18n'

import { withClient } from 'cozy-client'
import Modal from 'cozy-ui/transpiled/react/deprecated/Modal'
import { translate } from 'cozy-ui/transpiled/react/providers/I18n'

import { fetchLatestApp, getAppBySlug, restoreAppIfSaved } from '@/ducks/apps'
import AppInstallation from '@/ducks/apps/components/AppInstallation'
Expand Down
2 changes: 1 addition & 1 deletion src/ducks/apps/components/Discover.jsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import PropTypes from 'prop-types'
import React, { Component } from 'react'
import { useMatch, useSearchParams } from 'react-router-dom'
import { translate } from 'twake-i18n'

import { BarCenter } from 'cozy-bar'
import { Content } from 'cozy-ui/transpiled/react/Layout'
import Typography from 'cozy-ui/transpiled/react/Typography'
import withBreakpoints from 'cozy-ui/transpiled/react/helpers/withBreakpoints'
import { translate } from 'cozy-ui/transpiled/react/providers/I18n'

import { useAlternativeStore } from '@/ducks/AlternativeStore/useAlternativeStore'
import ApplicationRouting from '@/ducks/apps/components/ApplicationRouting'
Expand Down
2 changes: 1 addition & 1 deletion src/ducks/apps/components/InstallModal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ import compose from 'lodash/flowRight'
import PropTypes from 'prop-types'
import React, { Component } from 'react'
import { connect } from 'react-redux'
import { translate } from 'twake-i18n'

import { withClient } from 'cozy-client'
import IntentHeader from 'cozy-ui/transpiled/react/IntentHeader'
import Portal from 'cozy-ui/transpiled/react/Portal'
import Modal from 'cozy-ui/transpiled/react/deprecated/Modal'
import { translate } from 'cozy-ui/transpiled/react/providers/I18n'

import { fetchLatestApp, restoreAppIfSaved } from '@/ducks/apps'
import { hasPendingUpdate } from '@/ducks/apps/appStatus'
Expand Down
2 changes: 1 addition & 1 deletion src/ducks/apps/components/InstallSuccess.jsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import React, { PureComponent } from 'react'
import { translate } from 'twake-i18n'

import Button from 'cozy-ui/transpiled/react/Buttons'
import {
ModalContent,
ModalHeader
} from 'cozy-ui/transpiled/react/deprecated/Modal'
import { translate } from 'cozy-ui/transpiled/react/providers/I18n'
import AppIcon from 'cozy-ui-plus/dist/AppIcon'

import { getAppIconProps } from '@/ducks/apps'
Expand Down
2 changes: 1 addition & 1 deletion src/ducks/apps/components/MyApplications.jsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import React, { Component } from 'react'
import { useMatch, useSearchParams } from 'react-router-dom'
import { translate } from 'twake-i18n'

import { BarCenter } from 'cozy-bar'
import { Content } from 'cozy-ui/transpiled/react/Layout'
import Typography from 'cozy-ui/transpiled/react/Typography'
import withBreakpoints from 'cozy-ui/transpiled/react/helpers/withBreakpoints'
import { translate } from 'cozy-ui/transpiled/react/providers/I18n'

import { useAlternativeStore } from '@/ducks/AlternativeStore/useAlternativeStore'
import ApplicationRouting from '@/ducks/apps/components/ApplicationRouting'
Expand Down
3 changes: 1 addition & 2 deletions src/ducks/apps/components/Partnership.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import React, { Component } from 'react'

import { translate } from 'cozy-ui/transpiled/react/providers/I18n'
import { translate } from 'twake-i18n'

import ReactMarkdownWrapper from '@/ducks/components/ReactMarkdownWrapper'
import { getTranslatedManifestProperty } from '@/lib/helpers'
Expand Down
2 changes: 1 addition & 1 deletion src/ducks/apps/components/PermissionsList.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react'
import { translate } from 'twake-i18n'

import Icon from 'cozy-ui/transpiled/react/Icon'
import { translate } from 'cozy-ui/transpiled/react/providers/I18n'

import localAccessIcon from '@/assets/icons/icon-cloud-in-cozy.svg'
import externalIcon from '@/assets/icons/icon-cloud-out-cozy.svg'
Expand Down
2 changes: 1 addition & 1 deletion src/ducks/apps/components/PermissionsModal.jsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import React from 'react'
import { useLocation, useNavigate } from 'react-router-dom'
import { useI18n } from 'twake-i18n'

import Portal from 'cozy-ui/transpiled/react/Portal'
import Modal, {
ModalContent,
ModalHeader
} from 'cozy-ui/transpiled/react/deprecated/Modal'
import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n'

import PermissionsList from '@/ducks/apps/components/PermissionsList'

Expand Down
2 changes: 1 addition & 1 deletion src/ducks/apps/components/Sections/Sections.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import Fuse from 'fuse.js'
import PropTypes from 'prop-types'
import React, { useState, useEffect, useMemo, useRef } from 'react'
import { useLocation } from 'react-router-dom'
import { useI18n } from 'twake-i18n'

import flag from 'cozy-flags'
import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n'
import AppSections from 'cozy-ui-plus/dist/AppSections'
import * as filterUtils from 'cozy-ui-plus/dist/AppSections/search'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { useState, useRef, forwardRef } from 'react'
import { useI18n } from 'twake-i18n'

import { BarRight } from 'cozy-bar'
import ActionsMenu from 'cozy-ui/transpiled/react/ActionsMenu'
Expand All @@ -12,7 +13,6 @@ import ListItemIcon from 'cozy-ui/transpiled/react/ListItemIcon'
import ListItemText from 'cozy-ui/transpiled/react/ListItemText'
import Radio from 'cozy-ui/transpiled/react/Radios'
import useBreakpoints from 'cozy-ui/transpiled/react/providers/Breakpoints'
import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n'

const Filters = ({ filter, onFilterChange }) => {
const anchorRef = useRef(null)
Expand Down
2 changes: 1 addition & 1 deletion src/ducks/apps/components/Sections/index.spec.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
import { render, fireEvent, act } from '@testing-library/react'
import React from 'react'
import { useLocation } from 'react-router-dom'
import I18n from 'twake-i18n'

import CozyClient, { CozyProvider } from 'cozy-client'
import { BreakpointsProvider } from 'cozy-ui/transpiled/react/providers/Breakpoints'
import I18n from 'cozy-ui/transpiled/react/providers/I18n'

import enLocale from '../../../../locales/en.json'

Expand Down
2 changes: 1 addition & 1 deletion src/ducks/apps/components/SidebarCategories.jsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React from 'react'
import { NavLink as RouterLink, useLocation } from 'react-router-dom'
import { translate } from 'twake-i18n'

import withBreakpoints from 'cozy-ui/transpiled/react/helpers/withBreakpoints'
import { translate } from 'cozy-ui/transpiled/react/providers/I18n'
import { categoryUtils } from 'cozy-ui-plus/dist/AppSections'

import { useAlternativeStore } from '@/ducks/AlternativeStore/useAlternativeStore'
Expand Down
2 changes: 1 addition & 1 deletion src/ducks/apps/components/StoreAppItem.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react'
import { useI18n } from 'twake-i18n'

import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n'
import AppTile from 'cozy-ui-plus/dist/AppTile'

import { getTranslatedManifestProperty } from './helpers'
Expand Down
2 changes: 1 addition & 1 deletion src/ducks/apps/components/UninstallModal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import compose from 'lodash/flowRight'
import PropTypes from 'prop-types'
import React, { Component } from 'react'
import { connect } from 'react-redux'
import { translate } from 'twake-i18n'

import { withClient } from 'cozy-client'
import Intents from 'cozy-interapp'
Expand All @@ -14,7 +15,6 @@ import Modal, {
ModalDescription,
ModalFooter
} from 'cozy-ui/transpiled/react/deprecated/Modal'
import { translate } from 'cozy-ui/transpiled/react/providers/I18n'

import { getAppBySlug, uninstallApp } from '@/ducks/apps'
import ReactMarkdownWrapper from '@/ducks/components/ReactMarkdownWrapper'
Expand Down
3 changes: 1 addition & 2 deletions src/ducks/apps/components/helpers.spec.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { tMock } from 'jestLib/I18n'

import { extend as extendI18n } from 'cozy-ui/transpiled/react/providers/I18n'
import { extend as extendI18n } from 'twake-i18n'

import { getTranslatedManifestProperty } from './helpers'

Expand Down
3 changes: 1 addition & 2 deletions src/ducks/apps/reducers.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
'use strict'

import { combineReducers } from 'redux'

import { extend as extendI18n } from 'cozy-ui/transpiled/react/providers/I18n'
import { extend as extendI18n } from 'twake-i18n'

// initial loading
export const LOADING_APP = 'LOADING_APP'
Expand Down
2 changes: 1 addition & 1 deletion src/ducks/components/App.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import compose from 'lodash/flowRight'
import React, { Component } from 'react'
import { connect } from 'react-redux'
import { translate } from 'twake-i18n'

import { BarComponent } from 'cozy-bar'
import { withClient } from 'cozy-client'
Expand All @@ -10,7 +11,6 @@ import IconSprite from 'cozy-ui/transpiled/react/Icon/Sprite'
import { Layout, Main } from 'cozy-ui/transpiled/react/Layout'
import Alerter from 'cozy-ui/transpiled/react/deprecated/Alerter'
import { BreakpointsProvider } from 'cozy-ui/transpiled/react/providers/Breakpoints'
import { translate } from 'cozy-ui/transpiled/react/providers/I18n'

import { initApp, restoreAppIfSaved } from '@/ducks/apps'
import { AppRouter } from '@/ducks/components/AppRouter'
Expand Down
2 changes: 1 addition & 1 deletion src/ducks/components/PushBanner.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { useState } from 'react'
import { useI18n } from 'twake-i18n'

import Banner from 'cozy-ui/transpiled/react/Banner'
import Button from 'cozy-ui/transpiled/react/Buttons'
Expand All @@ -9,7 +10,6 @@ import OpenwithIcon from 'cozy-ui/transpiled/react/Icons/Openwith'
import Tooltip from 'cozy-ui/transpiled/react/Tooltip'
import Typography from 'cozy-ui/transpiled/react/Typography'
import { useBreakpoints } from 'cozy-ui/transpiled/react/providers/Breakpoints'
import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n'

import GithubIcon from '@/assets/icons/icon-github.svg'

Expand Down
2 changes: 1 addition & 1 deletion src/ducks/components/Root.jsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import React from 'react'
import { Provider } from 'react-redux'
import { HashRouter } from 'react-router-dom'
import { I18n } from 'twake-i18n'

import { BarProvider } from 'cozy-bar'
import { CozyProvider, RealTimeQueries } from 'cozy-client'
import { DataProxyProvider } from 'cozy-dataproxy-lib'
import { WebviewIntentProvider } from 'cozy-intent'
import AlertProvider from 'cozy-ui/transpiled/react/providers/Alert'
import { I18n } from 'cozy-ui/transpiled/react/providers/I18n'
import CozyTheme from 'cozy-ui-plus/dist/providers/CozyTheme'

import App from '@/ducks/components/App'
Expand Down
2 changes: 1 addition & 1 deletion src/ducks/components/Sidebar.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React, { Fragment } from 'react'
import { NavLink as RouterLink, useLocation } from 'react-router-dom'
import { translate } from 'twake-i18n'

import CloudIcon from 'cozy-ui/transpiled/react/Icons/Cloud'
import CompassIcon from 'cozy-ui/transpiled/react/Icons/Compass'
Expand All @@ -11,7 +12,6 @@ import Nav, {
} from 'cozy-ui/transpiled/react/Nav'
import Sidebar from 'cozy-ui/transpiled/react/Sidebar'
import withBreakpoints from 'cozy-ui/transpiled/react/helpers/withBreakpoints'
import { translate } from 'cozy-ui/transpiled/react/providers/I18n'

import config from '@/config/index.json'
import { SidebarCategories } from '@/ducks/apps/Containers'
Expand Down
Loading
Loading