Adjust some icons and wording and update Storage page

manifest.webapp

@@ -46,6 +46,11 @@
       "description": "Required by the cozy-bar to display the icons of the apps",
       "type": "io.cozy.apps",
       "verbs": ["GET", "POST", "PUT"]
+    },
+    "contacts": {
+      "description": "Required by the cozy-bar to display contacts",
+      "type": "io.cozy.contacts",
+      "verbs": ["GET"]
     },
      "konnectors": {
       "description": "Required to get the list of konnectors",

package.json

@@ -46,7 +46,7 @@
     "npm-run-all": "4.1.5",
     "react-hot-loader": "4.13.0",
     "react-test-renderer": "18.2.0",
-    "rsbuild-config-cozy-app": "^0.3.0",
+    "rsbuild-config-cozy-app": "^0.5.0",
     "swc_mut_cjs_exports": "^8.0.1",
     "typescript-plugin-css-modules": "3.4.0"
   },
@@ -55,8 +55,9 @@
     "@sentry/integrations": "7.118.0",
     "@sentry/react": "7.118.0",
     "classnames": "2.3.1",
-    "cozy-bar": "^16.1.0",
-    "cozy-client": "^57.5.0",
+    "cozy-bar": "^19.2.0",
+    "cozy-client": "^57.6.0",
+    "cozy-dataproxy-lib": "^4.1.0",
     "cozy-device-helper": "^3.8.0",
     "cozy-devtools": "^1.3.0",
     "cozy-doctypes": "^1.97.2",
@@ -65,10 +66,11 @@
     "cozy-intent": "^2.30.0",
     "cozy-interapp": "^0.16.0",
     "cozy-keys-lib": "^6.3.0",
+    "cozy-pouch-link": "^57.6.1",
     "cozy-realtime": "^5.6.4",
     "cozy-sharing": "^25.0.0",
     "cozy-stack-client": "^57.2.0",
-    "cozy-ui": "^121.1.1",
+    "cozy-ui": "^122.1.1",
     "identity-obj-proxy": "^3.0.0",
     "piwik-react-router": "0.12.1",
     "prop-types": "15.8.1",

src/components/AppProviders.jsx

@@ -2,6 +2,12 @@ import React from 'react'
 import { HashRouter } from 'react-router-dom'
 import { Provider, connect } from 'react-redux'
 import AlertProvider from 'cozy-ui/transpiled/react/providers/Alert'
+import {
+  FILES_DOCTYPE,
+  CONTACTS_DOCTYPE,
+  APPS_DOCTYPE
+} from '@/doctypes'
+import { DataProxyProvider } from 'cozy-dataproxy-lib'
 
 import I18n from 'cozy-ui/transpiled/react/providers/I18n'
 import { BreakpointsProvider } from 'cozy-ui/transpiled/react/providers/Breakpoints'
@@ -44,11 +50,15 @@ const AppProviders = ({ client, store, children }) => {
               <BreakpointsProvider>
                 <AlertProvider>
                   <CozyTheme className="u-w-100">
+                  <DataProxyProvider options={{
+                doctypes: [FILES_DOCTYPE, CONTACTS_DOCTYPE, APPS_DOCTYPE]
+              }}>
                     <BarProvider>
                       <PremiumProvider>
                         <HashRouter>{children}</HashRouter>
                       </PremiumProvider>
                     </BarProvider>
+                    </DataProxyProvider>
                   </CozyTheme>
                 </AlertProvider>
               </BreakpointsProvider>

src/components/Devices/__snapshots__/DevicesModaleConfigureView.spec.jsx.snap

@@ -1362,7 +1362,7 @@ Object {
             class="MuiDialogActions-root cozyDialogActions"
           >
             <button
-              class="MuiButtonBase-root MuiButton-root MuiButton-outlined customColor-primary MuiButton-outlinedPrimary MuiButton-disableElevation"
+              class="MuiButtonBase-root MuiButton-root MuiButton-outlined customColor-primary customSize-default MuiButton-outlinedPrimary MuiButton-disableElevation"
               tabindex="0"
               type="button"
             >
@@ -1376,7 +1376,7 @@ Object {
               />
             </button>
             <button
-              class="MuiButtonBase-root MuiButton-root MuiButton-contained customColor-primary MuiButton-containedPrimary MuiButton-disableElevation"
+              class="MuiButtonBase-root MuiButton-root MuiButton-contained customColor-primary customSize-default MuiButton-containedPrimary MuiButton-disableElevation"
               tabindex="0"
               type="button"
             >

src/components/Devices/helpers.js

@@ -3,17 +3,18 @@ import semver from 'semver'
 import flag from 'cozy-flags'
 
 import { COZY_DESKTOP_SOFTWARE_ID } from '@/lib/deviceConfigurationHelper'
-import mobileIcon from '@/assets/icons/icon-device-phone.svg'
-import browserIcon from '@/assets/icons/icon-device-browser.svg'
-import laptopIcon from '@/assets/icons/icon-device-laptop.svg'
+
+import PhoneIcon from 'cozy-ui/transpiled/react/Icons/Phone'
+import LaptopIcon from 'cozy-ui/transpiled/react/Icons/Laptop'
+import DeviceBrowserIcon from 'cozy-ui/transpiled/react/Icons/DeviceBrowser'
 
 const deviceKindToIcon = {
-  mobile: mobileIcon,
-  browser: browserIcon
+  mobile: PhoneIcon,
+  browser: DeviceBrowserIcon
 }
 
 export const getDeviceIcon = device => {
-  return deviceKindToIcon[device.client_kind] || laptopIcon
+  return deviceKindToIcon[device.client_kind] || LaptopIcon
 }
 
 const isCozyDesktopApp = device =>

src/components/Sidebar.tsx

@@ -5,7 +5,7 @@ import GlobeIcon from 'cozy-ui/transpiled/react/Icons/Globe'
 import PaletteIcon from 'cozy-ui/transpiled/react/Icons/Palette'
 import GraphCircle from 'cozy-ui/transpiled/react/Icons/GraphCircle'
 import HandIcon from 'cozy-ui/transpiled/react/Icons/Hand'
-import HelpIcon from 'cozy-ui/transpiled/react/Icons/Help'
+import HelpOutlinedIcon from 'cozy-ui/transpiled/react/Icons/HelpOutlined'
 import LockScreen from 'cozy-ui/transpiled/react/Icons/LockScreen'
 import Logout from 'cozy-ui/transpiled/react/Icons/Logout'
 import PeopleIcon from 'cozy-ui/transpiled/react/Icons/People'
@@ -108,7 +108,7 @@ export const Sidebar = (): JSX.Element => {
           primary={t('Nav.primary_faq')}
           href={routes.external_faq}
           target="_blank"
-          icon={HelpIcon}
+          icon={HelpOutlinedIcon}
         />
         <MenuItemNavLink
           to={routes.support}

src/components/Subscription/SubscriptionMenuItem.jsx

@@ -1,7 +1,7 @@
 import React from 'react'
 
 import flag from 'cozy-flags'
-import CozyCircle from 'cozy-ui/transpiled/react/Icons/CozyCircle'
+import CloudIcon from 'cozy-ui/transpiled/react/Icons/Cloud'
 import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n'
 
 import { MenuItemAnchor } from '@/components/menu/MenuItemAnchor'
@@ -21,7 +21,7 @@ const SubscriptionMenuItem = () => {
       <MenuItemNavLink
         to={routes.subscription}
         primary={t('Nav.primary_plan')}
-        icon={CozyCircle}
+        icon={CloudIcon}
       />
     )
   }
@@ -32,7 +32,7 @@ const SubscriptionMenuItem = () => {
         primary={t('Nav.primary_plan')}
         href={premiumLink}
         target="_blank"
-        icon={CozyCircle}
+        icon={CloudIcon}
       />
     )
   }

src/doctypes/index.js

@@ -3,3 +3,5 @@ export const KONNECTORS_DOCTYPE = 'io.cozy.konnectors'
 export const REMOTE_REQUEST_DOCTYPES = 'io.cozy.remote.requests'
 export const SETTINGS_DOCTYPE = 'io.cozy.settings'
 export const OAUTH_CLIENTS_DOCTYPE = 'io.cozy.oauth.clients'
+export const FILES_DOCTYPE = 'io.cozy.files'
+export const CONTACTS_DOCTYPE = 'io.cozy.contacts'

src/locales/en.json

@@ -76,7 +76,7 @@
     "connected_devices": "Connected devices",
     "email_notifications": "E-mail notifications",
     "header_data": "Security and data",
-    "header_flagship": "Cozy App",
+    "header_flagship": "Twake App",
     "header_general": "Overview",
     "header_other": "More",
     "permissions": "Permissions",

src/locales/fr.json

@@ -76,7 +76,7 @@
     "connected_devices": "Appareils connectés",
     "email_notifications": "Notifications par e-mail",
     "header_data": "Sécurité et accès aux données",
-    "header_flagship": "Application Cozy",
+    "header_flagship": "Application Twake",
     "header_general": "Général",
     "header_other": "Autres",
     "permissions": "Permissions",

src/locales/nl_NL.json

@@ -76,7 +76,7 @@
     "connected_devices": "Verbonden diensten",
     "email_notifications": "E-mailmeldingen",
     "header_data": "Beveiliging en gegevens",
-    "header_flagship": "Cozy-app",
+    "header_flagship": "Twake App",
     "header_general": "Overzicht",
     "header_other": "Meer",
     "permissions": "Bevoegdheden",

test/jestLib/setup.js

@@ -16,6 +16,10 @@ jest.mock('../../src/actions/domUtils.js', () => ({
   getStackToken: () => 'http://test.mycozy.cloud'
 }))
 
+jest.mock('cozy-dataproxy-lib', () => ({
+  DataProxyProvider: ({ children }) => children
+}))
+
 // polyfill for requestAnimationFrame
 /* istanbul ignore next */
 global.requestAnimationFrame = cb => {