From a572789a41411d69308e05b655ff960353f633b7 Mon Sep 17 00:00:00 2001
From: Enguerran <enguerran@ticabri.com>
Date: Wed, 4 Oct 2017 12:05:08 +0200
Subject: [PATCH 01/30] prettier

---
 config/webpack.config.base.js             | 17 +++---
 config/webpack.config.cozy-ui.js          |  6 ++-
 config/webpack.config.dev.js              | 10 ++--
 config/webpack.config.disable-contexts.js |  4 +-
 config/webpack.config.manifest.js         | 13 +++--
 config/webpack.config.pictures.js         |  2 +-
 config/webpack.config.preact.js           | 14 ++---
 config/webpack.config.vendors.js          |  7 ++-
 config/webpack.target.browser.js          | 64 ++++++++++++++---------
 config/webpack.target.mobile.js           |  6 +--
 webpack.config.js                         |  6 ++-
 11 files changed, 92 insertions(+), 57 deletions(-)

diff --git a/config/webpack.config.base.js b/config/webpack.config.base.js
index 284ed30840..812d7baf59 100644
--- a/config/webpack.config.base.js
+++ b/config/webpack.config.base.js
@@ -7,7 +7,7 @@ const ExtractTextPlugin = require('extract-text-webpack-plugin')
 
 const SRC_DIR = path.resolve(__dirname, '../src')
 
-module.exports = function (production) {
+module.exports = function(production) {
   return {
     resolve: {
       modules: ['node_modules', SRC_DIR],
@@ -44,16 +44,16 @@ module.exports = function (production) {
                 loader: 'postcss-loader',
                 options: {
                   sourceMap: true,
-                  plugins: () => [require('autoprefixer')({ browsers: ['last 2 versions'] })]
+                  plugins: () => [
+                    require('autoprefixer')({ browsers: ['last 2 versions'] })
+                  ]
                 }
               }
             ]
           })
         }
       ],
-      noParse: [
-        /localforage\/dist/
-      ]
+      noParse: [/localforage\/dist/]
     },
     plugins: [
       new ScriptExtHtmlWebpackPlugin({
@@ -67,7 +67,12 @@ module.exports = function (production) {
           require('postcss-discard-duplicates'),
           require('postcss-discard-empty')
         ].concat(
-          production ? require('csswring')({preservehacks: true, removeallcomments: true}) : []
+          production
+            ? require('csswring')({
+                preservehacks: true,
+                removeallcomments: true
+              })
+            : []
         )
       })
     ]
diff --git a/config/webpack.config.cozy-ui.js b/config/webpack.config.cozy-ui.js
index 1baeed0a23..3261856b37 100644
--- a/config/webpack.config.cozy-ui.js
+++ b/config/webpack.config.cozy-ui.js
@@ -31,7 +31,9 @@ module.exports = {
               loader: 'postcss-loader',
               options: {
                 sourceMap: true,
-                plugins: () => [require('autoprefixer')({ browsers: ['last 2 versions'] })]
+                plugins: () => [
+                  require('autoprefixer')({ browsers: ['last 2 versions'] })
+                ]
               }
             },
             'stylus-loader'
@@ -44,7 +46,7 @@ module.exports = {
     new LoaderOptionsPlugin({
       options: {
         stylus: {
-          use: [ require('cozy-ui/stylus')() ]
+          use: [require('cozy-ui/stylus')()]
         }
       }
     })
diff --git a/config/webpack.config.dev.js b/config/webpack.config.dev.js
index 6501686701..19d847f6fa 100644
--- a/config/webpack.config.dev.js
+++ b/config/webpack.config.dev.js
@@ -6,10 +6,12 @@ module.exports = {
   devtool: '#source-map',
   externals: ['cozy'],
   module: {
-    rules: [{
-      test: require.resolve('cozy-bar/dist/cozy-bar.js'),
-      loader: 'imports-loader?css=./cozy-bar.css'
-    }]
+    rules: [
+      {
+        test: require.resolve('cozy-bar/dist/cozy-bar.js'),
+        loader: 'imports-loader?css=./cozy-bar.css'
+      }
+    ]
   },
   plugins: [
     new DefinePlugin({
diff --git a/config/webpack.config.disable-contexts.js b/config/webpack.config.disable-contexts.js
index db8d1c93b2..94d30076fa 100644
--- a/config/webpack.config.disable-contexts.js
+++ b/config/webpack.config.disable-contexts.js
@@ -3,7 +3,5 @@
 const { IgnorePlugin } = require('webpack')
 
 module.exports = {
-  plugins: [
-    new IgnorePlugin(/^\.\.\/contexts/)
-  ]
+  plugins: [new IgnorePlugin(/^\.\.\/contexts/)]
 }
diff --git a/config/webpack.config.manifest.js b/config/webpack.config.manifest.js
index c43e3c5917..75357250a8 100644
--- a/config/webpack.config.manifest.js
+++ b/config/webpack.config.manifest.js
@@ -2,14 +2,16 @@
 
 const CopyPlugin = require('copy-webpack-plugin')
 
-module.exports = function (production, app) {
+module.exports = function(production, app) {
   // Method to modify the manifest slug on dev builds. On production builds the
   // manifest should be copied without modification.
   //
   // For dev builds we use the generic "app" slug to share the same application
   // domain for each applications.
-  function transformManifest (buffer) {
-    if (production) { return buffer }
+  function transformManifest(buffer) {
+    if (production) {
+      return buffer
+    }
 
     const content = JSON.parse(buffer.toString())
     content.slug = 'app'
@@ -19,7 +21,10 @@ module.exports = function (production, app) {
   return {
     plugins: [
       new CopyPlugin([
-        { from: `targets/${app}/manifest.webapp`, transform: transformManifest },
+        {
+          from: `targets/${app}/manifest.webapp`,
+          transform: transformManifest
+        },
         { from: 'README.md' },
         { from: 'LICENSE' }
       ])
diff --git a/config/webpack.config.pictures.js b/config/webpack.config.pictures.js
index 593fd51a55..f6fde9ade6 100644
--- a/config/webpack.config.pictures.js
+++ b/config/webpack.config.pictures.js
@@ -1,6 +1,6 @@
 'use strict'
 
-module.exports = function (production) {
+module.exports = function(production) {
   return {
     module: {
       rules: [
diff --git a/config/webpack.config.preact.js b/config/webpack.config.preact.js
index baec9838a5..78fd3c01b8 100644
--- a/config/webpack.config.preact.js
+++ b/config/webpack.config.preact.js
@@ -2,16 +2,18 @@
 
 module.exports = {
   module: {
-    rules: [{
-      test: /\.jsx$/,
-      exclude: /node_modules\/(?!(cozy-ui))/,
-      loader: 'babel-loader'
-    }]
+    rules: [
+      {
+        test: /\.jsx$/,
+        exclude: /node_modules\/(?!(cozy-ui))/,
+        loader: 'babel-loader'
+      }
+    ]
   },
   resolve: {
     extensions: ['.jsx'],
     alias: {
-      'react': 'preact-compat',
+      react: 'preact-compat',
       'react-dom': 'preact-compat'
     }
   }
diff --git a/config/webpack.config.vendors.js b/config/webpack.config.vendors.js
index b51d91983c..4c00f87fde 100644
--- a/config/webpack.config.vendors.js
+++ b/config/webpack.config.vendors.js
@@ -2,11 +2,14 @@
 
 const CopyPlugin = require('copy-webpack-plugin')
 
-module.exports = function (production, app) {
+module.exports = function(production, app) {
   return {
     plugins: [
       new CopyPlugin([
-        { from: `targets/${app}/vendor/assets/app-icon.svg`, to: 'public/app-icon.svg' },
+        {
+          from: `targets/${app}/vendor/assets/app-icon.svg`,
+          to: 'public/app-icon.svg'
+        },
         { from: `targets/${app}/vendor/assets`, ignore: ['.gitkeep'] }
       ])
     ]
diff --git a/config/webpack.target.browser.js b/config/webpack.target.browser.js
index 05baee7f00..07f2933b45 100644
--- a/config/webpack.target.browser.js
+++ b/config/webpack.target.browser.js
@@ -5,7 +5,7 @@ const fs = require('fs')
 const { DefinePlugin } = require('webpack')
 const HtmlWebpackPlugin = require('html-webpack-plugin')
 
-module.exports = function (production, app) {
+module.exports = function(production, app) {
   var entry = {
     app: path.resolve(__dirname, `../targets/${app}/web/main`)
   }
@@ -25,32 +25,48 @@ module.exports = function (production, app) {
     })
   ]
 
-  if (fs.existsSync(path.resolve(__dirname, `../targets/${app}/web/services.jsx`))) {
+  if (
+    fs.existsSync(path.resolve(__dirname, `../targets/${app}/web/services.jsx`))
+  ) {
     entry.services = path.resolve(__dirname, `../targets/${app}/web/services`)
-    plugins.push(new HtmlWebpackPlugin({
-      template: path.resolve(__dirname, `../targets/${app}/web/services.ejs`),
-      title: `cozy-${app}`,
-      filename: 'services.html',
-      chunks: ['services'],
-      inject: 'head',
-      minify: {
-        collapseWhitespace: true
-      }
-    }))
+    plugins.push(
+      new HtmlWebpackPlugin({
+        template: path.resolve(__dirname, `../targets/${app}/web/services.ejs`),
+        title: `cozy-${app}`,
+        filename: 'services.html',
+        chunks: ['services'],
+        inject: 'head',
+        minify: {
+          collapseWhitespace: true
+        }
+      })
+    )
   }
 
-  if (fs.existsSync(path.resolve(__dirname, `../targets/${app}/web/public/main.jsx`))) {
-    entry['public/app'] = path.resolve(__dirname, `../targets/${app}/web/public/main`)
-    plugins.push(new HtmlWebpackPlugin({
-      template: path.resolve(__dirname, `../targets/${app}/web/public/index.ejs`),
-      title: `cozy-${app}`,
-      filename: 'public/index.html',
-      chunks: ['public/app'],
-      inject: 'head',
-      minify: {
-        collapseWhitespace: true
-      }
-    }))
+  if (
+    fs.existsSync(
+      path.resolve(__dirname, `../targets/${app}/web/public/main.jsx`)
+    )
+  ) {
+    entry['public/app'] = path.resolve(
+      __dirname,
+      `../targets/${app}/web/public/main`
+    )
+    plugins.push(
+      new HtmlWebpackPlugin({
+        template: path.resolve(
+          __dirname,
+          `../targets/${app}/web/public/index.ejs`
+        ),
+        title: `cozy-${app}`,
+        filename: 'public/index.html',
+        chunks: ['public/app'],
+        inject: 'head',
+        minify: {
+          collapseWhitespace: true
+        }
+      })
+    )
   }
 
   return {
diff --git a/config/webpack.target.mobile.js b/config/webpack.target.mobile.js
index cb96db05b1..70d57b416c 100644
--- a/config/webpack.target.mobile.js
+++ b/config/webpack.target.mobile.js
@@ -6,7 +6,7 @@ const HtmlWebpackPlugin = require('html-webpack-plugin')
 
 const pkg = require(path.resolve(__dirname, '../package.json'))
 
-module.exports = function (production, app) {
+module.exports = function(production, app) {
   return {
     entry: {
       app: [path.resolve(__dirname, `../targets/${app}/mobile/main`)]
@@ -23,8 +23,8 @@ module.exports = function (production, app) {
         __APP_VERSION__: JSON.stringify(pkg.version)
       }),
       new ProvidePlugin({
-        'PouchDB': 'pouchdb',
-        'pouchdbFind': 'pouchdb-find',
+        PouchDB: 'pouchdb',
+        pouchdbFind: 'pouchdb-find',
         'cozy.client': 'cozy-client-js/dist/cozy-client.js',
         'cozy.bar': 'cozy-bar/dist/cozy-bar.mobile.js'
       }),
diff --git a/webpack.config.js b/webpack.config.js
index 536e3345a9..830bd25aea 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -2,7 +2,7 @@
 
 const merge = require('webpack-merge')
 
-module.exports = function (env) {
+module.exports = function(env) {
   const { target = 'browser', app = 'drive' } = env
   const production = env.production === true
   return merge(
@@ -14,6 +14,8 @@ module.exports = function (env) {
     require('./config/webpack.config.vendors')(production, app),
     require('./config/webpack.config.manifest')(production, app),
     require(`./config/webpack.target.${target}`)(production, app),
-    require(production ? './config/webpack.config.prod' : './config/webpack.config.dev')
+    require(production
+      ? './config/webpack.config.prod'
+      : './config/webpack.config.dev')
   )
 }

From e1ac28ac91c3fab22176586f514707fa7eb93b73 Mon Sep 17 00:00:00 2001
From: Enguerran <enguerran@ticabri.com>
Date: Fri, 6 Oct 2017 12:03:32 +0200
Subject: [PATCH 02/30] fix: import file only once

see http://stylus-lang.com/docs/import.html\#require
for more details about stylus @import vs @require
---
 src/drive/ducks/upload/styles.styl      | 2 +-
 src/drive/styles/confirms.styl          | 2 +-
 src/drive/styles/main.styl              | 2 +-
 src/drive/styles/table.styl             | 2 +-
 src/photos/ducks/upload/styles.styl     | 2 +-
 src/photos/styles/addToAlbum.styl       | 2 +-
 src/photos/styles/alerter.styl          | 2 +-
 src/photos/styles/confirms.styl         | 2 +-
 src/photos/styles/createAlbumForm.styl  | 2 +-
 src/photos/styles/layout.styl           | 2 +-
 src/photos/styles/main.styl             | 2 +-
 src/photos/styles/newAlbum.styl         | 2 +-
 src/sharing/components/autosuggest.styl | 2 +-
 src/sharing/components/recipient.styl   | 2 +-
 src/sharing/share.styl                  | 2 +-
 targets/photos/web/public/index.styl    | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/drive/ducks/upload/styles.styl b/src/drive/ducks/upload/styles.styl
index 5bd360f3a8..07109b9c42 100644
--- a/src/drive/ducks/upload/styles.styl
+++ b/src/drive/ducks/upload/styles.styl
@@ -1,4 +1,4 @@
-@import 'cozy-ui'
+@require 'cozy-ui'
 @import '../../styles/mimetypes'
 
 .upload-queue
diff --git a/src/drive/styles/confirms.styl b/src/drive/styles/confirms.styl
index 543ea2fc52..862cbfe8f1 100644
--- a/src/drive/styles/confirms.styl
+++ b/src/drive/styles/confirms.styl
@@ -1,4 +1,4 @@
-@import 'cozy-ui'
+@require 'cozy-ui'
 
 .fil-confirm-text
     left-padded(25px)
diff --git a/src/drive/styles/main.styl b/src/drive/styles/main.styl
index 81683b3416..6bbea27469 100644
--- a/src/drive/styles/main.styl
+++ b/src/drive/styles/main.styl
@@ -1,5 +1,5 @@
 @import 'cozy-ui/defaults'
-@import 'cozy-ui'
+@require 'cozy-ui'
 
 div:focus
     outline: none
diff --git a/src/drive/styles/table.styl b/src/drive/styles/table.styl
index 2f2eeaa63b..75f8be7a39 100644
--- a/src/drive/styles/table.styl
+++ b/src/drive/styles/table.styl
@@ -1,4 +1,4 @@
-@import 'cozy-ui'
+@require 'cozy-ui'
 @import './mimetypes'
 
 .fil-content-table
diff --git a/src/photos/ducks/upload/styles.styl b/src/photos/ducks/upload/styles.styl
index aaaca078f3..2d41c3fb58 100644
--- a/src/photos/ducks/upload/styles.styl
+++ b/src/photos/ducks/upload/styles.styl
@@ -1,4 +1,4 @@
-@import 'cozy-ui'
+@require 'cozy-ui'
 
 .upload-queue
     @extend $popover
diff --git a/src/photos/styles/addToAlbum.styl b/src/photos/styles/addToAlbum.styl
index 2fd6bd7bcb..f28c59ff94 100644
--- a/src/photos/styles/addToAlbum.styl
+++ b/src/photos/styles/addToAlbum.styl
@@ -1,4 +1,4 @@
-@import 'cozy-ui'
+@require 'cozy-ui'
 
 :local
     @extend $modals
diff --git a/src/photos/styles/alerter.styl b/src/photos/styles/alerter.styl
index cfe405cb9e..ba0fc0f81f 100644
--- a/src/photos/styles/alerter.styl
+++ b/src/photos/styles/alerter.styl
@@ -1,4 +1,4 @@
-@import 'cozy-ui'
+@require 'cozy-ui'
 
 .pho-alerter
     @extends $alerts
diff --git a/src/photos/styles/confirms.styl b/src/photos/styles/confirms.styl
index 599bd4405f..d32511c6c5 100644
--- a/src/photos/styles/confirms.styl
+++ b/src/photos/styles/confirms.styl
@@ -1,4 +1,4 @@
-@import 'cozy-ui'
+@require 'cozy-ui'
 
 .fil-confirm-text
     left-padded(25px)
diff --git a/src/photos/styles/createAlbumForm.styl b/src/photos/styles/createAlbumForm.styl
index 073ef72c81..b4286b7fd2 100644
--- a/src/photos/styles/createAlbumForm.styl
+++ b/src/photos/styles/createAlbumForm.styl
@@ -1,4 +1,4 @@
-@import 'cozy-ui'
+@require 'cozy-ui'
 
 .pho-create-album-form
     @extend $form-text
diff --git a/src/photos/styles/layout.styl b/src/photos/styles/layout.styl
index 9cc4ef222f..680668b8cc 100755
--- a/src/photos/styles/layout.styl
+++ b/src/photos/styles/layout.styl
@@ -1,4 +1,4 @@
-@import 'cozy-ui'
+@require 'cozy-ui'
 
 .pho-wrapper
     @extend    $app-2panes-sticky
diff --git a/src/photos/styles/main.styl b/src/photos/styles/main.styl
index 4eb16189a0..27806ecc93 100755
--- a/src/photos/styles/main.styl
+++ b/src/photos/styles/main.styl
@@ -1,5 +1,5 @@
 @import 'cozy-ui/defaults'
-@import 'cozy-ui'
+@require 'cozy-ui'
 
 :global
   // Global utils classes comes here
diff --git a/src/photos/styles/newAlbum.styl b/src/photos/styles/newAlbum.styl
index 43ac05a919..2ee4ced81c 100644
--- a/src/photos/styles/newAlbum.styl
+++ b/src/photos/styles/newAlbum.styl
@@ -1,4 +1,4 @@
-@import 'cozy-ui'
+@require 'cozy-ui'
 
 .pho-panel
     position          fixed
diff --git a/src/sharing/components/autosuggest.styl b/src/sharing/components/autosuggest.styl
index f8efbb8fce..7243216821 100644
--- a/src/sharing/components/autosuggest.styl
+++ b/src/sharing/components/autosuggest.styl
@@ -1,4 +1,4 @@
-@import 'cozy-ui'
+@require 'cozy-ui'
 
 .container
     position relative
diff --git a/src/sharing/components/recipient.styl b/src/sharing/components/recipient.styl
index 05e4627fb3..6a7ea67911 100644
--- a/src/sharing/components/recipient.styl
+++ b/src/sharing/components/recipient.styl
@@ -1,4 +1,4 @@
-@import 'cozy-ui'
+@require 'cozy-ui'
 
 .pho-recipient
     display flex
diff --git a/src/sharing/share.styl b/src/sharing/share.styl
index b886cea23a..98914d6d37 100644
--- a/src/sharing/share.styl
+++ b/src/sharing/share.styl
@@ -1,4 +1,4 @@
-@import 'cozy-ui'
+@require 'cozy-ui'
 
 :global
     label[for='pho-album-share-toggle']
diff --git a/targets/photos/web/public/index.styl b/targets/photos/web/public/index.styl
index a70c4d53e4..5a301be438 100644
--- a/targets/photos/web/public/index.styl
+++ b/targets/photos/web/public/index.styl
@@ -1,4 +1,4 @@
-@import 'cozy-ui'
+@require 'cozy-ui'
 @import '~photos/styles/topbar'
 @import '~photos/styles/toolbar'
 

From 82e2e2652284044f842a952dcc92b0442e169c77 Mon Sep 17 00:00:00 2001
From: Yannick Lohse <contact@yannick-lohse.fr>
Date: Tue, 10 Oct 2017 15:30:25 +0200
Subject: [PATCH 03/30] chore: update list library items plugin

---
 targets/drive/mobile/config.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/drive/mobile/config.xml b/targets/drive/mobile/config.xml
index cfc06c8a1b..60e29dd41d 100644
--- a/targets/drive/mobile/config.xml
+++ b/targets/drive/mobile/config.xml
@@ -90,5 +90,5 @@
     <plugin name="io.cozy.jsbackgroundservice" spec="https://github.com/cozy/cordova-jsbackgroundservice#v1.2.0" />
     <plugin name="cordova-plugin-contacts" spec="2.3.1" />
     <plugin name="cordova-plugin-apprate" spec="~1.3.0" />
-    <plugin name="io.cozy.plugins.listlibraryitems" spec="https://github.com/cozy/cordova-plugin-list-library-items#v1.0.2" />
+    <plugin name="io.cozy.plugins.listlibraryitems" spec="https://github.com/cozy/cordova-plugin-list-library-items#v1.0.3" />
 </widget>

From 5c283245b8a39d117d10b0aa36f5340a52684740 Mon Sep 17 00:00:00 2001
From: Yannick Lohse <contact@yannick-lohse.fr>
Date: Tue, 10 Oct 2017 16:03:27 +0200
Subject: [PATCH 04/30] chore: update ios to latest engine

---
 targets/drive/mobile/config.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/targets/drive/mobile/config.xml b/targets/drive/mobile/config.xml
index cfc06c8a1b..4c22d58245 100644
--- a/targets/drive/mobile/config.xml
+++ b/targets/drive/mobile/config.xml
@@ -35,7 +35,7 @@
         <splash density="port-xxhdpi" src="res/screens/android/screen-xxhdpi-portrait.png" />
         <splash density="port-xxxhdpi" src="res/screens/android/screen-xxxhdpi-portrait.png" />
     </platform>
-    <engine name="ios" spec="4.3.1" />
+    <engine name="ios" spec="4.5.1" />
     <platform name="ios">
         <preference name="StatusBarOverlaysWebView" value="false" />
         <preference name="StatusBarStyle" value="default" />
@@ -61,6 +61,7 @@
         <icon height="76" src="res/icons/ios/icon-76.png" width="76" />
         <icon height="152" src="res/icons/ios/icon-76-2x.png" width="152" />
         <icon height="167" src="res/icons/ios/icon-83.5-2x.png" width="167" />
+        <icon height="1024" src="store/icons/icon-1024.jpg" width="1024" />
         <splash height="1136" src="res/screens/ios/screen-iphone-568h-2x.png" width="640" />
         <splash height="480" src="res/screens/ios/screen-iphone-portrait.png" width="320" />
         <splash height="960" src="res/screens/ios/screen-iphone-portrait-2x.png" width="640" />

From baaa2a273a4d9464b3af0a802369b565576008e2 Mon Sep 17 00:00:00 2001
From: Yannick Lohse <contact@yannick-lohse.fr>
Date: Wed, 11 Oct 2017 16:53:13 +0200
Subject: [PATCH 05/30] chore: upgrade list library items

---
 targets/drive/mobile/config.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/drive/mobile/config.xml b/targets/drive/mobile/config.xml
index 83019e821c..6201c24c4f 100644
--- a/targets/drive/mobile/config.xml
+++ b/targets/drive/mobile/config.xml
@@ -91,5 +91,5 @@
     <plugin name="io.cozy.jsbackgroundservice" spec="https://github.com/cozy/cordova-jsbackgroundservice#v1.2.0" />
     <plugin name="cordova-plugin-contacts" spec="2.3.1" />
     <plugin name="cordova-plugin-apprate" spec="~1.3.0" />
-    <plugin name="io.cozy.plugins.listlibraryitems" spec="https://github.com/cozy/cordova-plugin-list-library-items#v1.0.3" />
+    <plugin name="io.cozy.plugins.listlibraryitems" spec="https://github.com/cozy/cordova-plugin-list-library-items#v1.0.4" />
 </widget>

From 221bf2e49b69ed74fbc385fccfac63ea29593692 Mon Sep 17 00:00:00 2001
From: Patrick Browne <pt.browne@gmail.com>
Date: Thu, 12 Oct 2017 12:02:13 +0200
Subject: [PATCH 06/30] feat: new route to display files

---
 src/drive/components/AppRoute.jsx   |  4 +-
 src/drive/ducks/files/FileOpener.js | 64 +++++++++++++++++++++++++++++
 src/drive/ducks/files/index.jsx     |  1 +
 src/drive/ducks/files/styles.styl   |  4 ++
 src/drive/locales/en.json           |  1 +
 5 files changed, 73 insertions(+), 1 deletion(-)
 create mode 100644 src/drive/ducks/files/FileOpener.js
 create mode 100644 src/drive/ducks/files/styles.styl

diff --git a/src/drive/components/AppRoute.jsx b/src/drive/components/AppRoute.jsx
index 9a95ca5341..19a240a852 100644
--- a/src/drive/components/AppRoute.jsx
+++ b/src/drive/components/AppRoute.jsx
@@ -6,7 +6,8 @@ import FileExplorer from '../containers/FileExplorer'
 
 import {
   FolderContainer as Folder,
-  RecentContainer as Recent
+  RecentContainer as Recent,
+  FileOpener
 } from '../ducks/files'
 import { Container as Trash } from '../ducks/trash'
 
@@ -17,6 +18,7 @@ const AppRoute = (
       <Route path="files(/:folderId)" component={Folder} />
       <Route path="recent" component={Recent} />
       <Route path="trash(/:folderId)" component={Trash} />
+      <Route path="show(/:fileId)" component={FileOpener} />
     </Route>
   </Route>
 )
diff --git a/src/drive/ducks/files/FileOpener.js b/src/drive/ducks/files/FileOpener.js
new file mode 100644
index 0000000000..737e481d21
--- /dev/null
+++ b/src/drive/ducks/files/FileOpener.js
@@ -0,0 +1,64 @@
+/* global cozy */
+
+import { getFileDownloadUrl } from '../../actions'
+import { Spinner, Modal } from 'cozy-ui/react'
+import React, { Component } from 'react'
+import { connect } from 'react-redux'
+import styles from './styles'
+
+const withAlert = Wrapped =>
+  connect(null, dispatch => ({
+    alert: data => dispatch({ type: 'ALERT', alert: data })
+  }))(Wrapped)
+
+export default withAlert(
+  class extends Component {
+    state = { url: null, loading: false, closing: false }
+
+    componentWillMount() {
+      this.openFile()
+    }
+
+    async openFile() {
+      const { router, params: { fileId } } = this.props
+      try {
+        const url = await getFileDownloadUrl(fileId)
+        this.setState({ url })
+      } catch (e) {
+        router.push('/')
+        alert({
+          message: 'alert.could_not_open_file'
+        })
+      } finally {
+        this.setState({ loading: false })
+      }
+    }
+
+    handleClose = async () => {
+      this.setState({ closing: true })
+      const { router, params: { fileId } } = this.props
+      const { relationships: { parent } } = await cozy.client.files.statById(
+        fileId
+      )
+
+      // Go to the parent folder
+      router.push(`/files/${parent.data.id}`)
+    }
+
+    render() {
+      const { closing, loading, url } = this.state
+      return (
+        <div className={styles.fileOpener}>
+          {loading || closing ? (
+            <Spinner size="xxlarge" loadingType="message" middle="true" />
+          ) : null}
+          {url && !closing ? (
+            <Modal overflowHidden withCross secondaryAction={this.handleClose}>
+              <iframe frameBorder="0" src={url} />
+            </Modal>
+          ) : null}
+        </div>
+      )
+    }
+  }
+)
diff --git a/src/drive/ducks/files/index.jsx b/src/drive/ducks/files/index.jsx
index 9cd0573e23..0d13b5815d 100644
--- a/src/drive/ducks/files/index.jsx
+++ b/src/drive/ducks/files/index.jsx
@@ -1,5 +1,6 @@
 import React from 'react'
 import Container from './Container'
+export { default as FileOpener } from './FileOpener'
 
 export const FolderContainer = props => (
   <Container isTrashContext={false} canUpload canCreateFolder {...props} />
diff --git a/src/drive/ducks/files/styles.styl b/src/drive/ducks/files/styles.styl
new file mode 100644
index 0000000000..0a5ca011cb
--- /dev/null
+++ b/src/drive/ducks/files/styles.styl
@@ -0,0 +1,4 @@
+.fileOpener iframe {
+    width 80vw
+    height 80vw
+}
diff --git a/src/drive/locales/en.json b/src/drive/locales/en.json
index 3e0568a0fc..f6f75dd7f3 100644
--- a/src/drive/locales/en.json
+++ b/src/drive/locales/en.json
@@ -170,6 +170,7 @@
     "public_unshared_text": "One lost, ten found... or just check out with the owner for help. This file might not be lost."
   },
   "alert": {
+    "could_not_open_file": "The file could not be opened",
     "try_again": "An error has occurred, please try again in a moment.",
     "restore_file_success": "The selection has been successfully restored.",
     "trash_file_success": "The selection has been moved to the Trash.",

From b8bc86b255099a399406a61c947e8e9436e3b37e Mon Sep 17 00:00:00 2001
From: Patrick Browne <pt.browne@gmail.com>
Date: Thu, 12 Oct 2017 16:01:22 +0200
Subject: [PATCH 07/30] feat: redirect bad routes to files

---
 src/drive/components/AppRoute.jsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/drive/components/AppRoute.jsx b/src/drive/components/AppRoute.jsx
index 19a240a852..fe3069410b 100644
--- a/src/drive/components/AppRoute.jsx
+++ b/src/drive/components/AppRoute.jsx
@@ -19,6 +19,7 @@ const AppRoute = (
       <Route path="recent" component={Recent} />
       <Route path="trash(/:folderId)" component={Trash} />
       <Route path="show(/:fileId)" component={FileOpener} />
+      <Redirect from="*" to="files" />
     </Route>
   </Route>
 )

From 1d9387029a4ec1472db28317bed6d5b9d5c79e5b Mon Sep 17 00:00:00 2001
From: GoOz <gooz@foojin.com>
Date: Wed, 11 Oct 2017 17:06:59 +0200
Subject: [PATCH 08/30] =?UTF-8?q?=20=F0=9F=9A=91=20=20Fix=20the=20complica?=
 =?UTF-8?q?ted=20triple=20tap=20to=20show=20the=20support=20button=20on=20?=
 =?UTF-8?q?iOS?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Use Hammer to handle tap gesture instead of basic onClick
---
 src/drive/mobile/components/Settings.jsx      | 10 ++--
 .../mobile/containers/settings/About.jsx      | 60 +++++++++++++------
 2 files changed, 46 insertions(+), 24 deletions(-)

diff --git a/src/drive/mobile/components/Settings.jsx b/src/drive/mobile/components/Settings.jsx
index 1700956824..a1f3016b8c 100644
--- a/src/drive/mobile/components/Settings.jsx
+++ b/src/drive/mobile/components/Settings.jsx
@@ -16,16 +16,16 @@ import Unlink from '../containers/settings/Unlink'
 
 class Settings extends Component {
   state = {
-    countClick: 0
+    tapCount: 0
   }
 
-  handleClick = () => {
-    this.setState(state => ({ countClick: state.countClick + 1 }))
+  incrementTapCount = () => {
+    this.setState(state => ({ tapCount: state.tapCount + 1 }))
   }
 
   render() {
     const { t } = this.props
-    const isDebug = this.state.countClick >= 3
+    const isDebug = this.state.tapCount >= 3
     return (
       <Main>
         <Topbar>
@@ -36,7 +36,7 @@ class Settings extends Component {
             <MediaBackup />
             <Contacts />
             <Support isDebug={isDebug} />
-            <About onClick={this.handleClick} />
+            <About onTap={this.incrementTapCount} />
             <Unlink />
 
             {__DEVELOPMENT__ && [<hr />, <h3>Debug Zone</h3>, <DebugTools />]}
diff --git a/src/drive/mobile/containers/settings/About.jsx b/src/drive/mobile/containers/settings/About.jsx
index 61105df957..e93d3e3da5 100644
--- a/src/drive/mobile/containers/settings/About.jsx
+++ b/src/drive/mobile/containers/settings/About.jsx
@@ -1,26 +1,48 @@
-import React from 'react'
+import React, { Component } from 'react'
 import { connect } from 'react-redux'
 import { translate } from 'cozy-ui/react/I18n'
 import SettingCategory, { ELEMENT_TEXT } from '../../components/SettingCategory'
+import Hammer from 'hammerjs'
 
-export const About = ({ t, version, serverUrl, onClick }) => (
-  <SettingCategory
-    title={t('mobile.settings.about.title')}
-    elements={[
-      {
-        type: ELEMENT_TEXT,
-        label: t('mobile.settings.about.account'),
-        value: <a href="{serverUrl}">{serverUrl}</a>
-      },
-      {
-        type: ELEMENT_TEXT,
-        label: t('mobile.settings.about.app_version'),
-        value: version,
-        onClick
-      }
-    ]}
-  />
-)
+class About extends Component {
+  componentDidMount() {
+    this.gesturesHandler = new Hammer.Manager(this.versionNumber)
+    this.gesturesHandler.add(new Hammer.Tap({ event: 'singletap' }))
+    this.gesturesHandler.on('singletap', this.props.onTap)
+  }
+
+  componentWillUnmount() {
+    this.gesturesHandler.destroy()
+  }
+
+  render({ t, version, serverUrl }) {
+    return (
+      <SettingCategory
+        title={t('mobile.settings.about.title')}
+        elements={[
+          {
+            type: ELEMENT_TEXT,
+            label: t('mobile.settings.about.account'),
+            value: <a href="{serverUrl}">{serverUrl}</a>
+          },
+          {
+            type: ELEMENT_TEXT,
+            label: t('mobile.settings.about.app_version'),
+            value: (
+              <span
+                ref={versionNumber => {
+                  this.versionNumber = versionNumber
+                }}
+              >
+                {version}
+              </span>
+            )
+          }
+        ]}
+      />
+    )
+  }
+}
 
 const mapStateToProps = state => ({
   version: window.navigator.appInfo ? window.navigator.appInfo.version : 'dev',

From f525fb5f5a6c4a175baaa4eacc34a721c5d441d1 Mon Sep 17 00:00:00 2001
From: Yannick Lohse <contact@yannick-lohse.fr>
Date: Fri, 13 Oct 2017 17:30:57 +0200
Subject: [PATCH 09/30] chore: upgrade list library plugin

---
 targets/drive/mobile/config.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/drive/mobile/config.xml b/targets/drive/mobile/config.xml
index 6201c24c4f..c70eeb6f96 100644
--- a/targets/drive/mobile/config.xml
+++ b/targets/drive/mobile/config.xml
@@ -91,5 +91,5 @@
     <plugin name="io.cozy.jsbackgroundservice" spec="https://github.com/cozy/cordova-jsbackgroundservice#v1.2.0" />
     <plugin name="cordova-plugin-contacts" spec="2.3.1" />
     <plugin name="cordova-plugin-apprate" spec="~1.3.0" />
-    <plugin name="io.cozy.plugins.listlibraryitems" spec="https://github.com/cozy/cordova-plugin-list-library-items#v1.0.4" />
+    <plugin name="io.cozy.plugins.listlibraryitems" spec="https://github.com/cozy/cordova-plugin-list-library-items#v1.0.5" />
 </widget>

From 691a871787e7801c2ce66667b7b2601a12b04d5c Mon Sep 17 00:00:00 2001
From: Patrick Browne <pt.browne@gmail.com>
Date: Thu, 12 Oct 2017 18:01:15 +0200
Subject: [PATCH 10/30] feat: add fallback text for mobiles which download the
 file instead of displaying it

---
 src/drive/ducks/files/FileOpener.js | 103 +++++++++++++++-------------
 src/drive/ducks/files/styles.styl   |  28 +++++++-
 src/drive/locales/en.json           |   3 +-
 3 files changed, 85 insertions(+), 49 deletions(-)

diff --git a/src/drive/ducks/files/FileOpener.js b/src/drive/ducks/files/FileOpener.js
index 737e481d21..2ae930b1ad 100644
--- a/src/drive/ducks/files/FileOpener.js
+++ b/src/drive/ducks/files/FileOpener.js
@@ -1,9 +1,12 @@
 /* global cozy */
 
-import { getFileDownloadUrl } from '../../actions'
-import { Spinner, Modal } from 'cozy-ui/react'
 import React, { Component } from 'react'
 import { connect } from 'react-redux'
+import { flowRight as compose } from 'lodash'
+
+import { Spinner, Modal, translate } from 'cozy-ui/react'
+
+import { getFileDownloadUrl } from '../../actions'
 import styles from './styles'
 
 const withAlert = Wrapped =>
@@ -11,54 +14,62 @@ const withAlert = Wrapped =>
     alert: data => dispatch({ type: 'ALERT', alert: data })
   }))(Wrapped)
 
-export default withAlert(
-  class extends Component {
-    state = { url: null, loading: false, closing: false }
+class FileOpener extends Component {
+  state = { url: null, loading: false, closing: false }
 
-    componentWillMount() {
-      this.openFile()
-    }
+  componentWillMount() {
+    this.openFile()
+  }
 
-    async openFile() {
-      const { router, params: { fileId } } = this.props
-      try {
-        const url = await getFileDownloadUrl(fileId)
-        this.setState({ url })
-      } catch (e) {
-        router.push('/')
-        alert({
-          message: 'alert.could_not_open_file'
-        })
-      } finally {
-        this.setState({ loading: false })
-      }
+  async openFile() {
+    const { router, params: { fileId }, alert } = this.props
+    try {
+      const url = await getFileDownloadUrl(fileId)
+      this.setState({ url })
+    } catch (e) {
+      router.push('/')
+      alert({
+        message: 'alert.could_not_open_file'
+      })
+    } finally {
+      this.setState({ loading: false })
     }
+  }
 
-    handleClose = async () => {
-      this.setState({ closing: true })
-      const { router, params: { fileId } } = this.props
-      const { relationships: { parent } } = await cozy.client.files.statById(
-        fileId
-      )
+  handleClose = async () => {
+    this.setState({ closing: true })
+    const { router, params: { fileId } } = this.props
+    const { relationships: { parent } } = await cozy.client.files.statById(
+      fileId
+    )
 
-      // Go to the parent folder
-      router.push(`/files/${parent.data.id}`)
-    }
+    // Go to the parent folder
+    router.push(`/files/${parent.data.id}`)
+  }
 
-    render() {
-      const { closing, loading, url } = this.state
-      return (
-        <div className={styles.fileOpener}>
-          {loading || closing ? (
-            <Spinner size="xxlarge" loadingType="message" middle="true" />
-          ) : null}
-          {url && !closing ? (
-            <Modal overflowHidden withCross secondaryAction={this.handleClose}>
-              <iframe frameBorder="0" src={url} />
-            </Modal>
-          ) : null}
-        </div>
-      )
-    }
+  render() {
+    const { t } = this.props
+    const { closing, loading, url } = this.state
+    return (
+      <div className={styles.fileOpener}>
+        {loading || closing ? (
+          <Spinner size="xxlarge" loadingType="message" middle="true" />
+        ) : null}
+        {url && !closing ? (
+          <Modal overflowHidden withCross secondaryAction={this.handleClose}>
+            <p className={styles['fileOpener__fallback']}>
+              {t('Files.viewer-fallback')}
+            </p>
+            <iframe
+              className={styles['fileOpener__iframe']}
+              frameBorder="0"
+              src={url}
+            />
+          </Modal>
+        ) : null}
+      </div>
+    )
   }
-)
+}
+
+export default compose(withAlert, translate())(FileOpener)
diff --git a/src/drive/ducks/files/styles.styl b/src/drive/ducks/files/styles.styl
index 0a5ca011cb..f0ca607d01 100644
--- a/src/drive/ducks/files/styles.styl
+++ b/src/drive/ducks/files/styles.styl
@@ -1,4 +1,28 @@
-.fileOpener iframe {
+.fileOpener__iframe
     width 80vw
     height 80vw
-}
+    position relative // new stacking context to be above fallback
+
+
+.fileOpener__fallback
+    // vertical-align center
+    position absolute
+    top 0
+    bottom 0
+    height 3rem // sufficient to hold all the text
+    margin auto
+
+    text-align center
+
+    // display after 2s (wait for iframe to load)
+    animation display-after-1s ease 0s
+    animation-delay 2s
+    animation-fill-mode both
+    width 100%
+
+@keyframes display-after-1s
+    0%
+        color transparent
+    100%
+        color inherit
+
diff --git a/src/drive/locales/en.json b/src/drive/locales/en.json
index f6f75dd7f3..ac539c807d 100644
--- a/src/drive/locales/en.json
+++ b/src/drive/locales/en.json
@@ -83,7 +83,8 @@
       "error": {
         "generic": "An error occurred when creating the file share link, please try again."
       }
-    }
+    },
+    "viewer-fallback": "If the file has started downloading, you can close this."
   },
   "table": {
     "head_name": "Name",

From 29fdcc1b1bb5330f5d4c654f70c927142f3f0404 Mon Sep 17 00:00:00 2001
From: Patrick Browne <pt.browne@gmail.com>
Date: Mon, 16 Oct 2017 11:45:43 +0200
Subject: [PATCH 11/30] feat: files/:folderId -> folder/:folderId, show/:fileId
 -> file/:fileId

---
 src/drive/components/AppRoute.jsx                          | 6 +++---
 src/drive/containers/Nav.jsx                               | 2 +-
 src/drive/ducks/files/FileOpener.js                        | 2 +-
 src/drive/ducks/services/components/SuggestionProvider.jsx | 2 +-
 src/drive/reducers/view.js                                 | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/drive/components/AppRoute.jsx b/src/drive/components/AppRoute.jsx
index fe3069410b..fa4a5524bd 100644
--- a/src/drive/components/AppRoute.jsx
+++ b/src/drive/components/AppRoute.jsx
@@ -15,11 +15,11 @@ const AppRoute = (
   <Route component={Layout}>
     <Route component={FileExplorer}>
       <Redirect from="/" to="files" />
-      <Route path="files(/:folderId)" component={Folder} />
+      <Route path="folder(/:folderId)" component={Folder} />
       <Route path="recent" component={Recent} />
       <Route path="trash(/:folderId)" component={Trash} />
-      <Route path="show(/:fileId)" component={FileOpener} />
-      <Redirect from="*" to="files" />
+      <Route path="file(/:fileId)" component={FileOpener} />
+      <Redirect from="*" to="folder" />
     </Route>
   </Route>
 )
diff --git a/src/drive/containers/Nav.jsx b/src/drive/containers/Nav.jsx
index 7ed0b80b2c..e1ddd10dfd 100644
--- a/src/drive/containers/Nav.jsx
+++ b/src/drive/containers/Nav.jsx
@@ -67,7 +67,7 @@ const Nav = ({ t, location, openFiles, openRecent, openTrash }) => {
       <ul className={styles['coz-nav']}>
         <li className={styles['coz-nav-item']}>
           <ActiveLink
-            to="/files"
+            to="/folder"
             onClick={openFiles}
             className={classNames(
               styles['coz-nav-link'],
diff --git a/src/drive/ducks/files/FileOpener.js b/src/drive/ducks/files/FileOpener.js
index 2ae930b1ad..a0f3882eab 100644
--- a/src/drive/ducks/files/FileOpener.js
+++ b/src/drive/ducks/files/FileOpener.js
@@ -44,7 +44,7 @@ class FileOpener extends Component {
     )
 
     // Go to the parent folder
-    router.push(`/files/${parent.data.id}`)
+    router.push(`/folder/${parent.data.id}`)
   }
 
   render() {
diff --git a/src/drive/ducks/services/components/SuggestionProvider.jsx b/src/drive/ducks/services/components/SuggestionProvider.jsx
index f4e35295e4..c9767042dd 100644
--- a/src/drive/ducks/services/components/SuggestionProvider.jsx
+++ b/src/drive/ducks/services/components/SuggestionProvider.jsx
@@ -77,7 +77,7 @@ class SuggestionProvider extends React.Component {
             id: file._id,
             name: file.name,
             path,
-            url: window.location.origin + '/#/files/' + dirId
+            url: window.location.origin + '/#/folder/' + dirId
           }
         })
 
diff --git a/src/drive/reducers/view.js b/src/drive/reducers/view.js
index d8e10e7328..f38b167d3e 100644
--- a/src/drive/reducers/view.js
+++ b/src/drive/reducers/view.js
@@ -197,14 +197,14 @@ export const getFilePath = ({ view }, file) => {
 
 export const getFolderIdFromRoute = (location, params) => {
   if (params.folderId) return params.folderId
-  if (location.pathname.match(/^\/files/)) return ROOT_DIR_ID
+  if (location.pathname.match(/^\/folder/)) return ROOT_DIR_ID
   if (location.pathname.match(/^\/trash/)) return TRASH_DIR_ID
 }
 
 export const getFolderUrl = (folderId, location) => {
-  if (folderId === ROOT_DIR_ID) return '/files'
+  if (folderId === ROOT_DIR_ID) return '/folder'
   if (folderId === TRASH_DIR_ID) return '/trash'
-  const url = location.pathname.match(/^\/files/) ? '/files/' : '/trash/'
+  const url = location.pathname.match(/^\/folder/) ? '/folder/' : '/trash/'
   return url + folderId
 }
 

From 115f4a8a9688afd101e93a9284718cab32828874 Mon Sep 17 00:00:00 2001
From: Yannick Lohse <contact@yannick-lohse.fr>
Date: Mon, 16 Oct 2017 11:58:45 +0200
Subject: [PATCH 12/30] chore: update to new upload error format

---
 src/drive/mobile/actions/mediaBackup.js | 23 ++++++++---------------
 targets/drive/mobile/config.xml         |  2 +-
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/drive/mobile/actions/mediaBackup.js b/src/drive/mobile/actions/mediaBackup.js
index 6789c1b8ab..8d731936be 100644
--- a/src/drive/mobile/actions/mediaBackup.js
+++ b/src/drive/mobile/actions/mediaBackup.js
@@ -103,22 +103,15 @@ const uploadPhoto = (dirID, photo) => async (dispatch, getState) => {
     await uploadLibraryItem(dirID, photo)
     dispatch(successMediaUpload(photo))
   } catch (err) {
-    if (Array.isArray(err) && err.length > 0) {
-      const firstError = err[0]
-      if (
-        firstError.status &&
-        parseInt(firstError.status) === ERROR_CODE_CONFLICT
-      ) {
-        // since it's a conflict error, the file *is* actually on the server, so we consider it a success
-        dispatch(successMediaUpload(photo))
-        return
-      }
+    if (err.code && parseInt(err.code) === ERROR_CODE_CONFLICT) {
+      // since it's a conflict error, the file *is* actually on the server, so we consider it a success
+      dispatch(successMediaUpload(photo))
+    } else {
+      console.warn('startMediaBackup upload item error')
+      console.warn(JSON.stringify(err))
+      console.info(JSON.stringify(photo))
+      logException('startMediaBackup error')
     }
-
-    console.warn('startMediaBackup upload item error')
-    console.warn(JSON.stringify(err))
-    console.info(JSON.stringify(photo))
-    logException('startMediaBackup error')
   }
 }
 
diff --git a/targets/drive/mobile/config.xml b/targets/drive/mobile/config.xml
index c70eeb6f96..6618c9ab7a 100644
--- a/targets/drive/mobile/config.xml
+++ b/targets/drive/mobile/config.xml
@@ -91,5 +91,5 @@
     <plugin name="io.cozy.jsbackgroundservice" spec="https://github.com/cozy/cordova-jsbackgroundservice#v1.2.0" />
     <plugin name="cordova-plugin-contacts" spec="2.3.1" />
     <plugin name="cordova-plugin-apprate" spec="~1.3.0" />
-    <plugin name="io.cozy.plugins.listlibraryitems" spec="https://github.com/cozy/cordova-plugin-list-library-items#v1.0.5" />
+    <plugin name="io.cozy.plugins.listlibraryitems" spec="https://github.com/cozy/cordova-plugin-list-library-items#v1.0.6" />
 </widget>

From 1ab080258b571c790f1ea625c219b23a2b5f4e0e Mon Sep 17 00:00:00 2001
From: Yannick Lohse <contact@yannick-lohse.fr>
Date: Mon, 16 Oct 2017 16:41:34 +0200
Subject: [PATCH 13/30] fix: app routes

---
 src/drive/components/AppRoute.jsx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/drive/components/AppRoute.jsx b/src/drive/components/AppRoute.jsx
index fa4a5524bd..64c77719f8 100644
--- a/src/drive/components/AppRoute.jsx
+++ b/src/drive/components/AppRoute.jsx
@@ -14,13 +14,12 @@ import { Container as Trash } from '../ducks/trash'
 const AppRoute = (
   <Route component={Layout}>
     <Route component={FileExplorer}>
-      <Redirect from="/" to="files" />
+      <Redirect from="/" to="folder" />
       <Route path="folder(/:folderId)" component={Folder} />
       <Route path="recent" component={Recent} />
       <Route path="trash(/:folderId)" component={Trash} />
-      <Route path="file(/:fileId)" component={FileOpener} />
-      <Redirect from="*" to="folder" />
     </Route>
+    <Route path="file/:fileId" component={FileOpener} />
   </Route>
 )
 

From 611abba4c3c1f409402a396a39bc7880b39db76c Mon Sep 17 00:00:00 2001
From: Patrick Browne <pt.browne@gmail.com>
Date: Mon, 16 Oct 2017 18:54:54 +0200
Subject: [PATCH 14/30] fix: add redirect to conserve backward compatibility

---
 src/drive/components/AppRoute.jsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/drive/components/AppRoute.jsx b/src/drive/components/AppRoute.jsx
index 64c77719f8..342c90e99f 100644
--- a/src/drive/components/AppRoute.jsx
+++ b/src/drive/components/AppRoute.jsx
@@ -13,6 +13,7 @@ import { Container as Trash } from '../ducks/trash'
 
 const AppRoute = (
   <Route component={Layout}>
+    <Redirect from="/files/:folderId" to="/folder/:folderId" />
     <Route component={FileExplorer}>
       <Redirect from="/" to="folder" />
       <Route path="folder(/:folderId)" component={Folder} />

From 46347068a53b72e8577ef3b269172166848e5fd5 Mon Sep 17 00:00:00 2001
From: Yannick Lohse <contact@yannick-lohse.fr>
Date: Tue, 17 Oct 2017 18:18:45 +0200
Subject: [PATCH 15/30] fix: uploads on android

---
 src/drive/mobile/actions/mediaBackup.js | 29 ++++++++++++-------------
 targets/drive/mobile/config.xml         |  2 +-
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/drive/mobile/actions/mediaBackup.js b/src/drive/mobile/actions/mediaBackup.js
index 8d731936be..c838941f14 100644
--- a/src/drive/mobile/actions/mediaBackup.js
+++ b/src/drive/mobile/actions/mediaBackup.js
@@ -18,8 +18,6 @@ export const MEDIA_UPLOAD_SUCCESS = 'MEDIA_UPLOAD_SUCCESS'
 export const MEDIA_UPLOAD_CANCEL = 'MEDIA_UPLOAD_CANCEL'
 export const CURRENT_UPLOAD = 'CURRENT_UPLOAD'
 
-const ERROR_CODE_CONFLICT = 409
-
 const startMediaUpload = () => ({ type: MEDIA_UPLOAD_START })
 const endMediaUpload = () => ({ type: MEDIA_UPLOAD_END })
 const successMediaUpload = media => ({
@@ -48,7 +46,7 @@ export const cancelMediaBackup = () => ({ type: MEDIA_UPLOAD_CANCEL })
   dir: It's the folder where picture will be uploaded
   force: Even if the settings are not activated, it uploads the photos
 */
-export const startMediaBackup = (dir, force = false) => async (
+export const startMediaBackup = (dirName, force = false) => async (
   dispatch,
   getState
 ) => {
@@ -79,7 +77,7 @@ export const startMediaBackup = (dir, force = false) => async (
     )
     const totalUpload = photosToUpload.length
     if (totalUpload > 0) {
-      const dirID = await getDirID(dir)
+      const dirID = await getDirID(dirName)
       let uploadCounter = 0
       for (const photo of photosToUpload) {
         if (
@@ -89,7 +87,7 @@ export const startMediaBackup = (dir, force = false) => async (
           break
         }
         dispatch(currentUploading(photo, uploadCounter++, totalUpload))
-        await dispatch(uploadPhoto(dirID, photo))
+        await dispatch(uploadPhoto(dirName, dirID, photo))
       }
     }
   }
@@ -98,20 +96,21 @@ export const startMediaBackup = (dir, force = false) => async (
   dispatch(endMediaUpload())
 }
 
-const uploadPhoto = (dirID, photo) => async (dispatch, getState) => {
+const uploadPhoto = (dirName, dirID, photo) => async (dispatch, getState) => {
+  try {
+    await cozy.client.files.statByPath(dirName + '/' + photo.fileName)
+    dispatch(successMediaUpload(photo))
+    return
+  } catch (_) {} // if an exception is throw, the file doesn't exist yet and we can safely upload it
+
   try {
     await uploadLibraryItem(dirID, photo)
     dispatch(successMediaUpload(photo))
   } catch (err) {
-    if (err.code && parseInt(err.code) === ERROR_CODE_CONFLICT) {
-      // since it's a conflict error, the file *is* actually on the server, so we consider it a success
-      dispatch(successMediaUpload(photo))
-    } else {
-      console.warn('startMediaBackup upload item error')
-      console.warn(JSON.stringify(err))
-      console.info(JSON.stringify(photo))
-      logException('startMediaBackup error')
-    }
+    console.warn('startMediaBackup upload item error')
+    console.warn(JSON.stringify(err))
+    console.info(JSON.stringify(photo))
+    logException('startMediaBackup error')
   }
 }
 
diff --git a/targets/drive/mobile/config.xml b/targets/drive/mobile/config.xml
index 6618c9ab7a..53ba0430c5 100644
--- a/targets/drive/mobile/config.xml
+++ b/targets/drive/mobile/config.xml
@@ -91,5 +91,5 @@
     <plugin name="io.cozy.jsbackgroundservice" spec="https://github.com/cozy/cordova-jsbackgroundservice#v1.2.0" />
     <plugin name="cordova-plugin-contacts" spec="2.3.1" />
     <plugin name="cordova-plugin-apprate" spec="~1.3.0" />
-    <plugin name="io.cozy.plugins.listlibraryitems" spec="https://github.com/cozy/cordova-plugin-list-library-items#v1.0.6" />
+    <plugin name="io.cozy.plugins.listlibraryitems" spec="https://github.com/cozy/cordova-plugin-list-library-items#v1.0.7" />
 </widget>

From 4e5e8f4d3dc8d54db53b0d1b6f8171c9ba4b7185 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Rougeron?= <goldoraf@gmail.com>
Date: Wed, 18 Oct 2017 10:55:24 +0200
Subject: [PATCH 16/30] [tech] Imported new cozy-client with offline support

---
 src/lib/cozy-client/CozyClient.js             | 152 +++++++
 src/lib/cozy-client/CozyProvider.jsx          |  34 ++
 src/lib/cozy-client/DataAccessFacade.js       |  57 +++
 src/lib/cozy-client/README.md                 |  84 ++++
 src/lib/cozy-client/__tests__/store.spec.js   | 121 ++++++
 .../cozy-client/adapters/CozyStackAdapter.js  | 179 ++++++++
 .../cozy-client/adapters/PouchdbAdapter.js    | 166 +++++++
 src/lib/cozy-client/authentication/mobile.js  |  66 +++
 src/lib/cozy-client/connect.jsx               |  81 ++++
 src/lib/cozy-client/helpers.js                |  35 ++
 src/lib/cozy-client/index.js                  |  35 ++
 src/lib/cozy-client/middleware.js             |  40 ++
 src/lib/cozy-client/reducer.js                | 404 +++++++++++++++++
 src/lib/cozy-client/slices/sharings.js        | 406 ++++++++++++++++++
 src/lib/cozy-client/slices/synchronization.js |  90 ++++
 src/lib/cozy-client/utils.js                  |  26 ++
 16 files changed, 1976 insertions(+)
 create mode 100644 src/lib/cozy-client/CozyClient.js
 create mode 100644 src/lib/cozy-client/CozyProvider.jsx
 create mode 100644 src/lib/cozy-client/DataAccessFacade.js
 create mode 100644 src/lib/cozy-client/README.md
 create mode 100644 src/lib/cozy-client/__tests__/store.spec.js
 create mode 100644 src/lib/cozy-client/adapters/CozyStackAdapter.js
 create mode 100644 src/lib/cozy-client/adapters/PouchdbAdapter.js
 create mode 100644 src/lib/cozy-client/authentication/mobile.js
 create mode 100644 src/lib/cozy-client/connect.jsx
 create mode 100644 src/lib/cozy-client/helpers.js
 create mode 100644 src/lib/cozy-client/index.js
 create mode 100644 src/lib/cozy-client/middleware.js
 create mode 100644 src/lib/cozy-client/reducer.js
 create mode 100644 src/lib/cozy-client/slices/sharings.js
 create mode 100644 src/lib/cozy-client/slices/synchronization.js
 create mode 100644 src/lib/cozy-client/utils.js

diff --git a/src/lib/cozy-client/CozyClient.js b/src/lib/cozy-client/CozyClient.js
new file mode 100644
index 0000000000..9a9f2f7819
--- /dev/null
+++ b/src/lib/cozy-client/CozyClient.js
@@ -0,0 +1,152 @@
+/* global cozy */
+import DataAccessFacade from './DataAccessFacade'
+import { authenticateWithCordova } from './authentication/mobile'
+
+const FILES_DOCTYPE = 'io.cozy.files'
+
+export default class CozyClient {
+  constructor(config) {
+    const { cozyURL, ...options } = config
+    this.options = options
+    this.indexes = {}
+    this.specialDirectories = {}
+    this.facade = new DataAccessFacade()
+    if (cozyURL) {
+      this.facade.setup(cozyURL, options)
+    }
+  }
+
+  register(cozyUrl) {
+    this.facade.setup(cozyUrl, {
+      ...this.options,
+      oauth: {
+        ...this.options.oauth,
+        onRegistered: (client, url) => authenticateWithCordova(url)
+      }
+    })
+    return cozy.client.authorize(true)
+  }
+
+  async isRegistered(clientInfos) {
+    if (!clientInfos) return false
+    try {
+      await cozy.client.auth.getClient(clientInfos)
+      return true
+    } catch (err) {
+      // this is the error sent if we are offline
+      if (err.message === 'Failed to fetch') {
+        return true
+      } else {
+        console.warn(err)
+        return false
+      }
+    }
+  }
+
+  startSync(dispatch) {
+    return this.facade.startSync(dispatch)
+  }
+
+  getAdapter(doctype) {
+    return this.facade.getAdapter(doctype)
+  }
+
+  async fetchCollection(name, doctype, options = {}, skip = 0) {
+    if (options.selector) {
+      const index = await this.getCollectionIndex(name, doctype, options)
+      return this.getAdapter(doctype).queryDocuments(doctype, index, {
+        ...options,
+        skip
+      })
+    }
+    return this.getAdapter(doctype).fetchDocuments(doctype)
+  }
+
+  fetchDocument(doctype, id) {
+    return this.getAdapter(doctype).fetchDocument(doctype, id)
+  }
+
+  fetchFile(id) {
+    return this.getAdapter(FILES_DOCTYPE).fetchFile(id)
+  }
+
+  fetchReferencedFiles(doc, skip = 0) {
+    return this.getAdapter(doc._type).fetchReferencedFiles(doc, skip)
+  }
+
+  addReferencedFiles(doc, ids) {
+    return this.getAdapter(doc._type).addReferencedFiles(doc, ids)
+  }
+
+  removeReferencedFiles(doc, ids) {
+    return this.getAdapter(doc._type).removeReferencedFiles(doc, ids)
+  }
+
+  createDocument(doctype, doc) {
+    return this.getAdapter(doctype).createDocument(doctype, doc)
+  }
+
+  updateDocument(doc) {
+    return this.getAdapter(doc._type).updateDocument(doc)
+  }
+
+  deleteDocument(doc) {
+    return this.getAdapter(doc._type).deleteDocument(doc)
+  }
+
+  createFile(file, dirID) {
+    return this.getAdapter(FILES_DOCTYPE).createFile(file, dirID)
+  }
+
+  trashFile(file) {
+    return this.getAdapter(FILES_DOCTYPE).trashFile(file)
+  }
+
+  async ensureDirectoryExists(path) {
+    if (!this.specialDirectories[path]) {
+      const dir = await cozy.client.files.createDirectoryByPath(path)
+      this.specialDirectories[path] = dir._id
+    }
+    return this.specialDirectories[path]
+  }
+
+  async checkUniquenessOf(doctype, property, value) {
+    const index = await this.getUniqueIndex(doctype, property)
+    const existingDocs = await cozy.client.data.query(index, {
+      selector: { [property]: value },
+      fields: ['_id']
+    })
+    return existingDocs.length === 0
+  }
+
+  async getCollectionIndex(name, doctype, options) {
+    if (!this.indexes[name]) {
+      this.indexes[name] = await this.getAdapter(doctype).createIndex(
+        doctype,
+        this.getIndexFields(options)
+      )
+    }
+    return this.indexes[name]
+  }
+
+  async getUniqueIndex(doctype, property) {
+    const name = `${doctype}/${property}`
+    if (!this.indexes[name]) {
+      this.indexes[name] = await this.getAdapter(doctype).createIndex(doctype, [
+        property
+      ])
+    }
+    return this.indexes[name]
+  }
+
+  getIndexFields(options) {
+    const { selector, sort } = options
+    if (sort) {
+      // We filter possible duplicated fields
+      return [...Object.keys(selector), ...Object.keys(sort)].filter(
+        (f, i, arr) => arr.indexOf(f) === i
+      )
+    }
+    return Object.keys(selector)
+  }
+}
diff --git a/src/lib/cozy-client/CozyProvider.jsx b/src/lib/cozy-client/CozyProvider.jsx
new file mode 100644
index 0000000000..7e3ffebefe
--- /dev/null
+++ b/src/lib/cozy-client/CozyProvider.jsx
@@ -0,0 +1,34 @@
+import { Component } from 'react'
+import PropTypes from 'prop-types'
+
+export default class CozyProvider extends Component {
+  static propTypes = {
+    store: PropTypes.shape({
+      subscribe: PropTypes.func.isRequired,
+      dispatch: PropTypes.func.isRequired,
+      getState: PropTypes.func.isRequired
+    }),
+    client: PropTypes.object.isRequired,
+    children: PropTypes.element.isRequired
+  }
+
+  static childContextTypes = {
+    store: PropTypes.object,
+    client: PropTypes.object.isRequired
+  }
+
+  static contextTypes = {
+    store: PropTypes.object
+  }
+
+  getChildContext() {
+    return {
+      store: this.props.store || this.context.store,
+      client: this.props.client
+    }
+  }
+
+  render() {
+    return (this.props.children && this.props.children[0]) || null
+  }
+}
diff --git a/src/lib/cozy-client/DataAccessFacade.js b/src/lib/cozy-client/DataAccessFacade.js
new file mode 100644
index 0000000000..c19c2f2799
--- /dev/null
+++ b/src/lib/cozy-client/DataAccessFacade.js
@@ -0,0 +1,57 @@
+/* global cozy */
+import CozyStackAdapter from './adapters/CozyStackAdapter'
+import PouchdbAdapter from './adapters/PouchdbAdapter'
+
+const isOnline = () =>
+  typeof navigator !== 'undefined' ? navigator.onLine : true
+const isOffline = () => !isOnline()
+
+export default class DataAccessFacade {
+  constructor() {
+    this.stackAdapter = new CozyStackAdapter()
+    this.pouchAdapter = new PouchdbAdapter()
+    // TODO: strategy injection
+    this.strategy = new PouchFirstStrategy()
+  }
+
+  setup(cozyUrl, options) {
+    const config = { cozyURL: cozyUrl, ...options }
+    cozy.client.init(config) // TODO: For now we let cozy-client-js creates PouchDB instances
+    if (config.offline) {
+      this.pouchAdapter.registerDoctypes(config.offline.doctypes)
+    }
+  }
+
+  getAdapter(doctype) {
+    return this.strategy.getAdapter(
+      doctype,
+      this.stackAdapter,
+      this.pouchAdapter
+    )
+  }
+
+  startSync(dispatch) {
+    return this.pouchAdapter.sync(dispatch)
+  }
+}
+
+class PouchFirstStrategy {
+  getAdapter(doctype, stackAdapter, pouchAdapter) {
+    if (pouchAdapter.getDatabase(doctype) === undefined) {
+      return stackAdapter
+    }
+    return pouchAdapter
+  }
+}
+
+class OfflineStrategy {
+  getAdapter(doctype, stackAdapter, pouchAdapter) {
+    if (isOffline()) {
+      if (pouchAdapter.getDatabase(doctype) === undefined) {
+        throw `${doctype} documents cannot be accessed when offline`
+      }
+      return pouchAdapter
+    }
+    return stackAdapter
+  }
+}
diff --git a/src/lib/cozy-client/README.md b/src/lib/cozy-client/README.md
new file mode 100644
index 0000000000..c2e299e814
--- /dev/null
+++ b/src/lib/cozy-client/README.md
@@ -0,0 +1,84 @@
+# cozy-client
+A simple and declarative way of managing [cozy-stack](https://github.com/cozy/cozy-stack) API calls and resulting data.
+
+## Introduction
+`cozy-client` is a convenient yet powerful way to bind `cozy-stack` queries to your React components, and may also be used without React. It uses `redux` internally to centralize the statuses of the various fetches and replications triggered by the library, and to store locally the data in a normalized way.
+
+`cozy-client` revolves around the following concepts:
+
+### Collections
+
+Collections are simply lists of documents of the same type: when you fetch a collection with `cozy-client`, you retrieve a paginated list of documents filtered by Mango selectors.
+
+## Usage
+You first need to instantiate a client and for that [to retrieve the domain name of the cozy instance and a token](https://cozy.github.io/cozy-docs-v3/en/dev/app/#behind-the-magic):
+
+```js
+import { CozyClient } from 'cozy-client'
+const root = document.querySelector('[role=application]')
+const data = root.dataset
+
+const client = new CozyClient({
+  cozyURL: `${window.location.protocol}//${data.cozyDomain}`,
+  token: data.cozyToken
+})
+```
+
+### Redux integration
+
+To integrate `cozy-client` with your existing Redux store, you need to add a reducer and a middleware:
+
+```js
+import { cozyMiddleware, reducer } from 'cozy-client'
+import { combineReducers, createStore, applyMiddleware } from 'redux'
+import myReducers from './myapp'
+
+const store = createStore(
+  combineReducers({...myReducers, reducer}),
+  applyMiddleware(cozyMiddleware)
+)
+```
+
+### React integration
+
+To make it easier to integrate data fetching in your component, you can use a specific higher-order component called `cozyConnect`. Basic example of usage:
+
+```jsx
+const mapDocumentsToProps = (ownProps) => ({
+  todos: fetchCollection()
+})
+```
+
+### Sharing
+
+#### fetchSharings(doctype [, id])
+
+Depending on whether this action creator is called with or without a document ID, a different prop will be injected by `cozyConnect`:
+
+ - without an ID, you'll get lists of shared documents' IDs:
+ ```js
+{
+  byMe: [<array of IDs of documents that the user has shared with someone>],
+  withMe: [<array of IDs of documents that have been shared with the user>],
+  byLink: [<array of IDs of documents that the user has shared by link>]
+}
+ ```
+ - with an ID, you'll get more detailed informations about the document's sharings:
+ ```js
+ {
+  byMe: <boolean>,
+  withMe: <boolean>,
+  byLink: <boolean>,
+  readOnly: <boolean>,
+  sharingType: 'master-slave' | 'master-master',
+  owner
+ }
+ ```
+
+## TODO
+ - Revert "normalization" of documents' `_type` property to `type`: some doctypes (files, bank.accounts, ...) use a `type` property ;
+ - Handle the `_rev` property sent by the stack when updating a document. Having the `_rev` in the store would eliminate 409 Conflict errors when updating a document multiple times in a row ;
+ - "Debounce" the fetch calls: if 2 components dispatch the same fetch, the middleware should not send the 2d fetch ;
+ - Use the redux store as a cache: if a component dispatch a fetch for a second time, the fetch should only be dispatched if the data in the store is too old ;
+ - Add support for belongsTo/hasOne/hasMany associations: IDs preloading (using listReferencedFiles for instance),
+ count properties, etc. These associations would be defined in a doctype schema of some sort ;
diff --git a/src/lib/cozy-client/__tests__/store.spec.js b/src/lib/cozy-client/__tests__/store.spec.js
new file mode 100644
index 0000000000..e9a05dbff9
--- /dev/null
+++ b/src/lib/cozy-client/__tests__/store.spec.js
@@ -0,0 +1,121 @@
+import { combineReducers } from 'redux'
+import {
+  reducer as cozyReducer,
+  fetchCollection,
+  getCollection,
+  createDocument
+} from '..'
+
+const reducer = combineReducers({ cozy: cozyReducer })
+const dispatchInitialAction = (compositeAction, initialState = undefined) => {
+  const { types, ...rest } = compositeAction
+  return reducer(initialState, { type: types[0], ...rest })
+}
+
+const dispatchSuccessfulAction = (
+  compositeAction,
+  response,
+  initialState = undefined
+) => {
+  const { types, ...rest } = compositeAction
+  const actions = [
+    { type: types[0], ...rest },
+    { type: types[1], ...rest, response }
+  ]
+  return actions.reduce((state, action) => reducer(state, action), initialState)
+}
+
+describe('Redux store tests', () => {
+  describe('Given the store is empty', () => {
+    it('should return a default state', () => {
+      expect(getCollection(reducer(undefined, {}), 'rockets')).toEqual({
+        type: null,
+        fetchStatus: 'pending',
+        lastFetch: null,
+        hasMore: false,
+        count: 0,
+        ids: [],
+        data: null
+      })
+    })
+
+    describe('When a collection is fetched', () => {
+      it('should have a `loading` status', () => {
+        const state = dispatchInitialAction(
+          fetchCollection('rockets', 'io.cozy.rockets')
+        )
+        const collection = getCollection(state, 'rockets')
+        expect(collection.fetchStatus).toBe('loading')
+      })
+    })
+  })
+
+  const fakeFetchResponse = {
+    data: [
+      {
+        id: '33dda00f0eec15bc3b3c59a615001ac7',
+        _type: 'io.cozy.rockets',
+        name: 'Falcon 9'
+      },
+      {
+        id: '33dda00f0eec15bc3b3c59a615001ac8',
+        _type: 'io.cozy.rockets',
+        name: 'Falcon Heavy'
+      },
+      {
+        id: '33dda00f0eec15bc3b3c59a615001ac9',
+        _type: 'io.cozy.rockets',
+        name: 'BFR'
+      }
+    ]
+  }
+
+  describe('Given a collection has been successfully fetched', () => {
+    let state, collection
+
+    beforeEach(() => {
+      state = dispatchSuccessfulAction(
+        fetchCollection('rockets', 'io.cozy.rockets'),
+        fakeFetchResponse
+      )
+      collection = getCollection(state, 'rockets')
+    })
+
+    it('should have a `loaded` status', () => {
+      expect(collection.fetchStatus).toBe('loaded')
+    })
+
+    it('should have a `data` property with the list of documents', () => {
+      expect(collection.data).toEqual(fakeFetchResponse.data)
+    })
+
+    describe('When a document is successfully created on the server', () => {
+      const fakeResponse = {
+        data: [
+          {
+            id: '33dda00f0eec15bc3b3c59a615001ac5',
+            _type: 'io.cozy.rockets',
+            name: 'Saturn V'
+          }
+        ]
+      }
+
+      it('should be found in the store', () => {})
+
+      it('should update collections listed in the `updateCollections` option', () => {
+        state = dispatchSuccessfulAction(
+          createDocument(
+            { _type: 'io.cozy.rockets', name: 'Saturn V' },
+            {
+              updateCollections: ['rockets']
+            }
+          ),
+          fakeResponse,
+          state
+        )
+        collection = getCollection(state, 'rockets')
+        expect(collection.data[3]).toEqual(fakeResponse.data[0])
+      })
+    })
+  })
+})
diff --git a/src/lib/cozy-client/adapters/CozyStackAdapter.js b/src/lib/cozy-client/adapters/CozyStackAdapter.js
new file mode 100644
index 0000000000..efd8ed86f6
--- /dev/null
+++ b/src/lib/cozy-client/adapters/CozyStackAdapter.js
@@ -0,0 +1,179 @@
+/* global cozy */
+const FILES_DOCTYPE = 'io.cozy.files'
+const FETCH_LIMIT = 50
+
+export default class CozyStackAdapter {
+  async fetchDocuments(doctype) {
+    // WARN: cozy-client-js lacks a cozy.data.findAll method that uses this route
+    try {
+      // WARN: if no document of this doctype exist, this route will return a 404,
+      // so we need to try/catch and return an empty response object in case of a 404
+      const resp = await cozy.client.fetchJSON(
+        'GET',
+        `/data/${doctype}/_all_docs?include_docs=true`
+      )
+      // WARN: the JSON response from the stack is not homogenous with other routes (offset? rows? total_rows?)
+      // see https://github.com/cozy/cozy-stack/blob/master/docs/data-system.md#list-all-the-documents
+      // WARN: looks like this route returns something looking like a couchDB design doc, we need to filter it:
+      const rows = resp.rows.filter(row => !row.doc.hasOwnProperty('views'))
+      // we normalize the data (note that we add _type so that cozy.client.data.listReferencedFiles works...)
+      const docs = rows.map(row =>
+        Object.assign({}, row.doc, { id: row.id, _type: doctype })
+      )
+      // we forge a correct JSONAPI response:
+      return {
+        data: docs,
+        meta: { count: resp.total_rows },
+        skip: resp.offset,
+        next: false
+      }
+    } catch (error) {
+      if (error.message.match(/not_found/)) {
+        return { data: [], meta: { count: 0 }, skip: 0, next: false }
+      }
+      throw error
+    }
+  }
+
+  async queryDocuments(doctype, index, options) {
+    const fields = options.fields
+    const skip = options.skip || 0
+    // Mango wants an array of single-property-objects...
+    const sort = options.sort
+      ? index.fields.map(f => ({ [f]: options.sort[f] || 'desc' }))
+      : undefined
+
+    const queryOptions = {
+      limit: FETCH_LIMIT,
+      wholeResponse: true, // WARN: mandatory to get the full JSONAPI response
+      ...options,
+      // TODO: type and class should not be necessary, it's just a temp fix for a stack bug
+      fields: [...fields, '_id', '_type', 'class'],
+      skip,
+      sort
+    }
+
+    // abstract away the format differences between query replies on the VFS versus the data API
+    let data, meta, next
+    if (doctype === FILES_DOCTYPE) {
+      const response = await cozy.client.files.query(index, queryOptions)
+      data = response.data.map(doc =>
+        Object.assign({ _id: doc.id, _type: doctype }, doc, doc.attributes)
+      )
+      meta = response.meta
+      next = meta.count > skip + FETCH_LIMIT
+    } else {
+      const response = await cozy.client.data.query(index, queryOptions)
+      data = response.docs.map(doc =>
+        Object.assign({ id: doc._id, _type: doctype }, doc)
+      )
+      meta = {}
+      next = response.next
+    }
+
+    // we forge a correct JSONAPI response:
+    return { data, meta, next }
+  }
+
+  async fetchDocument(doctype, id) {
+    const doc = await cozy.client.data.find(doctype, id)
+    // we normalize again...
+    const normalized = { ...doc, id: doc._id, _type: doc._type }
+    return { data: [normalized] }
+  }
+
+  async createDocument(doctype, doc) {
+    const created = await cozy.client.data.create(doctype, doc)
+    // we forge a standard response with a 'data' property
+    const normalized = { ...created, id: created._id, _type: doctype }
+    return { data: [normalized] }
+  }
+
+  async updateDocument(doc) {
+    const updated = await cozy.client.data.updateAttributes(
+      doc._type,
+      doc.id,
+      doc
+    )
+    // we forge a standard response with a 'data' property
+    return { data: [{ ...doc, _rev: updated._rev }] }
+  }
+
+  async deleteDocument(doc) {
+    /* const deleted = */ await cozy.client.data.delete(doc._type, doc)
+    // we forge a standard response with a 'data' property
+    return { data: [doc] }
+  }
+
+  createIndex(doctype, fields) {
+    return cozy.client.data.defineIndex(doctype, fields)
+  }
+
+  async fetchFileByPath(path) {
+    try {
+      const file = await cozy.client.files.statByPath(path)
+      // we forge a standard response with a 'data' property
+      return { data: [normalizeFile(file)] }
+    } catch (err) {
+      return null
+    }
+  }
+
+  async createFile(file, dirID) {
+    const created = await cozy.client.files.create(file, { dirID })
+    // we forge a standard response with a 'data' property
+    return { data: [normalizeFile(created)] }
+  }
+
+  async trashFile(file) {
+    /* const trashed = */ cozy.client.files.trashById(file.id)
+    // we forge a standard response with a 'data' property
+    return { data: [file] }
+  }
+
+  async fetchReferencedFiles(doc, skip = 0) {
+    // WARN: _type and _id are needed by cozy.client.data.fetchReferencedFiles
+    const normalized = { ...doc, _id: doc.id }
+    // WARN: the stack API is probably not ideal here: referencedFiles are in the 'included' property
+    // (that should be used when fetching an entity AND its relations) and the 'data' property
+    // only contains uplets { id, type }
+    const {
+      included,
+      meta
+    } = await cozy.client.data.fetchReferencedFiles(normalized, {
+      skip,
+      limit: FETCH_LIMIT
+    })
+    // we forge a standard response with a 'data' property
+    return {
+      data: !included
+        ? []
+        : included.map(file => ({
+            ...file,
+            ...file.attributes,
+            _type: 'io.cozy.files'
+          })),
+      meta,
+      next: meta.count > skip + FETCH_LIMIT,
+      skip
+    }
+  }
+
+  async addReferencedFiles(doc, ids) {
+    await cozy.client.data.addReferencedFiles(doc, ids)
+    return ids
+  }
+
+  async removeReferencedFiles(doc, ids) {
+    // WARN: _type and _id are needed by cozy.client.data.removeReferencedFiles
+    const normalized = { ...doc, _id: doc.id }
+    await cozy.client.data.removeReferencedFiles(normalized, ids)
+    return ids
+  }
+
+  startSync() {
+    return Promise.resolve()
+  }
+}
+
+const normalizeFile = file => ({ ...file, ...file.attributes, id: file._id })
diff --git a/src/lib/cozy-client/adapters/PouchdbAdapter.js b/src/lib/cozy-client/adapters/PouchdbAdapter.js
new file mode 100644
index 0000000000..fe176a81e5
--- /dev/null
+++ b/src/lib/cozy-client/adapters/PouchdbAdapter.js
@@ -0,0 +1,166 @@
+/* global cozy, PouchDB, pouchdbFind */
+const FILES_DOCTYPE = 'io.cozy.files'
+const FETCH_LIMIT = 50
+
+const REPLICATION_INTERVAL = 30000
+
+import {
+  startDoctypeSync,
+  syncDoctypeOk,
+  syncDoctypeError
+} from '../slices/synchronization'
+
+export default class PouchdbAdapter {
+  constructor() {
+    PouchDB.plugin(pouchdbFind)
+    this.instances = {}
+    this.doctypes = []
+  }
+
+  registerDoctypes(doctypes) {
+    this.doctypes = doctypes
+  }
+
+  getDatabase(doctype) {
+    return cozy.client.offline.getDatabase(doctype) // For now we let cozy-client-js creates PouchDB instances
+  }
+
+  getReplicationBaseUrl() {
+    return cozy.client.authorize().then(credentials => {
+      const basic = credentials.token.toBasicAuth()
+      return `${cozy.client._url}/data/`.replace('//', `//${basic}`)
+    })
+  }
+
+  getSeqNumber(doctype) {
+    return this.getDatabase(doctype)
+      .info()
+      .then(result => result.update_seq)
+  }
+
+  async sync(dispatch) {
+    const baseUrl = await this.getReplicationBaseUrl()
+    for (let doctype of this.doctypes) {
+      const seqNumber = await this.getSeqNumber(doctype)
+      await dispatch(startDoctypeSync(doctype, seqNumber))
+      this.syncDoctype(doctype, `${baseUrl}${doctype}`, dispatch)
+    }
+  }
+
+  syncDoctype(doctype, replicationUrl, dispatch) {
+    return new Promise((resolve, reject) => {
+      this.getDatabase(doctype)
+        .sync(replicationUrl)
+        .on('complete', info => {
+          dispatch(syncDoctypeOk(doctype, info))
+          this.scheduleNextSync(doctype, replicationUrl, dispatch)
+          resolve(info)
+        })
+        .on('error', err => {
+          if (err.error === 'code=400, message=Expired token') {
+            return cozy.client.authorize().then(({ client, token }) => {
+              cozy.client.auth
+                .refreshToken(cozy, client, token)
+                .then(newToken => cozy.client.saveCredentials(client, newToken))
+                .then(credentials => this.syncDoctype(doctype, replicationUrl))
+            })
+          } else if (err.status !== 404) {
+            // A 404 error on some doctypes is perfectly normal when there is no data
+            dispatch(syncDoctypeError(doctype, err))
+            this.scheduleNextSync(doctype, replicationUrl, dispatch)
+            reject(err)
+          }
+        })
+    })
+  }
+
+  scheduleNextSync(doctype, replicationUrl, dispatch) {
+    setTimeout(() => {
+      this.syncDoctype(doctype, replicationUrl, dispatch)
+    }, REPLICATION_INTERVAL)
+  }
+
+  async fetchDocuments(doctype) {
+    const resp = await this.getDatabase(doctype).allDocs({ include_docs: true })
+    return {
+      data: resp.rows
+        .filter(row => !row.doc.hasOwnProperty('views'))
+        .map(row => ({ ...row.doc, id: row.id, _type: doctype })),
+      meta: { count: resp.total_rows },
+      skip: resp.offset,
+      next: false
+    }
+  }
+
+  async queryDocuments(doctype, index, options) {
+    const queryOptions = {
+      ...options,
+      fields: [...options.fields, '_id'],
+      sort: options.sort
+        ? Object.keys(options.sort).map(k => ({ [k]: options.sort[k] }))
+        : undefined
+    }
+    const resp = await this.getDatabase(doctype).find(queryOptions)
+
+    return {
+      data: resp.docs.map(doc => ({ ...doc, id: doc._id, _type: doctype })),
+      meta: { count: resp.docs.length },
+      skip: 0,
+      next: false
+    }
+  }
+
+  async fetchDocument(doctype, id) {
+    const resp = await this.getDatabase(doctype).get(id, { revs_info: true }) // We need the revs_info option to get the _rev property
+    return { data: [{ ...resp, id: resp.id, _id: resp.id, _type: doctype }] }
+  }
+
+  async createDocument(doctype, doc) {
+    const resp = await this.getDatabase(doctype).post(doc)
+    return {
+      data: [
+        { ...doc, id: resp.id, _id: resp.id, _type: doctype, _rev: resp.rev }
+      ]
+    }
+  }
+
+  async updateDocument(doc) {
+    // TODO: _* properties are reserved by CouchDB, so we can't send the doc with its _type property...
+    const { _type, ...safeDoc } = doc
+    const resp = await this.getDatabase(_type).put(safeDoc)
+    return { data: [{ ...doc, _rev: resp.rev }] }
+  }
+
+  async deleteDocument(doc) {
+    const resp = await this.getDatabase(doc._type).remove(doc)
+    return { data: [doc] }
+  }
+
+  createIndex(doctype, fields) {
+    return this.getDatabase(doctype).createIndex({ index: { fields } })
+  }
+
+  fetchFileByPath(path) {
+    throw 'Not implemented'
+  }
+
+  createFile(file, dirID) {
+    throw 'Not implemented'
+  }
+
+  trashFile(file) {
+    throw 'Not implemented'
+  }
+
+  fetchReferencedFiles(doc, skip = 0) {
+    throw 'Not implemented'
+  }
+
+  addReferencedFiles(doc, ids) {
+    throw 'Not implemented'
+  }
+
+  removeReferencedFiles(doc, ids) {
+    throw 'Not implemented'
+  }
+}
diff --git a/src/lib/cozy-client/authentication/mobile.js b/src/lib/cozy-client/authentication/mobile.js
new file mode 100644
index 0000000000..1ee7464761
--- /dev/null
+++ b/src/lib/cozy-client/authentication/mobile.js
@@ -0,0 +1,66 @@
+/* global prompt */
+
+const hasCordovaPlugin = () => {
+  return (
+    window.cordova !== undefined && window.cordova.InAppBrowser !== undefined
+  )
+}
+
+const REGISTRATION_ABORT = 'REGISTRATION_ABORT'
+
+export const authenticateWithCordova = url => {
+  if (hasCordovaPlugin()) {
+    return new Promise((resolve, reject) => {
+      const target = '_blank'
+      const options = 'clearcache=yes,zoom=no'
+      const inAppBrowser = window.cordova.InAppBrowser.open(
+        url,
+        target,
+        options
+      )
+
+      const removeListener = () => {
+        inAppBrowser.removeEventListener('loadstart', onLoadStart)
+        inAppBrowser.removeEventListener('exit', onExit)
+      }
+
+      const onLoadStart = ({ url }) => {
+        const accessCode = /\?access_code=(.+)$/.test(url)
+        const state = /\?state=(.+)$/.test(url)
+
+        if (accessCode || state) {
+          resolve(url)
+          removeListener()
+          inAppBrowser.close()
+        }
+      }
+
+      const onExit = () => {
+        reject(new Error(REGISTRATION_ABORT))
+        removeListener()
+        inAppBrowser.close()
+      }
+
+      inAppBrowser.addEventListener('loadstart', onLoadStart)
+      inAppBrowser.addEventListener('exit', onExit)
+    })
+  } else {
+    /**
+     * for dev purpose:
+     * In oauth workflow, the server displays an authorization page
+     * User must accept to give permission then the server gives an url
+     * with query parameters used by cozy-client-js to initialize itself.
+     *
+     * This hack let developers open the authorization page in a new tab
+     * then get the "access_code" url and paste it in the prompt to let the
+     * application initialize and redirect to other pages.
+     */
+    console.log(url)
+    return new Promise(resolve => {
+      setTimeout(() => {
+        const token = prompt('Paste the url here:')
+        resolve(token)
+      }, 10000)
+    })
+  }
+}
diff --git a/src/lib/cozy-client/connect.jsx b/src/lib/cozy-client/connect.jsx
new file mode 100644
index 0000000000..3326ccdec2
--- /dev/null
+++ b/src/lib/cozy-client/connect.jsx
@@ -0,0 +1,81 @@
+import React, { Component } from 'react'
+import { connect as reduxConnect } from 'react-redux'
+
+import { getCollection, getDocument } from '.'
+import { mapValues, filterValues } from './utils'
+import { makeFetchMoreAction } from './reducer'
+
+const isFetchCollection = action =>
+  action.types[0] === 'FETCH_COLLECTION' ||
+  action.types[0] === 'FETCH_REFERENCED_FILES'
+
+const enhanceProps = (props, fetchActions, dispatch) =>
+  mapValues(fetchActions, (action, propName) => {
+    const dataObject = props[propName]
+    if (!isFetchCollection(action)) {
+      return dataObject
+    }
+    const fetchMore = dataObject.hasMore
+      ? () => dispatch(makeFetchMoreAction(action, dataObject.data.length))
+      : null
+    return {
+      ...dataObject,
+      fetchMore
+    }
+  })
+
+const connect = (
+  mapDocumentsToProps,
+  mapActionsToProps = null
+) => WrappedComponent => {
+  class Wrapper extends Component {
+    componentDidMount() {
+      const { fetchActions } = this.props
+      const dispatch = this.context.store.dispatch
+      for (const propName in fetchActions) {
+        dispatch(fetchActions[propName])
+      }
+    }
+
+    render() {
+      const { t, f, client, store } = this.context
+      const { fetchActions } = this.props
+      const props = {
+        t,
+        f,
+        client,
+        ...this.props,
+        ...enhanceProps(this.props, fetchActions, store.dispatch)
+      }
+      return <WrappedComponent {...props} />
+    }
+  }
+
+  const makeMapStateToProps = (initialState, initialOwnProps) => {
+    const initialProps = mapDocumentsToProps(initialOwnProps)
+
+    const isAction = action => action && action.types && action.promise
+    const fetchActions = filterValues(initialProps, prop => isAction(prop))
+    const otherProps = filterValues(initialProps, prop => !isAction(prop))
+
+    const selector = (state, action) => {
+      return isFetchCollection(action)
+        ? getCollection(state, action.collection)
+        : getDocument(state, action.doctype, action.id)
+    }
+
+    const mapStateToProps = state => ({
+      ...mapValues(
+        fetchActions,
+        action => (isAction(action) ? selector(state, action) : action)
+      ),
+      fetchActions,
+      ...otherProps
+    })
+    return mapStateToProps
+  }
+
+  return reduxConnect(makeMapStateToProps, mapActionsToProps)(Wrapper)
+}
+
+export default connect
diff --git a/src/lib/cozy-client/helpers.js b/src/lib/cozy-client/helpers.js
new file mode 100644
index 0000000000..7d05b55bb5
--- /dev/null
+++ b/src/lib/cozy-client/helpers.js
@@ -0,0 +1,35 @@
+/* global cozy */
+
+const slugify = text =>
+  text
+    .toString()
+    .toLowerCase()
+    .replace(/\s+/g, '-') // Replace spaces with -
+    .replace(/[^\w-]+/g, '') // Remove all non-word chars
+    .replace(/--+/g, '-') // Replace multiple - with single -
+    .replace(/^-+/, '') // Trim - from start of text
+    .replace(/-+$/, '') // Trim - from end of text
+
+const forceFileDownload = (href, filename) => {
+  const element = document.createElement('a')
+  element.setAttribute('href', href)
+  element.setAttribute('download', filename)
+  element.style.display = 'none'
+  document.body.appendChild(element)
+  element.click()
+  document.body.removeChild(element)
+}
+
+// async helpers: they interact with the stack but not with the store
+export const downloadArchive = async (notSecureFilename, fileIds) => {
+  const filename = slugify(notSecureFilename)
+  const href = await cozy.client.files.getArchiveLinkByIds(fileIds, filename)
+  const fullpath = await cozy.client.fullpath(href)
+  forceFileDownload(fullpath, filename + '.zip')
+}
+
+export const downloadFile = async file => {
+  const response = await cozy.client.files.downloadById(file.id)
+  const blob = await response.blob()
+  forceFileDownload(window.URL.createObjectURL(blob), file.name)
+}
diff --git a/src/lib/cozy-client/index.js b/src/lib/cozy-client/index.js
new file mode 100644
index 0000000000..b2277d07d5
--- /dev/null
+++ b/src/lib/cozy-client/index.js
@@ -0,0 +1,35 @@
+export { default as CozyProvider } from './CozyProvider'
+export { default as CozyClient } from './CozyClient'
+export { default as cozyConnect } from './connect'
+export { default as cozyMiddleware } from './middleware'
+export {
+  default as reducer,
+  makeActionCreator,
+  fetchCollection,
+  fetchDocument,
+  fetchReferencedFiles,
+  addReferencedFiles,
+  removeReferencedFiles,
+  applySelectorForAction,
+  enhancePropsForActions,
+  getCollection,
+  getDocument,
+  createDocument,
+  updateDocument,
+  deleteDocument,
+  createFile,
+  trashFile,
+  CREATE_DOCUMENT
+} from './reducer'
+export {
+  fetchSharings,
+  getSharingDetails,
+  share,
+  unshare,
+  leave,
+  shareByLink,
+  revokeLink
+} from './slices/sharings'
+export { startSync, isFirstSync, isSynced } from './slices/synchronization'
+
+export { downloadArchive, downloadFile } from './helpers'
diff --git a/src/lib/cozy-client/middleware.js b/src/lib/cozy-client/middleware.js
new file mode 100644
index 0000000000..50df6da353
--- /dev/null
+++ b/src/lib/cozy-client/middleware.js
@@ -0,0 +1,40 @@
+const cozyMiddleware = client => ({ dispatch, getState }) => {
+  return next => action => {
+    const { promise, type, types, ...rest } = action
+    if (!promise) {
+      return next(action)
+    }
+
+    if (!type && !types) {
+      return promise(client).then(action => dispatch(action))
+    }
+
+    if (type) {
+      return promise(client).then(response => {
+        next({ ...rest, response, type })
+        return response
+      })
+    }
+
+    const [REQUEST, SUCCESS, FAILURE] = types
+    next({ ...rest, type: REQUEST })
+
+    return promise(client)
+      .then(
+        response => {
+          next({ ...rest, response, type: SUCCESS })
+          return response
+        },
+        error => {
+          console.log(error)
+          next({ ...rest, error, type: FAILURE })
+        }
+      )
+      .catch(error => {
+        console.error('MIDDLEWARE ERROR:', error)
+        next({ ...rest, error, type: FAILURE })
+      })
+  }
+}
+
+export default cozyMiddleware
diff --git a/src/lib/cozy-client/reducer.js b/src/lib/cozy-client/reducer.js
new file mode 100644
index 0000000000..5ed9b162b9
--- /dev/null
+++ b/src/lib/cozy-client/reducer.js
@@ -0,0 +1,404 @@
+import { combineReducers } from 'redux'
+import { removeObjectProperty, mapValues } from './utils'
+import sharings, {
+  FETCH_SHARINGS,
+  getSharings,
+  getSharingDetails
+} from './slices/sharings'
+import synchronization from './slices/synchronization'
+
+const FETCH_DOCUMENT = 'FETCH_DOCUMENT'
+const FETCH_COLLECTION = 'FETCH_COLLECTION'
+const RECEIVE_DATA = 'RECEIVE_DATA'
+const RECEIVE_ERROR = 'RECEIVE_ERROR'
+export const CREATE_DOCUMENT = 'CREATE_DOCUMENT'
+const UPDATE_DOCUMENT = 'UPDATE_DOCUMENT'
+const DELETE_DOCUMENT = 'DELETE_DOCUMENT'
+const RECEIVE_NEW_DOCUMENT = 'RECEIVE_NEW_DOCUMENT'
+const RECEIVE_UPDATED_DOCUMENT = 'RECEIVE_UPDATED_DOCUMENT'
+const RECEIVE_DELETED_DOCUMENT = 'RECEIVE_DELETED_DOCUMENT'
+const FETCH_REFERENCED_FILES = 'FETCH_REFERENCED_FILES'
+const ADD_REFERENCED_FILES = 'ADD_REFERENCED_FILES'
+const REMOVE_REFERENCED_FILES = 'REMOVE_REFERENCED_FILES'
+
+const documents = (state = {}, action) => {
+  switch (action.type) {
+    case RECEIVE_DATA:
+      const { data } = action.response
+      if (data.length === 0) return state
+      const dataDoctype = getArrayDoctype(data)
+      return {
+        ...state,
+        [dataDoctype]: {
+          ...state[dataDoctype],
+          ...objectifyDocumentsArray(data)
+        }
+      }
+    case RECEIVE_NEW_DOCUMENT:
+    case RECEIVE_UPDATED_DOCUMENT:
+      const doc = action.response.data[0]
+      return {
+        ...state,
+        [doc._type]: {
+          ...state[doc._type],
+          [doc.id]: doc
+        }
+      }
+    case RECEIVE_DELETED_DOCUMENT:
+      const deleted = action.response.data[0]
+      return {
+        ...state,
+        [deleted._type]: removeObjectProperty(state[deleted._type], deleted.id)
+      }
+    case ADD_REFERENCED_FILES:
+      return {
+        ...state,
+        'io.cozy.files': {
+          ...state['io.cozy.files'],
+          ...updateFilesReferences(
+            state['io.cozy.files'],
+            action.ids,
+            action.document
+          )
+        }
+      }
+    case REMOVE_REFERENCED_FILES:
+      return {
+        ...state,
+        'io.cozy.files': {
+          ...state['io.cozy.files'],
+          ...removeFilesReferences(
+            state['io.cozy.files'],
+            action.ids,
+            action.document
+          )
+        }
+      }
+    default:
+      return state
+  }
+}
+
+const objectifyDocumentsArray = documents =>
+  documents.reduce((obj, doc) => ({ ...obj, [doc.id]: doc }), {})
+
+const updateFileReference = (
+  { relationships: { referenced_by, ...relationships }, ...file },
+  doc
+) => ({
+  ...file,
+  relationships: {
+    ...relationships,
+    [referenced_by.data]:
+      referenced_by.data === null
+        ? [{ id: doc.id, type: doc.type }]
+        : [...referenced_by.data, { id: doc.id, type: doc.type }]
+  }
+})
+
+const updateFilesReferences = (files, newlyReferencedIds, doc) =>
+  newlyReferencedIds.reduce(
+    (updated, id) => ({
+      ...updated,
+      [id]: updateFileReference(files[id], doc)
+    }),
+    {}
+  )
+
+const removeFileReferences = (
+  { relationships: { referenced_by, ...relationships }, ...file },
+  doc
+) => ({
+  ...file,
+  relationships: {
+    ...relationships,
+    [referenced_by.data]: referenced_by.data.filter(
+      rel => rel.type !== doc.type && rel.id !== doc.id
+    )
+  }
+})
+
+const removeFilesReferences = (files, removedIds, doc) =>
+  removedIds.reduce(
+    (updated, id) => ({
+      ...updated,
+      [id]: removeFileReferences(files[id], doc)
+    }),
+    {}
+  )
+
+const getDoctype = ({ _type: doctype }) => {
+  // TODO: don't know why the stack returns 'file' here..
+  if (doctype === 'file') {
+    return 'io.cozy.files'
+  }
+  return doctype
+}
+
+const getArrayDoctype = documents => getDoctype(documents[0])
+
+// collection reducers
+const collectionInitialState = {
+  type: null,
+  options: {},
+  fetchStatus: 'pending',
+  lastFetch: null,
+  hasMore: false,
+  count: 0,
+  ids: []
+}
+
+const collection = (state = collectionInitialState, action) => {
+  switch (action.type) {
+    case FETCH_COLLECTION:
+    case FETCH_REFERENCED_FILES:
+      return {
+        ...state,
+        type: action.doctype || 'io.cozy.files',
+        options: action.options,
+        fetchStatus: action.skip > 0 ? 'loadingMore' : 'loading'
+      }
+    case RECEIVE_DATA:
+      const response = action.response
+      return {
+        ...state,
+        fetchStatus: 'loaded',
+        lastFetch: Date.now(),
+        hasMore: response.next !== undefined ? response.next : state.hasMore,
+        count:
+          response.meta && response.meta.count
+            ? response.meta.count
+            : response.data.length,
+        ids: !action.skip
+          ? response.data.map(doc => doc.id)
+          : [...state.ids, ...response.data.map(doc => doc.id)]
+      }
+    case ADD_REFERENCED_FILES:
+      return {
+        ...state,
+        type: 'io.cozy.files',
+        count: state.count + action.ids.length,
+        ids: [...state.ids, ...action.ids]
+      }
+    case REMOVE_REFERENCED_FILES:
+      return {
+        ...state,
+        count: state.count - action.ids.length,
+        ids: state.ids.filter(id => action.ids.indexOf(id) === -1)
+      }
+    case RECEIVE_ERROR:
+      return {
+        ...state,
+        fetchStatus: 'failed'
+      }
+    case RECEIVE_NEW_DOCUMENT:
+      return {
+        ...state,
+        ids: [...state.ids, action.response.data[0].id]
+      }
+    case RECEIVE_DELETED_DOCUMENT:
+      return {
+        ...state,
+        ids: state.ids.filter(id => id !== action.response.data[0].id)
+      }
+    default:
+      return state
+  }
+}
+
+const collections = (state = {}, action) => {
+  const applyUpdate = (collections, updateAction) =>
+    updateAction.updateCollections.reduce(
+      (updated, name) => ({
+        ...updated,
+        [name]: collection(collections[name], action)
+      }),
+      {}
+    )
+
+  switch (action.type) {
+    case FETCH_COLLECTION:
+    case FETCH_REFERENCED_FILES:
+    case ADD_REFERENCED_FILES:
+    case REMOVE_REFERENCED_FILES:
+    case RECEIVE_DATA:
+    case RECEIVE_ERROR:
+      if (!action.collection) {
+        return state
+      }
+      return {
+        ...state,
+        [action.collection]: collection(state[action.collection], action)
+      }
+    case RECEIVE_NEW_DOCUMENT:
+    case RECEIVE_DELETED_DOCUMENT:
+      if (!action.updateCollections) {
+        return state
+      }
+      return {
+        ...state,
+        ...applyUpdate(state, action)
+      }
+    default:
+      return state
+  }
+}
+
+export default combineReducers({
+  collections,
+  documents,
+  sharings,
+  synchronization
+})
+
+export const fetchCollection = (name, doctype, options = {}, skip = 0) => ({
+  types: [FETCH_COLLECTION, RECEIVE_DATA, RECEIVE_ERROR],
+  collection: name,
+  doctype,
+  options,
+  skip,
+  promise: client => client.fetchCollection(name, doctype, options, skip)
+})
+
+export const fetchDocument = (doctype, id) => ({
+  types: [FETCH_DOCUMENT, RECEIVE_DATA, RECEIVE_ERROR],
+  doctype,
+  id,
+  promise: client => client.fetchDocument(doctype, id)
+})
+
+export const fetchReferencedFiles = (doc, skip = 0) => ({
+  types: [FETCH_REFERENCED_FILES, RECEIVE_DATA, RECEIVE_ERROR],
+  collection: `${doc.type}/${doc.id}#files`,
+  document: doc,
+  options: {},
+  skip,
+  promise: client => client.fetchReferencedFiles(doc, skip)
+})
+
+export const createDocument = (doctype, doc, actionOptions = {}) => ({
+  types: [CREATE_DOCUMENT, RECEIVE_NEW_DOCUMENT, RECEIVE_ERROR],
+  doctype,
+  document: doc,
+  promise: client => client.createDocument(doctype, doc),
+  ...actionOptions
+})
+
+export const updateDocument = (doc, actionOptions = {}) => ({
+  types: [UPDATE_DOCUMENT, RECEIVE_UPDATED_DOCUMENT, RECEIVE_ERROR],
+  document: doc,
+  promise: client => client.updateDocument(doc),
+  ...actionOptions
+})
+
+export const deleteDocument = (doc, actionOptions = {}) => ({
+  types: [DELETE_DOCUMENT, RECEIVE_DELETED_DOCUMENT, RECEIVE_ERROR],
+  document: doc,
+  promise: client => client.deleteDocument(doc),
+  ...actionOptions
+})
+
+export const createFile = (file, dirID, actionOptions = {}) => ({
+  types: [CREATE_DOCUMENT, RECEIVE_NEW_DOCUMENT, RECEIVE_ERROR],
+  doctype: 'io.cozy.files',
+  promise: client => client.createFile(file, dirID),
+  ...actionOptions
+})
+
+export const trashFile = (file, actionOptions = {}) => ({
+  types: [DELETE_DOCUMENT, RECEIVE_DELETED_DOCUMENT, RECEIVE_ERROR],
+  document: file,
+  promise: client => client.trashFile(file),
+  ...actionOptions
+})
+
+export const addReferencedFiles = (doc, ids) => ({
+  type: ADD_REFERENCED_FILES,
+  collection: `${doc.type}/${doc.id}#files`,
+  document: doc,
+  ids,
+  promise: client => client.addReferencedFiles(doc, ids)
+})
+
+export const removeReferencedFiles = (doc, ids) => ({
+  type: REMOVE_REFERENCED_FILES,
+  collection: `${doc.type}/${doc.id}#files`,
+  document: doc,
+  ids,
+  promise: client => client.removeReferencedFiles(doc, ids)
+})
+
+export const makeActionCreator = promise => ({ promise })
+
+export const makeFetchMoreAction = (
+  { types, collection, document, doctype, options },
+  skip
+) =>
+  types[0] === FETCH_REFERENCED_FILES
+    ? fetchReferencedFiles(document, skip)
+    : fetchCollection(collection, doctype, options, skip)
+
+export const applySelectorForAction = (state, action) => {
+  switch (action.types[0]) {
+    case FETCH_COLLECTION:
+    case FETCH_REFERENCED_FILES:
+      return getCollection(state, action.collection)
+    case FETCH_DOCUMENT:
+      return getDocument(state, action.doctype, action.id)
+    case FETCH_SHARINGS:
+      return action.id
+        ? getSharingDetails(state, action.doctype, action.id, action.options)
+        : getSharings(state, action.doctype, action.options)
+    default:
+      return null
+  }
+}
+
+export const enhancePropsForActions = (props, fetchActions, dispatch) =>
+  mapValues(fetchActions, (action, propName) => {
+    const dataObject = props[propName]
+    switch (action.types[0]) {
+      case FETCH_COLLECTION:
+      case FETCH_REFERENCED_FILES:
+        return {
+          ...dataObject,
+          fetchMore: dataObject.hasMore
+            ? () =>
+                dispatch(makeFetchMoreAction(action, dataObject.data.length))
+            : null
+        }
+      default:
+        return dataObject
+    }
+  })
+
+// selectors
+const mapDocumentsToIds = (documents, doctype, ids) =>
+  ids.map(id => documents[doctype][id])
+
+export const getCollection = (state, name) => {
+  const collection = state.cozy.collections[name]
+  if (!collection) {
+    return { ...collectionInitialState, data: null }
+  }
+  return {
+    ...collection,
+    data: mapDocumentsToIds(
+      state.cozy.documents,
+      collection.type,
+      collection.ids
+    )
+  }
+}
+
+export const getDocument = (state, doctype, id) => {
+  const documents = state.cozy.documents[doctype]
+  if (!documents) {
+    return null
+  }
+  return documents[id]
+}
+
+export const isCollectionFetched = (state, name) =>
+  state.cozy.collections[name] &&
+  state.cozy.collections[name].fetchStatus === 'loaded'
diff --git a/src/lib/cozy-client/slices/sharings.js b/src/lib/cozy-client/slices/sharings.js
new file mode 100644
index 0000000000..c61734779f
--- /dev/null
+++ b/src/lib/cozy-client/slices/sharings.js
@@ -0,0 +1,406 @@
+import { combineReducers } from 'redux'
+import { getTracker } from 'cozy-ui/react/helpers/tracker'
+import { getDocument, createDocument } from '../reducer'
+
+export const FETCH_SHARINGS = 'FETCH_SHARINGS'
+const RECEIVE_SHARINGS_DATA = 'RECEIVE_SHARINGS_DATA'
+const RECEIVE_FETCH_SHARINGS_ERROR = 'RECEIVE_FETCH_SHARINGS_ERROR'
+const CREATE_SHARING = 'CREATE_SHARING'
+const RECEIVE_NEW_SHARING = 'RECEIVE_NEW_SHARING'
+const CREATE_SHARING_LINK = 'CREATE_SHARING_LINK'
+const RECEIVE_NEW_SHARING_LINK = 'RECEIVE_NEW_SHARING_LINK'
+const REVOKE_SHARING_LINK = 'REVOKE_SHARING_LINK'
+const RECEIVE_SHARING_LINK_REVOKE = 'RECEIVE_SHARING_LINK_REVOKE'
+const REVOKE_SHARING = 'REVOKE_SHARING'
+const RECEIVE_SHARING_REVOKE = 'RECEIVE_SHARING_REVOKE'
+const RECEIVE_ERROR = 'RECEIVE_ERROR'
+
+const removeRecipient = (recipients, recipientId) => {
+  const idx = recipients.findIndex(r => r.recipient.id === recipientId)
+  return [...recipients.slice(0, idx), ...recipients.slice(idx + 1)]
+}
+
+const documents = (state = [], action) => {
+  switch (action.type) {
+    case RECEIVE_SHARINGS_DATA:
+      return action.response.sharings
+    case RECEIVE_NEW_SHARING:
+      return [...state, action.response]
+    case REVOKE_SHARING:
+      const idx = state.findIndex(
+        s => s.attributes.sharing_id === action.sharingId
+      )
+      if (idx === -1) return state
+      const sharing = state[idx]
+      const loneRecipient = sharing.attributes.recipients.length === 1
+      const newState = loneRecipient
+        ? { ...sharing, attributes: { ...sharing.attributes, revoked: true } }
+        : {
+            ...sharing,
+            attributes: {
+              ...sharing.attributes,
+              recipients: removeRecipient(
+                sharing.attributes.recipients,
+                action.recipientId
+              )
+            }
+          }
+      return [...state.slice(0, idx), newState, ...state.slice(idx + 1)]
+    default:
+      return state
+  }
+}
+
+const doctypePermsetInitialState = {
+  fetchStatus: 'loading',
+  byMe: [],
+  byLink: [],
+  withMe: []
+}
+
+const permissions = (state = {}, action) => {
+  let idx
+  switch (action.type) {
+    case FETCH_SHARINGS:
+      if (state[action.doctype]) {
+        return {
+          ...state,
+          [action.doctype]: { ...state[action.doctype], fetchStatus: 'loading' }
+        }
+      }
+      return { ...state, [action.doctype]: doctypePermsetInitialState }
+    case RECEIVE_SHARINGS_DATA:
+      return {
+        ...state,
+        [action.doctype]: {
+          fetchStatus: 'loaded',
+          ...action.response.permissions
+        }
+      }
+    case RECEIVE_FETCH_SHARINGS_ERROR:
+      return { ...state, [action.doctype]: { fetchStatus: 'error' } }
+    case RECEIVE_NEW_SHARING:
+      return {
+        ...state,
+        [action.doctype]: {
+          ...state[action.doctype],
+          byMe: [
+            ...state[action.doctype].byMe,
+            {
+              attributes: {
+                permissions: {
+                  rule0: { type: action.doctype, values: [action.id] }
+                },
+                source_id: action.response.attributes.sharing_id,
+                type: 'io.cozy.sharings'
+              }
+            }
+          ]
+        }
+      }
+    case RECEIVE_NEW_SHARING_LINK:
+      return {
+        ...state,
+        [action.doctype]: {
+          ...state[action.doctype],
+          byLink: [...state[action.doctype].byLink, action.response]
+        }
+      }
+    case REVOKE_SHARING_LINK:
+      idx = state[action.doctype].byLink.findIndex(
+        p => action.permission._id === p._id
+      )
+      if (idx === -1) return state
+      return {
+        ...state,
+        [action.doctype]: {
+          ...state[action.doctype],
+          byLink: [
+            ...state[action.doctype].byLink.slice(0, idx),
+            ...state[action.doctype].byLink.slice(idx + 1)
+          ]
+        }
+      }
+    default:
+      return state
+  }
+}
+
+export default combineReducers({ documents, permissions })
+
+// actions
+export const fetchSharings = (doctype, id = null, options = {}) => ({
+  types: [FETCH_SHARINGS, RECEIVE_SHARINGS_DATA, RECEIVE_FETCH_SHARINGS_ERROR],
+  doctype,
+  id,
+  options,
+  promise: client => client.fetchSharings(doctype)
+})
+
+export const share = (document, recipients, sharingType, sharingDesc) => async (
+  dispatch,
+  getState
+) => {
+  const recipientIds = await Promise.all(
+    recipients.map(
+      recipient =>
+        recipient.id ||
+        dispatch(createContact(recipient)).then(c => c.data[0].id)
+    )
+  )
+  trackSharingByEmail(document)
+  return dispatch(
+    createSharing(document, recipientIds, sharingType, sharingDesc)
+  )
+}
+
+export const unshare = (document, recipient) => async (dispatch, getState) => {
+  const sharing = getSharingForRecipient(getState(), document, recipient)
+  const loneRecipient = sharing.attributes.recipients.length === 1
+  return dispatch({
+    types: [REVOKE_SHARING, RECEIVE_SHARING_REVOKE, RECEIVE_ERROR],
+    doctype: document._type,
+    id: document._id,
+    sharingId: sharing.attributes.sharing_id,
+    recipientId: recipient._id,
+    promise: client =>
+      loneRecipient
+        ? client.revokeSharing(sharing.attributes.sharing_id)
+        : client.revokeSharingForClient(
+            sharing.attributes.sharing_id,
+            sharing.attributes.recipients.find(
+              r => r.recipient.id === recipient._id
+            ).Client.client_id
+          )
+  })
+}
+
+export const leave = document => async (dispatch, getState) => {
+  const sharings = getDocumentActiveSharings(
+    getState(),
+    document._type,
+    document._id
+  )
+  const sharing = sharings.find(s => s.attributes.owner === false)
+  return dispatch({
+    types: [REVOKE_SHARING, RECEIVE_SHARING_REVOKE, RECEIVE_ERROR],
+    doctype: document._type,
+    id: document._id,
+    sharingId: sharing.attributes.sharing_id,
+    promise: client => client.revokeSharing(sharing.attributes.sharing_id)
+  })
+}
+
+export const shareByLink = document => {
+  trackSharingByLink(document)
+  return createSharingLink(document)
+}
+
+export const revokeLink = document => async (dispatch, getState) => {
+  const perm = getSharingLinkPermission(
+    getState(),
+    document._type,
+    document._id
+  )
+  return dispatch({
+    types: [REVOKE_SHARING_LINK, RECEIVE_SHARING_LINK_REVOKE, RECEIVE_ERROR],
+    doctype: document._type,
+    id: document._id,
+    permission: perm,
+    promise: client => client.revokeSharingLink(perm)
+  })
+}
+
+const createSharing = (
+  document,
+  contactIds,
+  sharingType = 'master-slave',
+  description = ''
+) => ({
+  types: [CREATE_SHARING, RECEIVE_NEW_SHARING, RECEIVE_ERROR],
+  doctype: document._type,
+  id: document._id,
+  promise: client =>
+    client.createSharing(
+      getPermissionsFor(document),
+      contactIds,
+      sharingType,
+      description
+    )
+})
+
+const createSharingLink = document => ({
+  types: [CREATE_SHARING_LINK, RECEIVE_NEW_SHARING_LINK, RECEIVE_ERROR],
+  doctype: document._type,
+  id: document._id,
+  promise: client => client.createSharingLink(getPermissionsFor(document, true))
+})
+
+const createContact = ({ email }) =>
+  createDocument('io.cozy.contacts', {
+    email: [{ address: email, primary: true }]
+  })
+
+const getPermissionsFor = (document, publicLink = false) => {
+  const { _id, _type } = document
+  const verbs = publicLink ? ['GET'] : ['ALL']
+  // TODO: this works for albums, but it needs to be generalized and integrated
+  // with cozy-client ; some sort of doctype "schema" will be needed here
+  return isFile(document)
+    ? {
+        files: {
+          type: 'io.cozy.files',
+          verbs,
+          values: [_id]
+        }
+      }
+    : {
+        collection: {
+          type: _type,
+          verbs,
+          values: [_id]
+        },
+        files: {
+          type: 'io.cozy.files',
+          verbs,
+          values: [`${_type}/${_id}`],
+          selector: 'referenced_by'
+        }
+      }
+}
+
+// selectors
+const getSharing = (state, id) =>
+  state.cozy.sharings.documents.find(s => s.attributes.sharing_id === id)
+const getContact = (state, id) => getDocument(state, 'io.cozy.contacts', id)
+const getDoctypePermissions = (state, doctype) => {
+  if (state.cozy.sharings.permissions[doctype]) {
+    return state.cozy.sharings.permissions[doctype]
+  }
+  return doctypePermsetInitialState
+}
+
+const getSharingLink = (state, doctype, id) => {
+  const perm = getSharingLinkPermission(state, doctype, id)
+  return perm
+    ? buildSharingLink(id, doctype, perm.attributes.codes.email)
+    : null
+}
+
+const getSharingLinkPermission = (state, doctype, id) => {
+  const perms = getDoctypePermissions(state, doctype)
+  const type = isFile({ _type: doctype }) ? 'files' : 'collection'
+  return perms.byLink.find(
+    p => p.attributes.permissions[type].values.indexOf(id) !== -1
+  )
+}
+
+const getSharingForRecipient = (state, document, recipient) => {
+  const sharings = getDocumentActiveSharings(
+    state,
+    document._type,
+    document._id
+  )
+  return sharings.find(s =>
+    s.attributes.recipients.find(r => r.recipient.id === recipient._id)
+  )
+}
+
+const getDocumentActiveSharings = (state, doctype, id) => {
+  const perms = getDoctypePermissions(state, doctype)
+  return [
+    ...perms.byMe.filter(
+      perm => perm.attributes.permissions['rule0'].values.indexOf(id) !== -1
+    ),
+    ...perms.withMe.filter(
+      perm => perm.attributes.permissions['rule0'].values.indexOf(id) !== -1
+    )
+  ]
+    .map(p => getSharing(state, p.attributes.source_id))
+    .filter(s => !s.attributes.revoked)
+}
+
+export const getSharings = (state, doctype, options = {}) => {
+  const perms = getDoctypePermissions(state, doctype)
+  const type = doctype === 'io.cozy.files' ? 'files' : 'collection'
+  return {
+    byMe: perms.byMe.map(p => p.attributes.permissions['rule0'].values[0]),
+    withMe: perms.withMe.map(p => p.attributes.permissions['rule0'].values[0]),
+    byLink: perms.byLink.map(p => p.attributes.permissions[type].values[0])
+  }
+}
+
+export const getSharingStatus = (state, doctype, id) => {
+  const sharings = getDocumentActiveSharings(state, doctype, id)
+  return {
+    shared: sharings.length !== 0,
+    owner: sharings.some(s => s.attributes.owner === true),
+    sharingType: sharings.some(
+      s => s.attributes.sharing_type === 'master-master'
+    )
+      ? 'master-master'
+      : 'master-slave',
+    sharings
+  }
+}
+
+export const getSharingDetails = (state, doctype, id, options = {}) => {
+  const { shared, owner, sharingType, sharings } = getSharingStatus(
+    state,
+    doctype,
+    id
+  )
+  const sharingLink = getSharingLink(state, doctype, id)
+  return {
+    shared,
+    owner,
+    sharingType,
+    sharingLink,
+    sharer:
+      shared && !owner
+        ? { name: 'John Doe', url: sharings[0].attributes.sharer.url }
+        : null,
+    readOnly: !owner && sharingType === 'master-slave',
+    recipients: shared && owner ? getSharingRecipients(state, sharings) : [],
+    byMe: shared && owner === true,
+    withMe: shared && !owner,
+    byLink: !!sharingLink
+  }
+}
+
+const getSharingRecipients = (state, sharings) =>
+  sharings
+    .filter(sharing => sharing.attributes.recipients)
+    .map(sharing =>
+      sharing.attributes.recipients.map(info => ({
+        contact: getContact(state, info.recipient.id),
+        status: info.status,
+        type: sharing.attributes.sharing_type
+      }))
+    )
+    .reduce((a, b) => a.concat(b), [])
+
+const buildSharingLink = (id, doctype, sharecode) =>
+  `${window.location.origin}/public?sharecode=${sharecode}&id=${id}${doctype ===
+  'file'
+    ? '&directdownload'
+    : ''}`
+
+// helpers
+const isFile = ({ _type, type }) =>
+  _type === 'io.cozy.files' || type === 'directory' || type === 'file'
+
+const track = (document, action) => {
+  const tracker = getTracker()
+  if (!tracker) {
+    return
+  }
+  tracker.push([
+    'trackEvent',
+    isFile(document) ? 'Drive' : 'Photos',
+    action,
+    `${action}${isFile(document) ? 'File' : 'Album'}`
+  ])
+}
+const trackSharingByLink = document => track(document, 'shareByLink')
+const trackSharingByEmail = document => track(document, 'shareByEmail')
diff --git a/src/lib/cozy-client/slices/synchronization.js b/src/lib/cozy-client/slices/synchronization.js
new file mode 100644
index 0000000000..04bcab930c
--- /dev/null
+++ b/src/lib/cozy-client/slices/synchronization.js
@@ -0,0 +1,90 @@
+const START_SYNC = 'START_SYNC'
+const START_DOCTYPE_SYNC = 'START_DOCTYPE_SYNC'
+const SYNC_DOCTYPE_OK = 'SYNC_DOCTYPE_OK'
+const SYNC_DOCTYPE_ERROR = 'SYNC_DOCTYPE_ERROR'
+
+const doctypeSyncInitialState = {
+  syncStatus: 'pending',
+  lastSync: null,
+  seqNumber: 0
+}
+
+const doctypeSync = (state = doctypeSyncInitialState, action) => {
+  switch (action.type) {
+    case START_DOCTYPE_SYNC:
+      return {
+        ...state,
+        syncStatus: 'syncing',
+        seqNumber: action.seqNumber
+      }
+    case SYNC_DOCTYPE_OK:
+      return {
+        ...state,
+        syncStatus: 'done',
+        lastSync: Date.now()
+      }
+    case SYNC_DOCTYPE_ERROR:
+      return {
+        ...state,
+        syncStatus: 'error',
+        lastSync: Date.now()
+      }
+    default:
+      return state
+  }
+}
+
+const synchronization = (state = {}, action) => {
+  switch (action.type) {
+    case START_DOCTYPE_SYNC:
+    case SYNC_DOCTYPE_OK:
+    case SYNC_DOCTYPE_ERROR:
+      return {
+        ...state,
+        [action.doctype]: doctypeSync(state[action.doctype], action)
+      }
+    default:
+      return state
+  }
+}
+
+export default synchronization
+
+export const startSync = () => async (dispatch, getState) => {
+  return dispatch({
+    type: START_SYNC,
+    promise: client => client.startSync(dispatch)
+  })
+}
+
+export const startDoctypeSync = (doctype, seqNumber = 0) => ({
+  type: START_DOCTYPE_SYNC,
+  doctype,
+  seqNumber
+})
+
+export const syncDoctypeOk = (doctype, infos) => ({
+  type: SYNC_DOCTYPE_OK,
+  doctype,
+  infos
+})
+
+export const syncDoctypeError = (doctype, error) => ({
+  type: SYNC_DOCTYPE_ERROR,
+  doctype,
+  error
+})
+
+export const isFirstSync = state => {
+  const seqNumbers = Object.keys(state.cozy.synchronization).map(
+    doctype => state.cozy.synchronization[doctype].seqNumber
+  )
+  return seqNumbers.every(number => number === 0)
+}
+
+export const isSynced = state => {
+  const timestamps = Object.keys(state.cozy.synchronization).map(
+    doctype => state.cozy.synchronization[doctype].lastSync
+  )
+  return timestamps.every(ts => ts !== null)
+}
diff --git a/src/lib/cozy-client/utils.js b/src/lib/cozy-client/utils.js
new file mode 100644
index 0000000000..6e5746e123
--- /dev/null
+++ b/src/lib/cozy-client/utils.js
@@ -0,0 +1,26 @@
+export const mapValues = (object, transform) => {
+  let result = {}
+  for (const key in object) {
+    result[key] = transform(object[key], key)
+  }
+  return result
+}
+
+export const filterValues = (object, filter) => {
+  let result = {}
+  for (const key in object) {
+    if (filter(object[key], key)) {
+      result[key] = object[key]
+    }
+  }
+  return result
+}
+
+export const removeObjectProperty = (obj, prop) => {
+  return Object.keys(obj).reduce((result, key) => {
+    if (key !== prop) {
+      result[key] = obj[key]
+    }
+    return result
+  }, {})
+}

From 644eaf4595637472f6852e7f4911fd4965a84ca1 Mon Sep 17 00:00:00 2001
From: Yannick Lohse <contact@yannick-lohse.fr>
Date: Wed, 18 Oct 2017 12:00:12 +0200
Subject: [PATCH 17/30] feat: add sentry log in case of long backups

---
 src/drive/mobile/actions/mediaBackup.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/drive/mobile/actions/mediaBackup.js b/src/drive/mobile/actions/mediaBackup.js
index c838941f14..5fe326537f 100644
--- a/src/drive/mobile/actions/mediaBackup.js
+++ b/src/drive/mobile/actions/mediaBackup.js
@@ -104,13 +104,19 @@ const uploadPhoto = (dirName, dirID, photo) => async (dispatch, getState) => {
   } catch (_) {} // if an exception is throw, the file doesn't exist yet and we can safely upload it
 
   try {
+    const maxBackupTime = 1000 * 60 * 5 // 5 minutes
+    const timeout = setTimeout(() => {
+      logException(`Backup duration exceeded ${maxBackupTime / 1000} seconds`)
+    }, maxBackupTime)
+
     await uploadLibraryItem(dirID, photo)
+    clearTimeout(timeout)
     dispatch(successMediaUpload(photo))
   } catch (err) {
     console.warn('startMediaBackup upload item error')
     console.warn(JSON.stringify(err))
     console.info(JSON.stringify(photo))
-    logException('startMediaBackup error')
+    logException('Backup error: ' + JSON.stringify(err))
   }
 }
 

From d7cf8952a3eb18f6ad622f5e4d64e7421f0e2256 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Rougeron?= <goldoraf@gmail.com>
Date: Wed, 18 Oct 2017 13:50:41 +0200
Subject: [PATCH 18/30] [doc] Updated cozy-client doc

---
 src/lib/cozy-client/README.md | 156 +++++++++++++++++++++++++++++++---
 1 file changed, 145 insertions(+), 11 deletions(-)

diff --git a/src/lib/cozy-client/README.md b/src/lib/cozy-client/README.md
index c2e299e814..03e3fbdc9a 100644
--- a/src/lib/cozy-client/README.md
+++ b/src/lib/cozy-client/README.md
@@ -4,11 +4,42 @@ A simple and declarative way of managing [cozy-stack](https://github.com/cozy/co
 ## Introduction
 `cozy-client` is a convenient yet powerful way to bind `cozy-stack` queries to your React components, and may also be used without React. It uses `redux` internally to centralize the statuses of the various fetches and replications triggered by the library, and to store locally the data in a normalized way.
 
-`cozy-client` revolves around the following concepts:
+`cozy-client` is made of 2 layers:
+
+ - an inner layer, the client itself, that allows fetching data with a simple API and can be used with any framework or library:
+```js
+import { CozyClient } from 'cozy-client'
+
+const client = new CozyClient({...})
+client.fetchDocument('io.cozy.todos', 'e8354db7abfef08b7a14e43b2b106a9d')
+  .then(document => { /* do something with the document */ })
+```
+
+ - an outer layer that exposes `redux` action creators and selectors. These selectors return informations regarding to the state of the fetches, so that you can use these informations in your UI (by displaying a spinner for instance). This layer requires your app to use React or preact for now, but we're investigating ways of making it work with other libraries.
 
 ### Collections
 
-Collections are simply lists of documents of the same type: when you fetch a collection with `cozy-client`, you retrieve a paginated list of documents filtered by Mango selectors.
+Collections are simply lists of documents of the same type: when you fetch a collection with `cozy-client`, you retrieve a paginated list of documents filtered by [Mango selectors](https://github.com/cloudant/mango#selector-syntax).
+
+```js
+import { CozyClient } from 'cozy-client'
+
+const client = new CozyClient({...})
+client.fetchCollection('timeline', 'io.cozy.files', {
+  fields: ['name', 'size', 'updated_at', 'metadata'],
+  selector: {
+    class: 'image',
+    trashed: false
+  },
+  sort: {
+    'metadata.datetime': 'desc'
+  }
+}).then(photos => { /* do something with the photos */ })
+```
+## Install
+`npm install --save cozy-client`
+or 
+`yarn add cozy-client`
 
 ## Usage
 You first need to instantiate a client and for that [to retrieve the domain name of the cozy instance and a token](https://cozy.github.io/cozy-docs-v3/en/dev/app/#behind-the-magic):
@@ -44,12 +75,122 @@ const store = createStore(
 To make it easier to integrate data fetching in your component, you can use a specific higher-order component called `cozyConnect`. Basic example of usage:
 
 ```jsx
+import React from 'react'
+import { cozyConnect, fetchCollection } from 'cozy-client'
+
+const TodoList = ({ todos }) => {
+  const { data, fetchStatus } = props
+  if (fetchStatus !== 'loaded') {
+    return <h1>Loading...</h1>
+  }
+  return (
+    <ul>
+      {data.map(todo => <li>{todo.label}</li>)}
+    </ul>
+  )
+}
+
 const mapDocumentsToProps = (ownProps) => ({
-  todos: fetchCollection()
+  todos: fetchCollection('todos', 'io.cozy.todos')
+})
+
+export default cozyConnect(mapDocumentsToProps)(TodoList)
+```
+When we use `cozyConnect` to wrap a component, three things happen:
+ - The actions specified by the `mapDocumentsToProps` function (here the `fetchCollection` call) will be dispatched when the component mounts, resulting in the loading of data from the client-side store, or the server if the data is not in the store
+ - Our component subscribes to the store, so that it is updated if the data changes
+ - props are injected into the component: in our case, a `todos` prop. If we were to declare `propTypes` they would look like this:
+```jsx
+TodoList.propTypes = {
+  todos: PropTypes.shape({
+    fetchStatus: PropTypes.string.isRequired,
+    data: PropTypes.array
+  })
+}
+```
+### The structure of the injected prop
+
+As seen above, `cozyConnect` will pass the result of the collection fetch to the wrapped component in a prop whose name is specified in the `mapDocumentsToProps` function. For collections fetches, the shape of the injected prop is the following:
+ - `data`: an array of documents
+ - `fetchStatus`: the status of the fetch (`pending`, `loading`, `loaded` or `error`)
+ - `lastFetch`: when the last fetch occured
+ - `hasMore`: the fetches being paginated, this property indicates if there are more documents to load
+ - `fetchMore`: a function you can call to trigger the fetching of the next page of data
+
+### Offline support
+
+`cozy-client` provides offline support using the excellent PouchDB library. You first need to define which doctypes you want to be able to access when offline:
+
+```js
+import { CozyClient } from 'cozy-client'
+
+const client = new CozyClient({
+  cozyURL: ...,
+  token: ...,
+  offline: {
+    doctypes: ['io.cozy.todos']
+  }
 })
 ```
 
-### Sharing
+Then you must manually trigger the synchronization with the server, for instance on your root component:
+
+```jsx
+import React, { Component } from 'react'
+import { connect } from 'react-redux'
+import { isSynced, isFirstSync, startSync } from 'cozy-client'
+import Loading from 'components/Loading'
+
+class App extends Component {
+  state = {
+    hasSyncStarted: false
+  }
+
+  componentDidMount () {
+    this.props.dispatch(startSync())
+      .then(() => this.setState({ hasSyncStarted: true }))
+  }
+  render () {
+    const { hasSyncStarted } = this.state
+    const { isSynced, isFirstSync, children } = this.props
+    if (!hasSyncStarted || isFirstSync) {
+      return <Loading />
+    }
+    return children
+  }
+}
+const mapStateToProps = (state) => ({
+  isSynced: isSynced(state),
+  isFirstSync: isFirstSync(state)
+})
+export default connect(mapStateToProps)(App)
+```
+
+Currently, data requests are handled by PouchDB even if the user is online, but provisions have been made so that developers could develop their own offline strategy (like using PouchDB only if we're offline).
+
+### Planned features
+ - realtime support
+ - offline support for files
+ - more functions in the injected props: for now, we only have `fetchMore`, but we're planning to add `refetch` and CRUD functions on documents (`create`, `update`, `delete`)
+ - fetch calls "debouncing" or avoiding fetching when the data is still fresh or when 2 components request the same data at the same time
+ - support for belongsTo/hasOne/hasMany associations: IDs preloading (using listReferencedFiles for instance),
+ count properties, etc. These associations would be defined in a doctype schema of some sort
+
+### API
+
+[WIP]
+
+#### fetchDocument(doctype , id)
+
+#### createDocument(doctype, properties)
+
+#### updateDocument(document)
+
+#### deleteDocument(document)
+
+#### fetchCollection(collectionName, doctype [, options] [, skip])
+
+#### fetchReferencedFiles(document [, skip])
 
 #### fetchSharings(doctype [, id])
 
@@ -75,10 +216,3 @@ Depending on whether this action creator is called with or without a document ID
  }
  ```
 
-## TODO
- - Revert "normalization" of documents' `_type` property to `type`: some doctypes (files, bank.accounts, ...) use a `type` property ;
- - Handle the `_rev` property sent by the stack when updating a document. Having the `_rev` in the store would eliminate 409 Conflict errors when updating a document multiple times in a row ;
- - "Debounce" the fetch calls: if 2 components dispatch the same fetch, the middleware should not send the 2d fetch ;
- - Use the redux store as a cache: if a component dispatch a fetch for a second time, the fetch should only be dispatched if the data in the store is too old ;
- - Add support for belongsTo/hasOne/hasMany associations: IDs preloading (using listReferencedFiles for instance),
- count properties, etc. These associations would be defined in a doctype schema of some sort ;

From 21a1f91122fb40c831529030a55d4ae73cee526d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Rougeron?= <goldoraf@gmail.com>
Date: Wed, 18 Oct 2017 14:01:56 +0200
Subject: [PATCH 19/30] [fix] Failing build

---
 src/lib/cozy-client/DataAccessFacade.js       | 27 +++++++++----------
 src/lib/cozy-client/__tests__/store.spec.js   |  4 ++-
 .../cozy-client/adapters/PouchdbAdapter.js    | 21 +++++++--------
 3 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/src/lib/cozy-client/DataAccessFacade.js b/src/lib/cozy-client/DataAccessFacade.js
index c19c2f2799..bcc7fdefc8 100644
--- a/src/lib/cozy-client/DataAccessFacade.js
+++ b/src/lib/cozy-client/DataAccessFacade.js
@@ -2,9 +2,8 @@
 import CozyStackAdapter from './adapters/CozyStackAdapter'
 import PouchdbAdapter from './adapters/PouchdbAdapter'
 
-const isOnline = () =>
-  typeof navigator !== 'undefined' ? navigator.onLine : true
-const isOffline = () => !isOnline()
+// const isOnline = () =>
+//   typeof navigator !== 'undefined' ? navigator.onLine : true
 
 export default class DataAccessFacade {
   constructor() {
@@ -44,14 +43,14 @@ class PouchFirstStrategy {
   }
 }
 
-class OfflineStrategy {
-  getAdapter(doctype, stackAdapter, pouchAdapter) {
-    if (isOffline()) {
-      if (pouchAdapter.getDatabase(doctype) === undefined) {
-        throw `${doctype} documents cannot be accessed when offline`
-      }
-      return pouchAdapter
-    }
-    return stackAdapter
-  }
-}
+// class OfflineStrategy {
+//   getAdapter(doctype, stackAdapter, pouchAdapter) {
+//     if (isOffline()) {
+//       if (pouchAdapter.getDatabase(doctype) === undefined) {
+//         throw `${doctype} documents cannot be accessed when offline`
+//       }
+//       return pouchAdapter
+//     }
+//     return stackAdapter
+//   }
+// }
diff --git a/src/lib/cozy-client/__tests__/store.spec.js b/src/lib/cozy-client/__tests__/store.spec.js
index e9a05dbff9..e88a221cfb 100644
--- a/src/lib/cozy-client/__tests__/store.spec.js
+++ b/src/lib/cozy-client/__tests__/store.spec.js
@@ -30,6 +30,7 @@ describe('Redux store tests', () => {
     it('should return a default state', () => {
       expect(getCollection(reducer(undefined, {}), 'rockets')).toEqual({
         type: null,
+        options: {},
         fetchStatus: 'pending',
         lastFetch: null,
         hasMore: false,
@@ -105,7 +106,8 @@ describe('Redux store tests', () => {
       it('should update collections listed in the `updateCollections` option', () => {
         state = dispatchSuccessfulAction(
           createDocument(
-            { _type: 'io.cozy.rockets', name: 'Saturn V' },
+            'io.cozy.rockets',
+            { name: 'Saturn V' },
             {
               updateCollections: ['rockets']
             }
diff --git a/src/lib/cozy-client/adapters/PouchdbAdapter.js b/src/lib/cozy-client/adapters/PouchdbAdapter.js
index fe176a81e5..cb154fa0be 100644
--- a/src/lib/cozy-client/adapters/PouchdbAdapter.js
+++ b/src/lib/cozy-client/adapters/PouchdbAdapter.js
@@ -1,15 +1,12 @@
 /* global cozy, PouchDB, pouchdbFind */
-const FILES_DOCTYPE = 'io.cozy.files'
-const FETCH_LIMIT = 50
-
-const REPLICATION_INTERVAL = 30000
-
 import {
   startDoctypeSync,
   syncDoctypeOk,
   syncDoctypeError
 } from '../slices/synchronization'
 
+const REPLICATION_INTERVAL = 30000
+
 export default class PouchdbAdapter {
   constructor() {
     PouchDB.plugin(pouchdbFind)
@@ -132,7 +129,7 @@ export default class PouchdbAdapter {
   }
 
   async deleteDocument(doc) {
-    const resp = await this.getDatabase(doc._type).remove(doc)
+    await this.getDatabase(doc._type).remove(doc)
     return { data: [doc] }
   }
 
@@ -141,26 +138,26 @@ export default class PouchdbAdapter {
   }
 
   fetchFileByPath(path) {
-    throw 'Not implemented'
+    throw new Error('Not implemented')
   }
 
   createFile(file, dirID) {
-    throw 'Not implemented'
+    throw new Error('Not implemented')
   }
 
   trashFile(file) {
-    throw 'Not implemented'
+    throw new Error('Not implemented')
   }
 
   fetchReferencedFiles(doc, skip = 0) {
-    throw 'Not implemented'
+    throw new Error('Not implemented')
   }
 
   addReferencedFiles(doc, ids) {
-    throw 'Not implemented'
+    throw new Error('Not implemented')
   }
 
   removeReferencedFiles(doc, ids) {
-    throw 'Not implemented'
+    throw new Error('Not implemented')
   }
 }

From e5f9845f3f3b6c4d6c6f122c0e074da682469117 Mon Sep 17 00:00:00 2001
From: Simon Constans <simonc@linux.com>
Date: Fri, 20 Oct 2017 09:38:08 +0200
Subject: [PATCH 20/30] chore: Add package.json on cozy-client

---
 src/lib/cozy-client/package.json | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 src/lib/cozy-client/package.json

diff --git a/src/lib/cozy-client/package.json b/src/lib/cozy-client/package.json
new file mode 100644
index 0000000000..e7ec832265
--- /dev/null
+++ b/src/lib/cozy-client/package.json
@@ -0,0 +1,19 @@
+{
+  "name": "cozy-client",
+  "version": "0.1.0",
+  "description": "A simple and declarative way of managing cozy-stack API calls and resulting data.",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/cozy/cozy-drive.git"
+  },
+  "author": "cozycloud.cc",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/cozy/cozy-drive/issues"
+  },
+  "homepage": "https://github.com/cozy/cozy-drive/blob/master/src/lib/cozy-client/README.md"
+}

From 34a43eba8e1f5319a8ef9be9eda889a9b9d3e49f Mon Sep 17 00:00:00 2001
From: GoOz <gooz@foojin.com>
Date: Mon, 25 Sep 2017 12:15:02 +0200
Subject: [PATCH 21/30] =?UTF-8?q?=F0=9F=9A=91=20Fix=20styles=20to=20greet?=
 =?UTF-8?q?=20Cozy-UI=20v4=20arrival?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/drive/styles/breadcrumb.styl     |  3 ++-
 src/drive/styles/confirms.styl       |  4 ++--
 src/drive/styles/filenameinput.styl  |  2 +-
 src/drive/styles/main.styl           |  3 +--
 src/drive/styles/nav.styl            | 16 ++++++++++++++--
 src/drive/styles/table.styl          |  5 +++--
 src/drive/styles/topbar.styl         |  6 +++---
 src/photos/styles/confirms.styl      |  4 ++--
 src/photos/styles/layout.styl        |  2 +-
 src/photos/styles/photoList.styl     |  2 +-
 src/photos/styles/topbar.styl        |  6 +++---
 targets/drive/web/index.ejs          |  1 +
 targets/photos/web/public/index.styl |  2 +-
 13 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/src/drive/styles/breadcrumb.styl b/src/drive/styles/breadcrumb.styl
index 88afbde3ac..59788f5e07 100644
--- a/src/drive/styles/breadcrumb.styl
+++ b/src/drive/styles/breadcrumb.styl
@@ -12,7 +12,8 @@
     cursor           pointer
 
     .fil-path-separator
-        horizontally-padded .3em
+        padding-left .3em
+        padding-right .3em
 
 .fil-path-previous
     position   absolute
diff --git a/src/drive/styles/confirms.styl b/src/drive/styles/confirms.styl
index 862cbfe8f1..a96d97bd15 100644
--- a/src/drive/styles/confirms.styl
+++ b/src/drive/styles/confirms.styl
@@ -1,8 +1,8 @@
 @require 'cozy-ui'
 
 .fil-confirm-text
-    left-padded(25px)
-    bottom-spaced(1.3em)
+    padding-left em(25px)
+    margin-bottom 1.3em
     background-position     center left
     background-repeat       no-repeat
 
diff --git a/src/drive/styles/filenameinput.styl b/src/drive/styles/filenameinput.styl
index 2ba72623b6..453bfda5ad 100644
--- a/src/drive/styles/filenameinput.styl
+++ b/src/drive/styles/filenameinput.styl
@@ -5,7 +5,7 @@
 
     input[type=text]
         width   100%
-        padded  em(6px)
+        padding em(6px)
 
         &:focus
             background-color  white
diff --git a/src/drive/styles/main.styl b/src/drive/styles/main.styl
index 6bbea27469..f5d8cd1a02 100644
--- a/src/drive/styles/main.styl
+++ b/src/drive/styles/main.styl
@@ -1,11 +1,10 @@
-@import 'cozy-ui/defaults'
 @require 'cozy-ui'
 
 div:focus
     outline: none
 
 .fil-content
-    top-padded(30px)
+    padding-top em(30px)
 
     @media (max-width: (768/basefont)rem)
         padding 0
diff --git a/src/drive/styles/nav.styl b/src/drive/styles/nav.styl
index e8aa0affc9..d53d063dae 100644
--- a/src/drive/styles/nav.styl
+++ b/src/drive/styles/nav.styl
@@ -1,36 +1,48 @@
 @require 'cozy-ui'
 
-[role=application]
-    @extend $navigation
+.coz-nav
+    @extend .c-nav
+
+.coz-nav-item
+    @extend .c-nav-item
+
+.coz-nav-link
+    @extend .c-nav-link
 
 .fil-cat-files
     background-image: embedurl("../assets/icons/icon-folder.svg")
     &.active
+        @extend .c-nav-link.is-active
         background-image: embedurl("../assets/icons/icon-folder-active.svg")
 
 .fil-cat-recent
     background-image: embedurl("../assets/icons/icon-clock.svg")
     &.active
+        @extend .c-nav-link.is-active
         background-image: embedurl("../assets/icons/icon-clock-active.svg")
 
 .fil-cat-shared
     background-image: embedurl("../assets/icons/icon-shared.svg")
     &.active
+        @extend .c-nav-link.is-active
         background-image: embedurl("../assets/icons/icon-shared-active.svg")
 
 .fil-cat-activity
     background-image: embedurl("../assets/icons/icon-dashboard.svg")
     &.active
+        @extend .c-nav-link.is-active
         background-image: embedurl("../assets/icons/icon-dashboard-active.svg")
 
 .fil-cat-trash
     background-image: embedurl("../assets/icons/icon-trash.svg")
     &.active
+        @extend .c-nav-link.is-active
         background-image: embedurl("../assets/icons/icon-trash-active.svg")
 
 .fil-cat-settings
     background-image: embedurl("../assets/icons/icon-settings.svg")
     &.active
+        @extend .c-nav-link.is-active
         background-image: embedurl("../assets/icons/icon-settings-active.svg")
 
 @media (max-width: (1023/basefont)rem)
diff --git a/src/drive/styles/table.styl b/src/drive/styles/table.styl
index 75f8be7a39..0a0e55eb02 100644
--- a/src/drive/styles/table.styl
+++ b/src/drive/styles/table.styl
@@ -109,8 +109,9 @@
     font-size  basefont
     cursor     default
 
-    label
+    [data-input="checkbox"] label
         cursor default
+        padding 0
 
 .fil-content-row--selectable
     .fil-content-file-select
@@ -193,7 +194,7 @@ mime-types('fil-file-', '../assets/icons/')
         padding    0
 
     .fil-content-cell.fil-content-file
-        left-padded(61px)
+        padding-left em(61px)
         background-position em(16px) center
 
     .fil-content-cell.fil-content-file-select
diff --git a/src/drive/styles/topbar.styl b/src/drive/styles/topbar.styl
index d33d6308ec..9c81c6949a 100644
--- a/src/drive/styles/topbar.styl
+++ b/src/drive/styles/topbar.styl
@@ -5,9 +5,9 @@ $coz-bar-size = 48px
 .fil-topbar
     display     flex
     align-items center
-    bottom-spaced(10px)
-    right-spaced(32px)
-    left-spaced(32px)
+    margin-bottom em(10px)
+    margin-right em(32px)
+    margin-left em(32px)
 
 @media (max-width: (768/basefont)rem)
     .fil-topbar
diff --git a/src/photos/styles/confirms.styl b/src/photos/styles/confirms.styl
index d32511c6c5..0a1047e359 100644
--- a/src/photos/styles/confirms.styl
+++ b/src/photos/styles/confirms.styl
@@ -1,8 +1,8 @@
 @require 'cozy-ui'
 
 .fil-confirm-text
-    left-padded(25px)
-    bottom-spaced(1.3em)
+    padding-left em(25px)
+    margin-bottom 1.3em
     background-position     center left
     background-repeat       no-repeat
 
diff --git a/src/photos/styles/layout.styl b/src/photos/styles/layout.styl
index 680668b8cc..b4792d448a 100755
--- a/src/photos/styles/layout.styl
+++ b/src/photos/styles/layout.styl
@@ -5,7 +5,7 @@
 
 .pho-content
     padding 0
-    top-padded(30px)
+    padding-top em(30px)
 
     @media (max-width: (768/basefont)rem)
         padding 0
diff --git a/src/photos/styles/photoList.styl b/src/photos/styles/photoList.styl
index da08111e67..83369ab297 100644
--- a/src/photos/styles/photoList.styl
+++ b/src/photos/styles/photoList.styl
@@ -89,7 +89,7 @@
 
     .pho-list-morebutton
         position relative
-        bottom-spaced(2em)
+        margin-bottom 2em
 
         .pho-list-spinner
             @extend $icon-24
diff --git a/src/photos/styles/topbar.styl b/src/photos/styles/topbar.styl
index e76b659150..7ff5bb8ea0 100644
--- a/src/photos/styles/topbar.styl
+++ b/src/photos/styles/topbar.styl
@@ -5,9 +5,9 @@ $coz-bar-size = 48px
 .pho-content-header
     display       flex
     align-items   center
-    bottom-spaced(10px)
-    right-spaced(32px)
-    left-spaced(32px)
+    margin-bottom em(10px)
+    margin-right em(32px)
+    margin-left em(32px)
 
     @media (max-width: (768/basefont)rem)
         margin   0
diff --git a/targets/drive/web/index.ejs b/targets/drive/web/index.ejs
index 4fdd698d7e..42186b7dad 100644
--- a/targets/drive/web/index.ejs
+++ b/targets/drive/web/index.ejs
@@ -3,6 +3,7 @@
 <head>
   <meta charset="utf-8">
   <title><%= htmlWebpackPlugin.options.title %></title>
+  <link rel="stylesheet" type="text/css" href="//{{.Domain}}/assets/fonts/fonts.css">
   <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
   <link rel="icon" type="image/png" href="./favicon-32x32.png" sizes="32x32">
   <link rel="icon" type="image/png" href="./favicon-16x16.png" sizes="16x16">
diff --git a/targets/photos/web/public/index.styl b/targets/photos/web/public/index.styl
index 5a301be438..dc7541db05 100644
--- a/targets/photos/web/public/index.styl
+++ b/targets/photos/web/public/index.styl
@@ -25,7 +25,7 @@
 
 .pho-public-download
     padding-left         em(44px, 16px)
-    background-image     embedurl('../assets/icons/icon-download-16.svg')
+    background-image     embedurl('../../../../src/photos/assets/icons/icon-download-16.svg')
     background-position  em(17px, 16px) center
     background-repeat    no-repeat
 

From 2efa2ea255a4e8b80033a50e829f2b03f2071417 Mon Sep 17 00:00:00 2001
From: Enguerran <enguerran@ticabri.com>
Date: Tue, 10 Oct 2017 11:04:25 +0200
Subject: [PATCH 22/30] chore: no need for LoaderOptionsPlugin

this plugin is used when loaders do not accept
options in the new webpack 2/3 configuration
---
 config/webpack.config.cozy-ui.js | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/config/webpack.config.cozy-ui.js b/config/webpack.config.cozy-ui.js
index 3261856b37..185f28e3c9 100644
--- a/config/webpack.config.cozy-ui.js
+++ b/config/webpack.config.cozy-ui.js
@@ -1,6 +1,5 @@
 'use strict'
 
-const { LoaderOptionsPlugin } = require('webpack')
 const ExtractTextPlugin = require('extract-text-webpack-plugin')
 
 module.exports = {
@@ -36,19 +35,15 @@ module.exports = {
                 ]
               }
             },
-            'stylus-loader'
+            {
+              loader: 'stylus-loader',
+              options: {
+                use: [require('cozy-ui/stylus')()]
+              }
+            }
           ]
         })
       }
     ]
-  },
-  plugins: [
-    new LoaderOptionsPlugin({
-      options: {
-        stylus: {
-          use: [require('cozy-ui/stylus')()]
-        }
-      }
-    })
-  ]
+  }
 }

From b7492b18e1689915b7ea2d5b4425d870d444ddb7 Mon Sep 17 00:00:00 2001
From: GoOz <gooz@foojin.com>
Date: Tue, 26 Sep 2017 19:48:23 +0200
Subject: [PATCH 23/30] =?UTF-8?q?=F0=9F=93=9D=20remove=20global=20classes?=
 =?UTF-8?q?=20and=20use=20them=20css-modules=20instead?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/drive/components/DownloadButton.jsx       |  7 +++---
 src/drive/components/File.jsx                 |  2 +-
 src/drive/components/Menu.jsx                 |  4 ++--
 src/drive/components/Oops.jsx                 |  3 ++-
 src/drive/components/ShareButton.jsx          |  7 +++---
 src/drive/ducks/files/Toolbar.jsx             | 10 ++++-----
 .../ducks/services/components/Embeder.jsx     |  3 ++-
 src/drive/ducks/trash/Toolbar.jsx             |  6 ++---
 src/drive/ducks/upload/UploadQueue.jsx        |  4 ++--
 src/drive/mobile/components/OnBoarding.jsx    |  2 +-
 src/drive/mobile/containers/DebugTools.jsx    |  7 +++++-
 src/drive/mobile/containers/RatingModal.jsx   | 18 +++++++++++----
 .../containers/onboarding/SelectServer.jsx    |  2 +-
 .../mobile/containers/onboarding/Welcome.jsx  |  2 +-
 src/drive/styles/toolbar.styl                 |  2 --
 src/layout/pushClient/Banner.jsx              |  4 ++--
 src/layout/pushClient/pushClient.styl         |  3 +--
 src/photos/components/Alerter.jsx             |  5 ++++-
 src/photos/components/CreateAlbumForm.jsx     |  6 +----
 src/photos/components/DeleteButton.jsx        | 10 +++++++--
 src/photos/components/ErrorComponent.jsx      |  7 +++---
 src/photos/components/Menu.jsx                |  6 ++---
 src/photos/components/MoreButton.jsx          |  8 +++----
 src/photos/components/PhotoBoard.jsx          |  5 +++--
 src/photos/components/ShareButton.jsx         | 10 ++++++---
 src/photos/components/UploadButton.jsx        | 11 ++++++++--
 .../ducks/albums/components/AlbumToolbar.jsx  | 18 ++++++++++-----
 .../ducks/albums/components/AlbumsToolbar.jsx | 12 +++++-----
 .../ducks/albums/components/PhotosPicker.jsx  | 16 ++++++++++----
 .../ducks/timeline/components/Toolbar.jsx     |  6 ++---
 src/photos/ducks/upload/UploadQueue.jsx       |  2 +-
 src/photos/styles/createAlbumForm.styl        |  6 ++---
 src/photos/styles/main.styl                   |  1 -
 src/photos/styles/nav.styl                    | 22 ++++++++++++++-----
 src/photos/styles/sidebar.styl                |  7 ++----
 src/sharing/components/ShareByEmail.jsx       |  2 +-
 src/sharing/components/ShareByLink.jsx        |  8 +++----
 targets/photos/web/index.ejs                  |  1 +
 38 files changed, 155 insertions(+), 100 deletions(-)

diff --git a/src/drive/components/DownloadButton.jsx b/src/drive/components/DownloadButton.jsx
index 874647fa4e..f2df33f34a 100644
--- a/src/drive/components/DownloadButton.jsx
+++ b/src/drive/components/DownloadButton.jsx
@@ -1,5 +1,6 @@
 import React from 'react'
 import classnames from 'classnames'
+import styles from 'cozy-ui/stylus/components/button'
 
 const DownloadButton = ({ label, disabled = false, onDownload, className }) => (
   <button
@@ -7,9 +8,9 @@ const DownloadButton = ({ label, disabled = false, onDownload, className }) => (
     disabled={disabled}
     className={classnames(
       className,
-      'coz-btn',
-      'coz-btn--regular',
-      'coz-btn--download'
+      styles['c-btn'],
+      styles['c-btn--regular'],
+      styles['c-btn--download']
     )}
     onClick={() => onDownload()}
   >
diff --git a/src/drive/components/File.jsx b/src/drive/components/File.jsx
index ebfe85bc5f..b1ecb2779b 100644
--- a/src/drive/components/File.jsx
+++ b/src/drive/components/File.jsx
@@ -201,7 +201,7 @@ class File extends Component {
           )}
         >
           <button
-            className="coz-btn coz-btn--extra"
+            className={classNames(styles['c-btn'], styles['c-btn-extra'])}
             onClick={e => {
               onShowActionMenu(attributes.id)
               e.stopPropagation()
diff --git a/src/drive/components/Menu.jsx b/src/drive/components/Menu.jsx
index 233f445210..302b6e133f 100644
--- a/src/drive/components/Menu.jsx
+++ b/src/drive/components/Menu.jsx
@@ -61,11 +61,11 @@ export default class Menu extends Component {
       >
         <button
           role="button"
-          className={classNames('coz-btn', buttonClassName)}
+          className={classNames(styles['c-btn'], buttonClassName)}
           disabled={disabled}
           onClick={this.toggle}
         >
-          <span className="coz-hidden">{title}</span>
+          <span className={styles['u-visuallyhidden']}>{title}</span>
         </button>
         <div
           className={classNames(styles['coz-menu-inner'], {
diff --git a/src/drive/components/Oops.jsx b/src/drive/components/Oops.jsx
index d291272540..115ac20d52 100644
--- a/src/drive/components/Oops.jsx
+++ b/src/drive/components/Oops.jsx
@@ -2,6 +2,7 @@ import styles from '../styles/oops'
 
 import React from 'react'
 import { translate } from 'cozy-ui/react/I18n'
+import classNames from 'classnames'
 
 const reload = () => {
   window.location.reload()
@@ -13,7 +14,7 @@ const Oops = ({ t }) => (
     <p>
       <button
         role="button"
-        className="coz-btn coz-btn--regular"
+        className={classNames(styles['c-btn'], styles['c-btn--regular'])}
         onClick={reload}
       >
         {t('error.button.reload')}
diff --git a/src/drive/components/ShareButton.jsx b/src/drive/components/ShareButton.jsx
index 70c3737ee1..4b574ea24d 100644
--- a/src/drive/components/ShareButton.jsx
+++ b/src/drive/components/ShareButton.jsx
@@ -1,5 +1,6 @@
 import React from 'react'
 import classnames from 'classnames'
+import styles from 'cozy-ui/stylus/components/button'
 
 const ShareButton = ({ label, disabled, onShare, className }) => (
   <button
@@ -7,9 +8,9 @@ const ShareButton = ({ label, disabled, onShare, className }) => (
     disabled={disabled}
     className={classnames(
       className,
-      'coz-btn',
-      'coz-btn--secondary',
-      'coz-btn--share'
+      styles['c-btn'],
+      styles['c-btn--secondary'],
+      styles['c-btn--share']
     )}
     onClick={() => onShare()}
   >
diff --git a/src/drive/ducks/files/Toolbar.jsx b/src/drive/ducks/files/Toolbar.jsx
index 00831af565..b68d4e1714 100644
--- a/src/drive/ducks/files/Toolbar.jsx
+++ b/src/drive/ducks/files/Toolbar.jsx
@@ -51,10 +51,10 @@ class Toolbar extends React.Component {
             onUpload={files => uploadFiles(files, displayedFolder)}
             label={t('toolbar.item_upload')}
             className={classNames(
-              'coz-btn',
-              'coz-btn--regular',
-              'coz-btn--upload',
-              'coz-desktop'
+              styles['c-btn'],
+              styles['c-btn--regular'],
+              styles['c-btn--upload'],
+              styles['u-hide--mob']
             )}
           />
         )}
@@ -63,7 +63,7 @@ class Toolbar extends React.Component {
             disabled={disabled}
             onShare={() => this.setState(toggleShowShareModal)}
             label={t('toolbar.share')}
-            className={'coz-desktop'}
+            className={styles['u-hide--mob']}
           />
         )}
         <Menu
diff --git a/src/drive/ducks/services/components/Embeder.jsx b/src/drive/ducks/services/components/Embeder.jsx
index 7a29b7bfd7..a118d0dc0e 100644
--- a/src/drive/ducks/services/components/Embeder.jsx
+++ b/src/drive/ducks/services/components/Embeder.jsx
@@ -1,5 +1,6 @@
 import React from 'react'
 import styles from '../services.styl'
+import util from 'cozy-ui/stylus/utilities/text'
 import Spinner from 'cozy-ui/react/Spinner'
 import { getFileDownloadUrl } from '../../../actions'
 
@@ -35,7 +36,7 @@ class Embeder extends React.Component {
           <Spinner size="xxlarge" loadingType="message" middle="true" />
         )}
         {this.state.error && (
-          <pre className="coz-error">{this.state.error.toString()}</pre>
+          <pre className={util['u-error']}>{this.state.error.toString()}</pre>
         )}
         {this.state.url && (
           <embed className={styles.fullscreen} src={this.state.url} />
diff --git a/src/drive/ducks/trash/Toolbar.jsx b/src/drive/ducks/trash/Toolbar.jsx
index 09fb3a09cf..81fd7f7ad3 100644
--- a/src/drive/ducks/trash/Toolbar.jsx
+++ b/src/drive/ducks/trash/Toolbar.jsx
@@ -15,9 +15,9 @@ const Toolbar = ({ t, disabled, emptyTrash, onSelectItemsClick }) => (
   <div className={styles['fil-toolbar-trash']} role="toolbar">
     <button
       className={classNames(
-        'coz-btn',
-        'coz-btn--danger-outline',
-        'coz-desktop',
+        styles['c-btn'],
+        styles['c-btn--danger-outline'],
+        styles['u-hide--mob'],
         styles['fil-btn--delete']
       )}
       onClick={() => emptyTrash()}
diff --git a/src/drive/ducks/upload/UploadQueue.jsx b/src/drive/ducks/upload/UploadQueue.jsx
index ff318d025b..846a12cd3e 100644
--- a/src/drive/ducks/upload/UploadQueue.jsx
+++ b/src/drive/ducks/upload/UploadQueue.jsx
@@ -87,10 +87,10 @@ class UploadQueue extends Component {
         >
           {doneCount < queue.length && (
             <div className={styles['upload-queue-header-inner']}>
-              <span className="coz-desktop">
+              <span className={styles['u-hide--mob']}>
                 {t('UploadQueue.header', { smart_count: queue.length })}
               </span>
-              <span className="coz-mobile">
+              <span className={styles['u-hide--desk']}>
                 {t('UploadQueue.header_mobile', {
                   done: doneCount,
                   total: queue.length
diff --git a/src/drive/mobile/components/OnBoarding.jsx b/src/drive/mobile/components/OnBoarding.jsx
index 641d8f9b2c..188ccecaf8 100644
--- a/src/drive/mobile/components/OnBoarding.jsx
+++ b/src/drive/mobile/components/OnBoarding.jsx
@@ -38,7 +38,7 @@ export const OnBoarding = ({
     <footer className={styles['wizard-footer']}>
       <button
         role="button"
-        className={'coz-btn coz-btn--regular'}
+        className={classNames(styles['c-btn'], styles['c-btn--regular'])}
         onClick={onActivate}
       >
         {onSkip && t('mobile.onboarding.step.button')}
diff --git a/src/drive/mobile/containers/DebugTools.jsx b/src/drive/mobile/containers/DebugTools.jsx
index 1e75bf9669..cfb37ffadc 100644
--- a/src/drive/mobile/containers/DebugTools.jsx
+++ b/src/drive/mobile/containers/DebugTools.jsx
@@ -3,9 +3,14 @@ import React, { Component } from 'react'
 import { connect } from 'react-redux'
 import { logException, logInfo } from '../lib/reporter'
 import { setFirstReplication, setOffline } from '../../actions/settings'
+import classNames from 'classnames'
+import styles from 'cozy-ui/stylus/components/button'
 
 const Button = ({ onClick, children }) => (
-  <button onClick={onClick} className={'coz-btn coz-btn--regular'}>
+  <button
+    onClick={onClick}
+    className={classNames(styles['c-btn'], styles['c-btn--regular'])}
+  >
     {children}
   </button>
 )
diff --git a/src/drive/mobile/containers/RatingModal.jsx b/src/drive/mobile/containers/RatingModal.jsx
index 46065fed60..149f76b7a7 100644
--- a/src/drive/mobile/containers/RatingModal.jsx
+++ b/src/drive/mobile/containers/RatingModal.jsx
@@ -4,6 +4,7 @@ import Modal, { ModalContent } from 'cozy-ui/react/Modal'
 import { connect } from 'react-redux'
 import withPersistentState from '../lib/withPersistentState'
 import { SOFTWARE_ID, SOFTWARE_NAME } from '../lib/constants'
+import classNames from 'classnames'
 
 import styles from '../styles/rating'
 
@@ -83,13 +84,16 @@ class EnjoyCozy extends Component {
         <ModalContent>
           <div className={styles['button-block']}>
             <button
-              className="coz-btn coz-btn--secondary"
+              className={classNames(
+                styles['c-btn'],
+                styles['c-btn--secondary']
+              )}
               onClick={() => onReply(false)}
             >
               {t('mobile.rating.enjoy.no')}
             </button>
             <button
-              className="coz-btn coz-btn--regular"
+              className={classNames(styles['c-btn'], styles['c-btn--regular'])}
               onClick={() => onReply(true)}
             >
               {t('mobile.rating.enjoy.yes')}
@@ -150,14 +154,20 @@ class FeeedbackForm extends Component {
             />
             <div className={styles['button-block']}>
               <button
-                className="coz-btn coz-btn--secondary"
+                className={classNames(
+                  styles['c-btn'],
+                  styles['c-btn--secondary']
+                )}
                 type="button"
                 onClick={() => onClose(false)}
               >
                 {t('mobile.rating.feedback.no')}
               </button>
               <button
-                className="coz-btn coz-btn--regular"
+                className={classNames(
+                  styles['c-btn'],
+                  styles['c-btn--regular']
+                )}
                 type="submit"
                 aria-busy={sending}
               >
diff --git a/src/drive/mobile/containers/onboarding/SelectServer.jsx b/src/drive/mobile/containers/onboarding/SelectServer.jsx
index 5a2a0c3847..925bdee9b8 100644
--- a/src/drive/mobile/containers/onboarding/SelectServer.jsx
+++ b/src/drive/mobile/containers/onboarding/SelectServer.jsx
@@ -67,7 +67,7 @@ export class SelectServer extends Component {
         <footer className={styles['wizard-footer']}>
           <button
             role="button"
-            className={'coz-btn coz-btn--regular'}
+            className={classNames(styles['c-btn'], styles['c-btn--regular'])}
             onClick={() => selectServer(serverUrl)}
             disabled={error || !serverUrl}
           >
diff --git a/src/drive/mobile/containers/onboarding/Welcome.jsx b/src/drive/mobile/containers/onboarding/Welcome.jsx
index 876517800c..8f095994db 100644
--- a/src/drive/mobile/containers/onboarding/Welcome.jsx
+++ b/src/drive/mobile/containers/onboarding/Welcome.jsx
@@ -32,7 +32,7 @@ export class Welcome extends Component {
         <footer className={styles['wizard-footer']}>
           <button
             role="button"
-            className="coz-btn coz-btn--regular"
+            className={classNames(styles['c-btn'], styles['c-btn--regular'])}
             onClick={nextStep}
           >
             {t('mobile.onboarding.welcome.button')}
diff --git a/src/drive/styles/toolbar.styl b/src/drive/styles/toolbar.styl
index 66da58c6c3..ad9d16083b 100644
--- a/src/drive/styles/toolbar.styl
+++ b/src/drive/styles/toolbar.styl
@@ -3,8 +3,6 @@
 .fil-toolbar-files
 .fil-toolbar-trash
     margin-left auto
-    .coz-btn:last-child
-        margin-right 0
 
     .fil-toolbar-more-btn
         @extends $button--secondary
diff --git a/src/layout/pushClient/Banner.jsx b/src/layout/pushClient/Banner.jsx
index 71d174b0b8..446d3ebc3b 100644
--- a/src/layout/pushClient/Banner.jsx
+++ b/src/layout/pushClient/Banner.jsx
@@ -47,7 +47,7 @@ class BannerClient extends Component {
           <a
             href={t('Nav.link-client')}
             target="_blank"
-            className={classNames('coz-btn')}
+            className={classNames(styles['c-btn'])}
             onClick={e => {
               this.markAsSeen('banner')
             }}
@@ -56,7 +56,7 @@ class BannerClient extends Component {
           </a>
         </p>
         <button
-          className={classNames('coz-btn', styles['coz-btn--close'])}
+          className={classNames(styles['c-btn'], styles['c-btn--close'])}
           onClick={e => {
             this.markAsSeen('close')
           }}
diff --git a/src/layout/pushClient/pushClient.styl b/src/layout/pushClient/pushClient.styl
index d971f15e38..b5522ddbed 100644
--- a/src/layout/pushClient/pushClient.styl
+++ b/src/layout/pushClient/pushClient.styl
@@ -34,8 +34,7 @@
         span
             padding-right 2em
 
-    .coz-btn--close
-        @extend $button--close
+    .c-btn--close
         position   absolute
         right      0
         top        50%
diff --git a/src/photos/components/Alerter.jsx b/src/photos/components/Alerter.jsx
index 955f19969d..618a15899f 100644
--- a/src/photos/components/Alerter.jsx
+++ b/src/photos/components/Alerter.jsx
@@ -75,7 +75,10 @@ class Alert extends Component {
           {buttonText && (
             <a
               onClick={buttonAction}
-              className={classNames('coz-btn', `coz-btn--alert-${type}`)}
+              className={classNames(
+                styles['c-btn'],
+                styles[`c-btn-alert-${type}`]
+              )}
             >
               {buttonText}
             </a>
diff --git a/src/photos/components/CreateAlbumForm.jsx b/src/photos/components/CreateAlbumForm.jsx
index 282a0c50ee..170af57d4d 100644
--- a/src/photos/components/CreateAlbumForm.jsx
+++ b/src/photos/components/CreateAlbumForm.jsx
@@ -71,11 +71,7 @@ export class CreateAlbumForm extends Component {
             value={this.state.name}
           />
           <button
-            className={classNames(
-              'coz-btn',
-              'coz-btn--regular',
-              styles['coz-btn']
-            )}
+            className={classNames(styles['c-btn'], styles['c-btn--regular'])}
             disabled={this.state.isSubmitDisabled || this.state.isBusy}
             aria-busy={this.state.isBusy}
           >
diff --git a/src/photos/components/DeleteButton.jsx b/src/photos/components/DeleteButton.jsx
index e58dd2fb5e..816b784375 100644
--- a/src/photos/components/DeleteButton.jsx
+++ b/src/photos/components/DeleteButton.jsx
@@ -1,5 +1,7 @@
 import React from 'react'
 import { translate } from 'cozy-ui/react/I18n'
+import classNames from 'classnames'
+import button from 'cozy-ui/stylus/components/button'
 
 const styles = {
   parent: {
@@ -29,8 +31,12 @@ export const DeleteButton = ({
     role="button"
     disabled={disabled}
     className={`${className} ${type === 'menu-item'
-      ? 'coz-link--delete'
-      : 'coz-btn coz-btn--danger coz-btn--delete'}`}
+      ? button['c-link--delete']
+      : classNames(
+          button['c-btn'],
+          button['c-btn--danger'],
+          button['c-btn--delete']
+        )}`}
     style={styles.parent}
   >
     {label}
diff --git a/src/photos/components/ErrorComponent.jsx b/src/photos/components/ErrorComponent.jsx
index d89f9306d4..ee1a672aee 100644
--- a/src/photos/components/ErrorComponent.jsx
+++ b/src/photos/components/ErrorComponent.jsx
@@ -1,7 +1,8 @@
-import styles from '../styles/emptyAndError'
-
 import React from 'react'
 import { translate } from 'cozy-ui/react/I18n'
+import classNames from 'classnames'
+
+import styles from '../styles/emptyAndError'
 
 export const ErrorComponent = ({ t, errorType }) => {
   return (
@@ -9,7 +10,7 @@ export const ErrorComponent = ({ t, errorType }) => {
       <h2>{t(`Error.${errorType}_title`)}</h2>
       <button
         role="button"
-        className="coz-btn coz-btn--regular"
+        className={classNames(styles['c-btn'], styles['c-btn--regular'])}
         onClick={() => window.location.reload()}
       >
         {t('Error.refresh')}
diff --git a/src/photos/components/Menu.jsx b/src/photos/components/Menu.jsx
index d6f95b2f56..7c1fd1e275 100644
--- a/src/photos/components/Menu.jsx
+++ b/src/photos/components/Menu.jsx
@@ -1,8 +1,8 @@
-import styles from '../styles/menu'
-
 import React, { Component } from 'react'
 import classNames from 'classnames'
 
+import styles from '../styles/menu'
+
 export const Item = ({ children, onClick }) => (
   <div onClick={onClick} className={styles['coz-menu-item']}>
     {children}
@@ -64,7 +64,7 @@ export default class Menu extends Component {
         {!button && (
           <button
             role="button"
-            className={classNames('coz-btn', buttonClassName)}
+            className={classNames(styles['c-btn'], buttonClassName)}
             disabled={disabled}
             onClick={this.toggle}
           >
diff --git a/src/photos/components/MoreButton.jsx b/src/photos/components/MoreButton.jsx
index a82646ce83..14df8553dd 100644
--- a/src/photos/components/MoreButton.jsx
+++ b/src/photos/components/MoreButton.jsx
@@ -1,17 +1,17 @@
-import styles from '../styles/toolbar'
-
 import React from 'react'
 import classNames from 'classnames'
 import { translate } from 'cozy-ui/react/I18n'
 
+import styles from '../styles/toolbar'
+
 const MoreButton = ({ t, disabled, onClick }) => (
   <button
     role="button"
-    className={classNames('coz-btn', styles['pho-toolbar-more-btn'])}
+    className={classNames(styles['c-btn'], styles['pho-toolbar-more-btn'])}
     disabled={disabled}
     onClick={onClick}
   >
-    <span className="coz-hidden">{t('Toolbar.more')}</span>
+    <span className={styles['u-visuallyhidden']}>{t('Toolbar.more')}</span>
   </button>
 )
 
diff --git a/src/photos/components/PhotoBoard.jsx b/src/photos/components/PhotoBoard.jsx
index 15d994da9a..74466d4c64 100644
--- a/src/photos/components/PhotoBoard.jsx
+++ b/src/photos/components/PhotoBoard.jsx
@@ -8,6 +8,7 @@ import PhotoList from './PhotoList'
 import Empty from './Empty'
 import Loading from './Loading'
 import ErrorComponent from './ErrorComponent'
+import classNames from 'classnames'
 
 const Spinner = () => <div className={styles['pho-list-spinner']} />
 
@@ -33,13 +34,13 @@ class MoreButton extends Component {
     return (
       <div style={{ width: width }} className={styles['pho-list-morebutton']}>
         {fetching && (
-          <button className="coz-btn" disabled>
+          <button className={styles['c-btn']} disabled>
             <Spinner />
           </button>
         )}
         {!fetching && (
           <button
-            className="coz-btn coz-btn--secondary"
+            className={classNames(styles['c-btn'], styles['c-btn--secondary'])}
             onClick={() => this.handleClick()}
           >
             {children}
diff --git a/src/photos/components/ShareButton.jsx b/src/photos/components/ShareButton.jsx
index 02568eb05f..e4f6c0c79b 100644
--- a/src/photos/components/ShareButton.jsx
+++ b/src/photos/components/ShareButton.jsx
@@ -6,7 +6,11 @@ import styles from '../styles/shareButton'
 export const ShareButton = ({ label, onClick }) => (
   <button
     role="button"
-    className={classNames('coz-btn', 'coz-btn--secondary', 'coz-btn--share')}
+    className={classNames(
+      styles['c-btn'],
+      styles['c-btn--secondary'],
+      styles['c-btn--share']
+    )}
     onClick={() => onClick()}
   >
     {label}
@@ -16,7 +20,7 @@ export const ShareButton = ({ label, onClick }) => (
 export const SharedByMeButton = ({ label, onClick }) => (
   <button
     role="button"
-    className={classNames('coz-btn', styles['coz-btn-shared'])}
+    className={classNames(styles['c-btn'], styles['coz-btn-shared'])}
     onClick={() => onClick()}
   >
     {label}
@@ -26,7 +30,7 @@ export const SharedByMeButton = ({ label, onClick }) => (
 export const SharedWithMeButton = ({ label, onClick }) => (
   <button
     role="button"
-    className={classNames('coz-btn', styles['coz-btn-sharedWithMe'])}
+    className={classNames(styles['c-btn'], styles['coz-btn-sharedWithMe'])}
     onClick={() => onClick()}
   >
     {label}
diff --git a/src/photos/components/UploadButton.jsx b/src/photos/components/UploadButton.jsx
index a6cd3b29b9..cd2cc216db 100644
--- a/src/photos/components/UploadButton.jsx
+++ b/src/photos/components/UploadButton.jsx
@@ -1,5 +1,8 @@
 import React from 'react'
 import { translate } from 'cozy-ui/react/I18n'
+import classNames from 'classnames'
+
+import button from 'cozy-ui/stylus/components/button'
 
 const styles = {
   parent: {
@@ -29,8 +32,12 @@ export const UploadButton = ({
     role="button"
     disabled={disabled}
     className={`${className} ${type === 'menu-item'
-      ? 'coz-link--upload'
-      : 'coz-btn coz-btn--regular coz-btn--upload'}`}
+      ? button['c-link--upload']
+      : classNames(
+          button['c-btn'],
+          button['c-btn--regular'],
+          button['c-btn--upload']
+        )}`}
     style={styles.parent}
   >
     {label}
diff --git a/src/photos/ducks/albums/components/AlbumToolbar.jsx b/src/photos/ducks/albums/components/AlbumToolbar.jsx
index 04cf0c3721..a3d879e153 100644
--- a/src/photos/ducks/albums/components/AlbumToolbar.jsx
+++ b/src/photos/ducks/albums/components/AlbumToolbar.jsx
@@ -1,5 +1,3 @@
-import styles from '../../../styles/toolbar'
-
 import React, { Component } from 'react'
 import { connect } from 'react-redux'
 import { withRouter, Link } from 'react-router'
@@ -27,6 +25,8 @@ import { ShareModal, SharingDetailsModal } from 'sharing'
 
 import classNames from 'classnames'
 
+import styles from '../../../styles/toolbar'
+
 class AlbumToolbar extends Component {
   state = {
     showShareModal: false,
@@ -63,7 +63,7 @@ class AlbumToolbar extends Component {
     const { deleteAlbum, leaveAlbum, selectItems, onRename } = this.props
     return (
       <div className={styles['pho-toolbar']} role="toolbar">
-        <div className="coz-desktop">
+        <div className={styles['u-hide--mob']}>
           {!sharedByMe &&
             !sharedWithMe && (
               <ShareButton
@@ -92,7 +92,10 @@ class AlbumToolbar extends Component {
           {!sharedWithMe && (
             <Item>
               <a
-                className={classNames(styles['pho-action-share'], 'coz-mobile')}
+                className={classNames(
+                  styles['pho-action-share'],
+                  styles['u-hide--desk']
+                )}
                 onClick={this.showShareModal}
               >
                 {t('Albums.share.cta')}
@@ -125,10 +128,13 @@ class AlbumToolbar extends Component {
               </Link>
             </Item>
           )}
-          <hr className="coz-mobile" />
+          <hr className={styles['u-hide--desk']} />
           <Item>
             <a
-              className={classNames(styles['pho-action-select'], 'coz-mobile')}
+              className={classNames(
+                styles['pho-action-select'],
+                styles['u-hide--desk']
+              )}
               onClick={selectItems}
             >
               {t('Toolbar.menu.select_items')}
diff --git a/src/photos/ducks/albums/components/AlbumsToolbar.jsx b/src/photos/ducks/albums/components/AlbumsToolbar.jsx
index 60f2a1ec86..0ae9a88823 100644
--- a/src/photos/ducks/albums/components/AlbumsToolbar.jsx
+++ b/src/photos/ducks/albums/components/AlbumsToolbar.jsx
@@ -1,5 +1,3 @@
-import styles from '../../../styles/toolbar'
-
 import React from 'react'
 import { Link } from 'react-router'
 import classNames from 'classnames'
@@ -8,14 +6,16 @@ import { translate } from 'cozy-ui/react/I18n'
 import Menu, { Item } from '../../../components/Menu'
 import MoreButton from '../../../components/MoreButton'
 
+import styles from '../../../styles/toolbar'
+
 const AlbumsToolbar = ({ t }) => (
   <div className={styles['pho-toolbar']} role="toolbar">
-    <div className="coz-desktop">
+    <div className={styles['u-hide--mob']}>
       <Link
         role="button"
         className={classNames(
-          'coz-btn',
-          'coz-btn--secondary',
+          styles['c-btn'],
+          styles['c-btn--secondary'],
           styles['pho-btn-new']
         )}
         to="/albums/new"
@@ -24,7 +24,7 @@ const AlbumsToolbar = ({ t }) => (
       </Link>
     </div>
     <Menu
-      className={classNames(styles['pho-toolbar-menu'], 'coz-mobile')}
+      className={classNames(styles['pho-toolbar-menu'], styles['u-hide--desk'])}
       button={<MoreButton />}
     >
       <Item>
diff --git a/src/photos/ducks/albums/components/PhotosPicker.jsx b/src/photos/ducks/albums/components/PhotosPicker.jsx
index c994980271..9db9fbccdb 100644
--- a/src/photos/ducks/albums/components/PhotosPicker.jsx
+++ b/src/photos/ducks/albums/components/PhotosPicker.jsx
@@ -1,5 +1,3 @@
-import styles from '../../../styles/newAlbum'
-
 import React, { Component } from 'react'
 import { cozyConnect } from 'redux-cozy-client'
 import { withRouter } from 'react-router'
@@ -7,9 +5,13 @@ import { withRouter } from 'react-router'
 import { fetchTimeline, getPhotosByMonth } from '../../timeline'
 import { createAlbum, fetchAlbum, addToAlbum } from '..'
 
+import classNames from 'classnames'
+
 import PhotoBoard from '../../../components/PhotoBoard'
 import Alerter from '../../../components/Alerter'
 
+import styles from '../../../styles/newAlbum'
+
 class PhotosPicker extends Component {
   constructor(props) {
     super(props)
@@ -158,13 +160,19 @@ class PhotosPicker extends Component {
             <div className={styles['pho-panel-wrap']}>
               <div className={styles['pho-panel-controls']}>
                 <button
-                  className="coz-btn coz-btn--secondary"
+                  className={classNames(
+                    styles['c-btn'],
+                    styles['c-btn--secondary']
+                  )}
                   onClick={this.onCancel}
                 >
                   {t('Albums.create.panel_form.cancel')}
                 </button>
                 <button
-                  className="coz-btn coz-btn--regular"
+                  className={classNames(
+                    styles['c-btn'],
+                    styles['c-btn--regular']
+                  )}
                   onClick={isNew ? this.onCreate : this.onUpdate}
                 >
                   {t(
diff --git a/src/photos/ducks/timeline/components/Toolbar.jsx b/src/photos/ducks/timeline/components/Toolbar.jsx
index a65950b47b..39c4184276 100644
--- a/src/photos/ducks/timeline/components/Toolbar.jsx
+++ b/src/photos/ducks/timeline/components/Toolbar.jsx
@@ -24,7 +24,7 @@ export const Toolbar = ({
 }) => (
   <div className={styles['pho-toolbar']} role="toolbar">
     <UploadButton
-      className="coz-desktop"
+      className={styles['u-hide--mob']}
       onUpload={uploadPhotos}
       disabled={disabled}
       label={t('Toolbar.photo_upload')}
@@ -40,10 +40,10 @@ export const Toolbar = ({
           disabled={disabled}
           label={t('Toolbar.menu.photo_upload')}
           type="menu-item"
-          className="coz-mobile"
+          className={styles['u-hide--desk']}
         />
       </Item>
-      <hr className="coz-mobile" />
+      <hr className={styles['u-hide--desk']} />
       <Item>
         <a className={styles['pho-action-select']} onClick={selectItems}>
           {t('Toolbar.menu.select_items')}
diff --git a/src/photos/ducks/upload/UploadQueue.jsx b/src/photos/ducks/upload/UploadQueue.jsx
index 3edf0ccadb..f47d025830 100644
--- a/src/photos/ducks/upload/UploadQueue.jsx
+++ b/src/photos/ducks/upload/UploadQueue.jsx
@@ -63,7 +63,7 @@ const InProgressHeader = translate()(({ t, total, done }) => (
     <span className="coz-desktop">
       {t('UploadQueue.header', { smart_count: total })}
     </span>
-    <span className="coz-mobile">
+    <span className={styles['u-hide--desk']}>
       {t('UploadQueue.header_mobile', { done, total })}
     </span>
   </div>
diff --git a/src/photos/styles/createAlbumForm.styl b/src/photos/styles/createAlbumForm.styl
index b4286b7fd2..1b9bd624af 100644
--- a/src/photos/styles/createAlbumForm.styl
+++ b/src/photos/styles/createAlbumForm.styl
@@ -20,13 +20,13 @@
             flex-grow    1
 
         .coz-input-text,
-        .coz-btn
+        .c-btn
             font-size  1em
             height     3em
             margin-right .3em
             align-self stretch
 
-        .coz-btn
+        .c-btn
             margin-right 0
             padding-left 2.5em
             padding-right 2.5em
@@ -35,6 +35,6 @@
                 padding-right 1em
 
 @media (max-width: (1023/basefont)rem)
-    .pho-create-album-form .coz-inline-form .coz-btn
+    .pho-create-album-form .coz-inline-form .c-btn
         padding-left 1.5em
         padding-right 1.5em
diff --git a/src/photos/styles/main.styl b/src/photos/styles/main.styl
index 27806ecc93..432372b35e 100755
--- a/src/photos/styles/main.styl
+++ b/src/photos/styles/main.styl
@@ -1,4 +1,3 @@
-@import 'cozy-ui/defaults'
 @require 'cozy-ui'
 
 :global
diff --git a/src/photos/styles/nav.styl b/src/photos/styles/nav.styl
index 6cc8fb383a..bacd635855 100644
--- a/src/photos/styles/nav.styl
+++ b/src/photos/styles/nav.styl
@@ -1,21 +1,31 @@
 @require 'cozy-ui'
 
-[role=application]
-    @extend $navigation
+.coz-nav
+    @extend .c-nav
+
+.coz-nav-item
+    @extend .c-nav-item
+
+.coz-nav-link
+    @extend .c-nav-link
 
 .pho-cat-photos
-    background: embedurl("../assets/icons/icon-image.svg")
+    background-image: embedurl("../assets/icons/icon-image.svg")
     &.active
+        @extend .c-nav-link.is-active
         background-image: embedurl("../assets/icons/icon-image-active.svg")
 .pho-cat-albums
-    background: embedurl("../assets/icons/icon-album.svg")
+    background-image: embedurl("../assets/icons/icon-album.svg")
     &.active
+        @extend .c-nav-link.is-active
         background-image: embedurl("../assets/icons/icon-album-active.svg")
 .pho-cat-shared
-    background: embedurl("../assets/icons/icon-share.svg")
+    background-image: embedurl("../assets/icons/icon-share.svg")
     &.active
+        @extend .c-nav-link.is-active
         background-image: embedurl("../assets/icons/icon-share-active.svg")
 .pho-cat-trash
-    background: embedurl("../assets/icons/icon-trash.svg")
+    background-image: embedurl("../assets/icons/icon-trash.svg")
     &.active
+        @extend .c-nav-link.is-active
         background-image: embedurl("../assets/icons/icon-trash-active.svg")
diff --git a/src/photos/styles/sidebar.styl b/src/photos/styles/sidebar.styl
index bf932e6267..07e260901e 100644
--- a/src/photos/styles/sidebar.styl
+++ b/src/photos/styles/sidebar.styl
@@ -1,7 +1,4 @@
 @require 'cozy-ui'
 
-:local
-    @extend $sidebar
-
-    .coz-sidebar
-      justify-content  space-between
+.coz-sidebar
+    @extend .o-sidebar
diff --git a/src/sharing/components/ShareByEmail.jsx b/src/sharing/components/ShareByEmail.jsx
index 6adcb4cca6..73ba934eab 100644
--- a/src/sharing/components/ShareByEmail.jsx
+++ b/src/sharing/components/ShareByEmail.jsx
@@ -162,7 +162,7 @@ class ShareByEmail extends React.Component {
             </option>
           </select>
           <button
-            className={classnames('coz-btn', 'coz-btn--regular')}
+            className={classnames(styles['c-btn'], styles['c-btn--regular'])}
             disabled={this.state.recipients.length === 0}
             onClick={e => this.sendSharingLink()}
           >
diff --git a/src/sharing/components/ShareByLink.jsx b/src/sharing/components/ShareByLink.jsx
index 8c8f5fa719..0800abb753 100644
--- a/src/sharing/components/ShareByLink.jsx
+++ b/src/sharing/components/ShareByLink.jsx
@@ -45,8 +45,8 @@ export const ShareWithLink = (
             <div>
               <button
                 className={classnames(
-                  'coz-btn',
-                  'coz-btn--secondary',
+                  styles['c-btn'],
+                  styles['c-btn--secondary'],
                   styles['pho-btn-copy']
                 )}
               >
@@ -58,8 +58,8 @@ export const ShareWithLink = (
         {copied && (
           <button
             className={classnames(
-              'coz-btn',
-              'coz-btn--secondary',
+              styles['c-btn'],
+              styles['c-btn--secondary'],
               styles['pho-btn-copied']
             )}
             aria-disabled
diff --git a/targets/photos/web/index.ejs b/targets/photos/web/index.ejs
index f349b16148..8a3032ff00 100755
--- a/targets/photos/web/index.ejs
+++ b/targets/photos/web/index.ejs
@@ -3,6 +3,7 @@
 <head>
   <meta charset="utf-8">
   <title><%= htmlWebpackPlugin.options.title %></title>
+  <link rel="stylesheet" type="text/css" href="//{{.Domain}}/assets/fonts/fonts.css">
   <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
   <link rel="icon" type="image/png" href="/favicon-32x32.png" sizes="32x32">
   <link rel="icon" type="image/png" href="/favicon-16x16.png" sizes="16x16">

From c92e351a0e4e80e60ec547c8f9a8d015ae1ac7e9 Mon Sep 17 00:00:00 2001
From: GoOz <gooz@foojin.com>
Date: Tue, 26 Sep 2017 11:48:31 +0200
Subject: [PATCH 24/30] =?UTF-8?q?=E2=AC=86=20Updating=20Cozy-UI=20dependen?=
 =?UTF-8?q?cy?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 75 +++++++++++++++++++++++++++-------------------------
 yarn.lock    | 14 +++++++---
 2 files changed, 49 insertions(+), 40 deletions(-)

diff --git a/package.json b/package.json
index a1f5b16a0b..98a307b3b5 100644
--- a/package.json
+++ b/package.json
@@ -4,18 +4,24 @@
   "main": "src/main.jsx",
   "scripts": {
     "build:drive": "npm run build:drive:browser",
-    "build:drive:browser": "npm run internal:build -- --env.app=drive --env.target=browser --env.production",
-    "build:drive:mobile": "npm run internal:build -- --env.app=drive --env.target=mobile --env.production",
+    "build:drive:browser":
+      "npm run internal:build -- --env.app=drive --env.target=browser --env.production",
+    "build:drive:mobile":
+      "npm run internal:build -- --env.app=drive --env.target=mobile --env.production",
     "build:photos": "npm run build:photos:browser",
-    "build:photos:browser": "npm run internal:build -- --env.app=photos --env.target=browser --env.production",
+    "build:photos:browser":
+      "npm run internal:build -- --env.app=photos --env.target=browser --env.production",
     "clean:browser": "rm -rf build/*",
     "clean:drive:browser": "rm -rf build/drive/*",
     "clean:photos:browser": "rm -rf build/photos/*",
     "clean:mobile": "rm -rf targets/*/mobile/www/*",
-    "deploy:drive": "git-directory-deploy --directory=build/drive/ --username=Cozy --email=contact@cozycloud.cc --repo=https://$GITHUB_TOKEN@github.com/cozy/cozy-drive.git",
-    "deploy:photos": "git-directory-deploy --directory=build/photos/ --username=Cozy --email=contact@cozycloud.cc --repo=https://$GITHUB_TOKEN@github.com/cozy/cozy-drive.git",
+    "deploy:drive":
+      "git-directory-deploy --directory=build/drive/ --username=Cozy --email=contact@cozycloud.cc --repo=https://$GITHUB_TOKEN@github.com/cozy/cozy-drive.git",
+    "deploy:photos":
+      "git-directory-deploy --directory=build/photos/ --username=Cozy --email=contact@cozycloud.cc --repo=https://$GITHUB_TOKEN@github.com/cozy/cozy-drive.git",
     "internal:build": "webpack --config webpack.config.js --bail",
-    "internal:watch": "webpack --config webpack.config.js --watch --display-modules --display-chunks",
+    "internal:watch":
+      "webpack --config webpack.config.js --watch --display-modules --display-chunks",
     "tx": "tx pull --all || true",
     "preinternal:build": "npm-run-all lint tx",
     "prebuild:drive:browser": "npm run clean:drive:browser",
@@ -31,21 +37,32 @@
     "precommit": "lint-staged",
     "test": "node_modules/.bin/jest --coverage --config=jest.config.json",
     "watch:drive": "npm run watch:drive:browser",
-    "watch:drive:browser": "npm run internal:watch -- --env.app=drive --env.target=browser",
-    "watch:drive:mobile": "npm run internal:watch -- --env.app=drive --env.target=mobile",
-    "watch:drive:standalone": "webpack-dev-server --config webpack.config.js --env.app=drive --env.target=mobile --port 8084 --display-modules --display-chunks --inline --hot",
+    "watch:drive:browser":
+      "npm run internal:watch -- --env.app=drive --env.target=browser",
+    "watch:drive:mobile":
+      "npm run internal:watch -- --env.app=drive --env.target=mobile",
+    "watch:drive:standalone":
+      "webpack-dev-server --config webpack.config.js --env.app=drive --env.target=mobile --port 8084 --display-modules --display-chunks --inline --hot",
     "watch:photos": "npm run watch:photos:browser",
-    "watch:photos:browser": "npm run internal:watch -- --env.app=photos --env.target=browser",
-    "mobile:drive:icon": "(cd targets/drive/mobile && splashicon-generator --imagespath='./res/model')",
+    "watch:photos:browser":
+      "npm run internal:watch -- --env.app=photos --env.target=browser",
+    "mobile:drive:icon":
+      "(cd targets/drive/mobile && splashicon-generator --imagespath='./res/model')",
     "mobile:drive:prepare": "(cd targets/drive/mobile && cordova prepare)",
-    "android:drive:run": "(cd targets/drive/mobile && cordova run android --device)",
-    "android:drive:run:emulator": "(cd targets/drive/mobile && cordova run android --emulator)",
-    "android:drive:release": "npm run build:drive:mobile && (cd targets/drive/mobile && cordova build android --release)",
-    "android:drive:signed": "npm run android:drive:release && (cd targets/drive/mobile && apksigner sign --ks keys/android/cozy-drive-release-key.jks --out build/android/cozy-drive.apk platforms/android/build/outputs/apk/android-release-unsigned.apk)",
+    "android:drive:run":
+      "(cd targets/drive/mobile && cordova run android --device)",
+    "android:drive:run:emulator":
+      "(cd targets/drive/mobile && cordova run android --emulator)",
+    "android:drive:release":
+      "npm run build:drive:mobile && (cd targets/drive/mobile && cordova build android --release)",
+    "android:drive:signed":
+      "npm run android:drive:release && (cd targets/drive/mobile && apksigner sign --ks keys/android/cozy-drive-release-key.jks --out build/android/cozy-drive.apk platforms/android/build/outputs/apk/android-release-unsigned.apk)",
     "android:drive:publish": "(cd targets/drive/mobile && fastlane supply)",
     "ios:drive:run": "(cd targets/drive/mobile && cordova run ios --device)",
-    "ios:drive:run:emulator": "(cd targets/drive/mobile && cordova run ios --emulator)",
-    "ios:drive:publish": "npm run build:drive:mobile && (cd targets/drive/mobile && fastlane ios pushtest)"
+    "ios:drive:run:emulator":
+      "(cd targets/drive/mobile && cordova run ios --emulator)",
+    "ios:drive:publish":
+      "npm run build:drive:mobile && (cd targets/drive/mobile && fastlane ios pushtest)"
   },
   "repository": {
     "type": "git",
@@ -134,7 +151,7 @@
     "classnames": "^2.2.0",
     "cozy-bar": "4.1.4",
     "cozy-client-js": "0.3.19",
-    "cozy-ui": "3.0.0-beta46",
+    "cozy-ui": "4.0.2",
     "date-fns": "^1.22.0",
     "diacritics": "^1.3.0",
     "filesize": "^3.3.0",
@@ -163,19 +180,12 @@
     "redux-thunk": "^2.1.0"
   },
   "jest": {
-    "moduleFileExtensions": [
-      "js",
-      "jsx",
-      "json",
-      "styl"
-    ],
+    "moduleFileExtensions": ["js", "jsx", "json", "styl"],
     "moduleNameMapper": {
       "\\.(png|gif|jpe?g|svg)$": "<rootDir>/test/__mocks__/fileMock.js",
       "styles": "identity-obj-proxy"
     },
-    "transformIgnorePatterns": [
-      "node_modules/(?!cozy-ui)"
-    ],
+    "transformIgnorePatterns": ["node_modules/(?!cozy-ui)"],
     "globals": {
       "__ALLOW_HTTP__": false,
       "__TARGET__": "browser",
@@ -193,11 +203,7 @@
       "prettier/react",
       "prettier/standard"
     ],
-    "plugins": [
-      "react",
-      "prettier",
-      "standard"
-    ],
+    "plugins": ["react", "prettier", "standard"],
     "parser": "babel-eslint",
     "parserOptions": {
       "ecmaFeatures": {
@@ -224,9 +230,6 @@
     "singleQuote": true
   },
   "lint-staged": {
-    "{src,test}/**/*.{js,jsx}": [
-      "prettier --write",
-      "git add"
-    ]
+    "{src,test}/**/*.{js,jsx}": ["prettier --write", "git add"]
   }
 }
diff --git a/yarn.lock b/yarn.lock
index c17bfb21bc..623c8d43ec 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1718,13 +1718,15 @@ cozy-client-js@0.3.19:
   version "0.3.19"
   resolved "https://registry.yarnpkg.com/cozy-client-js/-/cozy-client-js-0.3.19.tgz#c20361a8bc6b23eb4d092360040e8765ef5e59a3"
 
-cozy-ui@3.0.0-beta46:
-  version "3.0.0-beta46"
-  resolved "https://registry.yarnpkg.com/cozy-ui/-/cozy-ui-3.0.0-beta46.tgz#4e0c79cd5141c5480106f06e545a0d668441ad8d"
+cozy-ui@4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/cozy-ui/-/cozy-ui-4.0.2.tgz#22813b121fa914d0dbf08879f28a22e1f63350b8"
   dependencies:
     classnames "^2.2.5"
+    date-fns "^1.28.5"
     md5 "^2.2.0"
     normalize.css "^7.0.0"
+    stylus "^0.54.5"
 
 create-ecdh@^4.0.0:
   version "4.0.0"
@@ -1950,6 +1952,10 @@ date-fns@^1.22.0, date-fns@^1.27.2:
   version "1.28.5"
   resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.28.5.tgz#257cfc45d322df45ef5658665967ee841cd73faf"
 
+date-fns@^1.28.5:
+  version "1.29.0"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.29.0.tgz#12e609cdcb935127311d04d33334e2960a2a54e6"
+
 date-now@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
@@ -6958,7 +6964,7 @@ stylus-loader@^2.4.0:
     lodash.clonedeep "^4.5.0"
     when "~3.6.x"
 
-stylus@^0.54.0:
+stylus@^0.54.0, stylus@^0.54.5:
   version "0.54.5"
   resolved "https://registry.yarnpkg.com/stylus/-/stylus-0.54.5.tgz#42b9560931ca7090ce8515a798ba9e6aa3d6dc79"
   dependencies:

From 702a5a4a57c54b2ced4436e458185efd1593d6b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Rougeron?= <goldoraf@gmail.com>
Date: Thu, 19 Oct 2017 11:50:09 +0200
Subject: [PATCH 25/30] [tech] Merged old redux-cozy-client with new
 cozy-client

---
 config/webpack.config.base.js                 |   2 +-
 src/drive/reducers/index.js                   |   2 +-
 src/drive/store/configureStore.js             |   2 +-
 src/lib/cozy-client/CozyClient.js             |  43 ++
 src/lib/cozy-client/DataAccessFacade.js       |  18 +-
 .../cozy-client/adapters/CozyStackAdapter.js  |  62 ++-
 src/lib/cozy-client/connect.jsx               |  33 +-
 src/lib/cozy-client/reducer.js                |   2 +-
 src/lib/redux-cozy-client/CozyAPI.js          | 242 -----------
 src/lib/redux-cozy-client/CozyClient.js       | 138 ------
 src/lib/redux-cozy-client/CozyProvider.jsx    |  34 --
 src/lib/redux-cozy-client/README.md           |  56 ---
 .../redux-cozy-client/__tests__/store.spec.js | 121 ------
 src/lib/redux-cozy-client/connect.jsx         |  56 ---
 src/lib/redux-cozy-client/helpers.js          |  35 --
 src/lib/redux-cozy-client/index.js            |  35 --
 src/lib/redux-cozy-client/middleware.js       |  40 --
 src/lib/redux-cozy-client/reducer.js          | 399 -----------------
 src/lib/redux-cozy-client/slices/sharings.js  | 407 ------------------
 src/lib/redux-cozy-client/utils.js            |  26 --
 src/photos/components/ViewerToolbar.jsx       |   2 +-
 src/photos/containers/AddToAlbumModal.jsx     |   2 +-
 src/photos/containers/AlbumItem.jsx           |   2 +-
 src/photos/containers/AlbumPhotos.jsx         |  18 +-
 src/photos/containers/AlbumsView.jsx          |   2 +-
 src/photos/containers/Timeline.jsx            |   2 +-
 .../ducks/albums/components/AlbumToolbar.jsx  |   2 +-
 .../ducks/albums/components/PhotosPicker.jsx  |   2 +-
 src/photos/ducks/albums/index.js              |   7 +-
 src/photos/ducks/selection/index.js           |   2 +-
 src/photos/ducks/timeline/index.js            |   3 +-
 src/photos/middlewares/EventTracker.js        |   2 +-
 src/photos/reducers/index.js                  |   2 +-
 src/sharing/ShareModal.jsx                    |   2 +-
 src/sharing/SharingDetailsModal.jsx           |   2 +-
 targets/drive/web/main.jsx                    |   2 +-
 targets/photos/web/main.jsx                   |   2 +-
 targets/photos/web/public/App.jsx             |   2 +-
 targets/photos/web/public/main.jsx            |  40 +-
 39 files changed, 177 insertions(+), 1674 deletions(-)
 delete mode 100644 src/lib/redux-cozy-client/CozyAPI.js
 delete mode 100644 src/lib/redux-cozy-client/CozyClient.js
 delete mode 100644 src/lib/redux-cozy-client/CozyProvider.jsx
 delete mode 100644 src/lib/redux-cozy-client/README.md
 delete mode 100644 src/lib/redux-cozy-client/__tests__/store.spec.js
 delete mode 100644 src/lib/redux-cozy-client/connect.jsx
 delete mode 100644 src/lib/redux-cozy-client/helpers.js
 delete mode 100644 src/lib/redux-cozy-client/index.js
 delete mode 100644 src/lib/redux-cozy-client/middleware.js
 delete mode 100644 src/lib/redux-cozy-client/reducer.js
 delete mode 100644 src/lib/redux-cozy-client/slices/sharings.js
 delete mode 100644 src/lib/redux-cozy-client/utils.js

diff --git a/config/webpack.config.base.js b/config/webpack.config.base.js
index 812d7baf59..7186f36135 100644
--- a/config/webpack.config.base.js
+++ b/config/webpack.config.base.js
@@ -13,7 +13,7 @@ module.exports = function(production) {
       modules: ['node_modules', SRC_DIR],
       extensions: ['.js', '.json', '.css'],
       alias: {
-        'redux-cozy-client': path.resolve(SRC_DIR, './lib/redux-cozy-client'),
+        'cozy-client': path.resolve(SRC_DIR, './lib/cozy-client'),
         'react-cozy-helpers': path.resolve(SRC_DIR, './lib/react-cozy-helpers')
       }
     },
diff --git a/src/drive/reducers/index.js b/src/drive/reducers/index.js
index fd8129f07b..06b2498b07 100644
--- a/src/drive/reducers/index.js
+++ b/src/drive/reducers/index.js
@@ -9,7 +9,7 @@ import renameReducer from '../ducks/files/rename'
 import upload from '../ducks/upload'
 import alerterReducer from 'cozy-ui/react/Alerter'
 import availableOffline from '../ducks/files/availableOffline'
-import { reducer } from 'redux-cozy-client'
+import { reducer } from 'cozy-client'
 import uiReducer from 'react-cozy-helpers'
 
 export const reducers = {
diff --git a/src/drive/store/configureStore.js b/src/drive/store/configureStore.js
index 2af13876fa..19ad09adf8 100644
--- a/src/drive/store/configureStore.js
+++ b/src/drive/store/configureStore.js
@@ -5,7 +5,7 @@ import {
   getTracker,
   createTrackerMiddleware
 } from 'cozy-ui/react/helpers/tracker'
-import { cozyMiddleware } from 'redux-cozy-client'
+import { cozyMiddleware } from 'cozy-client'
 import thunkMiddleware from 'redux-thunk'
 import eventTrackerMiddleware from '../middlewares/EventTracker'
 import rootReducer from '../reducers'
diff --git a/src/lib/cozy-client/CozyClient.js b/src/lib/cozy-client/CozyClient.js
index 9a9f2f7819..154d92d684 100644
--- a/src/lib/cozy-client/CozyClient.js
+++ b/src/lib/cozy-client/CozyClient.js
@@ -3,6 +3,7 @@ import DataAccessFacade from './DataAccessFacade'
 import { authenticateWithCordova } from './authentication/mobile'
 
 const FILES_DOCTYPE = 'io.cozy.files'
+const SHARINGS_DOCTYPE = 'io.cozy.sharings'
 
 export default class CozyClient {
   constructor(config) {
@@ -94,6 +95,48 @@ export default class CozyClient {
     return this.getAdapter(doc._type).deleteDocument(doc)
   }
 
+  async fetchSharings(doctype) {
+    const permissions = await this.getAdapter(doctype).fetchSharingPermissions(
+      doctype
+    )
+    const sharingIds = [
+      ...permissions.byMe.map(p => p.attributes.source_id),
+      ...permissions.withMe.map(p => p.attributes.source_id)
+    ]
+    const sharings = await Promise.all(
+      sharingIds.map(id => this.getAdapter(SHARINGS_DOCTYPE).fetchSharing(id))
+    )
+    return { permissions, sharings }
+  }
+
+  createSharing(permissions, contactIds, sharingType, description) {
+    return this.getAdapter(SHARINGS_DOCTYPE).createSharing(
+      permissions,
+      contactIds,
+      sharingType,
+      description
+    )
+  }
+
+  revokeSharing(sharingId) {
+    return this.getAdapter(SHARINGS_DOCTYPE).revokeSharing(sharingId)
+  }
+
+  revokeSharingForClient(sharingId, clientId) {
+    return this.getAdapter(SHARINGS_DOCTYPE).revokeSharingForClient(
+      sharingId,
+      clientId
+    )
+  }
+
+  createSharingLink(permissions) {
+    return this.getAdapter(SHARINGS_DOCTYPE).createSharingLink(permissions)
+  }
+
+  revokeSharingLink(permission) {
+    return this.getAdapter(SHARINGS_DOCTYPE).revokeSharingLink(permission)
+  }
+
   createFile(file, dirID) {
     return this.getAdapter(FILES_DOCTYPE).createFile(file, dirID)
   }
diff --git a/src/lib/cozy-client/DataAccessFacade.js b/src/lib/cozy-client/DataAccessFacade.js
index bcc7fdefc8..0660c443ea 100644
--- a/src/lib/cozy-client/DataAccessFacade.js
+++ b/src/lib/cozy-client/DataAccessFacade.js
@@ -1,4 +1,4 @@
-/* global cozy */
+/* global cozy, PouchDB */
 import CozyStackAdapter from './adapters/CozyStackAdapter'
 import PouchdbAdapter from './adapters/PouchdbAdapter'
 
@@ -8,9 +8,13 @@ import PouchdbAdapter from './adapters/PouchdbAdapter'
 export default class DataAccessFacade {
   constructor() {
     this.stackAdapter = new CozyStackAdapter()
-    this.pouchAdapter = new PouchdbAdapter()
-    // TODO: strategy injection
-    this.strategy = new PouchFirstStrategy()
+    if (typeof PouchDB !== 'undefined') {
+      this.pouchAdapter = new PouchdbAdapter()
+      // TODO: strategy injection
+      this.strategy = new PouchFirstStrategy()
+    } else {
+      this.strategy = new StackOnlyStrategy()
+    }
   }
 
   setup(cozyUrl, options) {
@@ -43,6 +47,12 @@ class PouchFirstStrategy {
   }
 }
 
+class StackOnlyStrategy {
+  getAdapter(doctype, stackAdapter, pouchAdapter) {
+    return stackAdapter
+  }
+}
+
 // class OfflineStrategy {
 //   getAdapter(doctype, stackAdapter, pouchAdapter) {
 //     if (isOffline()) {
diff --git a/src/lib/cozy-client/adapters/CozyStackAdapter.js b/src/lib/cozy-client/adapters/CozyStackAdapter.js
index efd8ed86f6..912ac4ee7a 100644
--- a/src/lib/cozy-client/adapters/CozyStackAdapter.js
+++ b/src/lib/cozy-client/adapters/CozyStackAdapter.js
@@ -2,6 +2,10 @@
 const FILES_DOCTYPE = 'io.cozy.files'
 const FETCH_LIMIT = 50
 
+export const SHARED_BY_LINK = 'sharedByLink'
+export const SHARED_WITH_ME = 'sharedWithMe'
+export const SHARED_WITH_OTHERS = 'sharedWithOthers'
+
 export default class CozyStackAdapter {
   async fetchDocuments(doctype) {
     // WARN: cozy-client-js lacks a cozy.data.findAll method that uses this route
@@ -171,8 +175,62 @@ export default class CozyStackAdapter {
     return ids
   }
 
-  startSync() {
-    return Promise.resolve()
+  async fetchSharingPermissions(doctype) {
+    const fetchPermissions = (doctype, sharingType) =>
+      cozy.client.fetchJSON(
+        'GET',
+        `/permissions/doctype/${doctype}/${sharingType}`
+      )
+
+    const byMe = await fetchPermissions(doctype, SHARED_WITH_OTHERS)
+    const byLink = await fetchPermissions(doctype, SHARED_BY_LINK)
+    const withMe = await fetchPermissions(doctype, SHARED_WITH_ME)
+
+    return { byMe, byLink, withMe }
+  }
+
+  fetchSharing(id) {
+    return cozy.client.fetchJSON('GET', `/sharings/${id}`)
+  }
+
+  createSharing(permissions, contactIds, sharingType, description) {
+    return cozy.client.fetchJSON('POST', '/sharings/', {
+      desc: description,
+      permissions,
+      recipients: contactIds.map(contactId => ({
+        recipient: {
+          id: contactId,
+          type: 'io.cozy.contacts'
+        }
+      })),
+      sharing_type: sharingType
+    })
+  }
+
+  revokeSharing(sharingId) {
+    return cozy.client.fetchJSON('DELETE', `/sharings/${sharingId}`)
+  }
+
+  revokeSharingForClient(sharingId, clientId) {
+    return cozy.client.fetchJSON(
+      'DELETE',
+      `/sharings/${sharingId}/recipient/${clientId}`
+    )
+  }
+
+  createSharingLink(permissions) {
+    return cozy.client.fetchJSON('POST', `/permissions?codes=email`, {
+      data: {
+        type: 'io.cozy.permissions',
+        attributes: {
+          permissions
+        }
+      }
+    })
+  }
+
+  revokeSharingLink(permission) {
+    return cozy.client.fetchJSON('DELETE', `/permissions/${permission._id}`)
   }
 }
 
diff --git a/src/lib/cozy-client/connect.jsx b/src/lib/cozy-client/connect.jsx
index 3326ccdec2..a03afe56c3 100644
--- a/src/lib/cozy-client/connect.jsx
+++ b/src/lib/cozy-client/connect.jsx
@@ -1,28 +1,8 @@
 import React, { Component } from 'react'
 import { connect as reduxConnect } from 'react-redux'
 
-import { getCollection, getDocument } from '.'
+import { applySelectorForAction, enhancePropsForActions } from '.'
 import { mapValues, filterValues } from './utils'
-import { makeFetchMoreAction } from './reducer'
-
-const isFetchCollection = action =>
-  action.types[0] === 'FETCH_COLLECTION' ||
-  action.types[0] === 'FETCH_REFERENCED_FILES'
-
-const enhanceProps = (props, fetchActions, dispatch) =>
-  mapValues(fetchActions, (action, propName) => {
-    const dataObject = props[propName]
-    if (!isFetchCollection(action)) {
-      return dataObject
-    }
-    const fetchMore = dataObject.hasMore
-      ? () => dispatch(makeFetchMoreAction(action, dataObject.data.length))
-      : null
-    return {
-      ...dataObject,
-      fetchMore
-    }
-  })
 
 const connect = (
   mapDocumentsToProps,
@@ -45,7 +25,7 @@ const connect = (
         f,
         client,
         ...this.props,
-        ...enhanceProps(this.props, fetchActions, store.dispatch)
+        ...enhancePropsForActions(this.props, fetchActions, store.dispatch)
       }
       return <WrappedComponent {...props} />
     }
@@ -58,16 +38,11 @@ const connect = (
     const fetchActions = filterValues(initialProps, prop => isAction(prop))
     const otherProps = filterValues(initialProps, prop => !isAction(prop))
 
-    const selector = (state, action) => {
-      return isFetchCollection(action)
-        ? getCollection(state, action.collection)
-        : getDocument(state, action.doctype, action.id)
-    }
-
     const mapStateToProps = state => ({
       ...mapValues(
         fetchActions,
-        action => (isAction(action) ? selector(state, action) : action)
+        action =>
+          isAction(action) ? applySelectorForAction(state, action) : action
       ),
       fetchActions,
       ...otherProps
diff --git a/src/lib/cozy-client/reducer.js b/src/lib/cozy-client/reducer.js
index 5ed9b162b9..8bb9b86d68 100644
--- a/src/lib/cozy-client/reducer.js
+++ b/src/lib/cozy-client/reducer.js
@@ -269,7 +269,7 @@ export const fetchDocument = (doctype, id) => ({
 
 export const fetchReferencedFiles = (doc, skip = 0) => ({
   types: [FETCH_REFERENCED_FILES, RECEIVE_DATA, RECEIVE_ERROR],
-  collection: `${doc.type}/${doc.id}#files`,
+  collection: `${doc._type}/${doc.id}#files`,
   document: doc,
   options: {},
   skip,
diff --git a/src/lib/redux-cozy-client/CozyAPI.js b/src/lib/redux-cozy-client/CozyAPI.js
deleted file mode 100644
index 2583589382..0000000000
--- a/src/lib/redux-cozy-client/CozyAPI.js
+++ /dev/null
@@ -1,242 +0,0 @@
-/* global cozy */
-const FILES_DOCTYPE = 'io.cozy.files'
-const FETCH_LIMIT = 50
-export const SHARED_BY_LINK = 'sharedByLink'
-export const SHARED_WITH_ME = 'sharedWithMe'
-export const SHARED_WITH_OTHERS = 'sharedWithOthers'
-
-export default class CozyAPI {
-  constructor(config) {
-    cozy.client.init(config)
-  }
-
-  async fetchDocuments(doctype) {
-    // WARN: cozy-client-js lacks a cozy.data.findAll method that uses this route
-    try {
-      // WARN: if no document of this doctype exist, this route will return a 404,
-      // so we need to try/catch and return an empty response object in case of a 404
-      const resp = await cozy.client.fetchJSON(
-        'GET',
-        `/data/${doctype}/_all_docs?include_docs=true`
-      )
-      // WARN: the JSON response from the stack is not homogenous with other routes (offset? rows? total_rows?)
-      // see https://github.com/cozy/cozy-stack/blob/master/docs/data-system.md#list-all-the-documents
-      // WARN: looks like this route returns something looking like a couchDB design doc, we need to filter it:
-      const rows = resp.rows.filter(row => !row.doc.hasOwnProperty('views'))
-      // we normalize the data (note that we add _type so that cozy.client.data.listReferencedFiles works...)
-      const docs = rows.map(row => ({
-        ...row.doc,
-        id: row.id,
-        type: doctype,
-        _type: doctype
-      }))
-      // we forge a correct JSONAPI response:
-      return {
-        data: docs,
-        meta: { count: resp.total_rows },
-        skip: resp.offset,
-        next: false
-      }
-    } catch (error) {
-      if (error.message.match(/not_found/)) {
-        return { data: [], meta: { count: 0 }, skip: 0, next: false }
-      }
-      throw error
-    }
-  }
-
-  async queryDocuments(doctype, index, options) {
-    const fields = options.fields
-    const skip = options.skip || 0
-    // Mango wants an array of single-property-objects...
-    const sort = options.sort
-      ? index.fields.map(f => ({ [f]: options.sort[f] || 'desc' }))
-      : undefined
-
-    const queryOptions = {
-      limit: FETCH_LIMIT,
-      wholeResponse: true, // WARN: mandatory to get the full JSONAPI response
-      ...options,
-      // TODO: type and class should not be necessary, it's just a temp fix for a stack bug
-      fields: [...fields, '_id', 'type', 'class'],
-      skip,
-      sort
-    }
-
-    // abstract away the format differences between query replies on the VFS versus the data API
-    // we forge a correct JSONAPI response:
-    if (doctype === FILES_DOCTYPE) {
-      const response = await cozy.client.files.query(index, queryOptions)
-      return {
-        data: response.data.map(doc => ({
-          _id: doc.id,
-          ...doc,
-          ...doc.attributes
-        })),
-        meta: response.meta,
-        next: response.meta.count > skip + FETCH_LIMIT
-      }
-    } else {
-      const response = await cozy.client.data.query(index, queryOptions)
-      return {
-        data: response.docs.map(doc => ({ id: doc._id, ...doc })),
-        meta: {},
-        next: response.next
-      }
-    }
-  }
-
-  async fetchDocument(doctype, id) {
-    const doc = await cozy.client.data.find(doctype, id)
-    // we normalize again...
-    const normalized = { ...doc, id: doc._id, type: doc._type }
-    return { data: [normalized] }
-  }
-
-  async createDocument(doc) {
-    const created = await cozy.client.data.create(doc.type, doc)
-    const normalized = { ...created, id: created._id }
-    return { data: [normalized] }
-  }
-
-  async updateDocument(doc) {
-    const updated = await cozy.client.data.updateAttributes(
-      doc.type,
-      doc.id,
-      doc
-    )
-    return { data: [{ ...doc, _rev: updated._rev }] }
-  }
-
-  async deleteDocument(doc) {
-    await cozy.client.data.delete(doc.type, doc)
-    return { data: [doc] }
-  }
-
-  async createIndex(doctype, fields) {
-    return cozy.client.data.defineIndex(doctype, fields)
-  }
-
-  async fetchFileByPath(path) {
-    try {
-      const file = await cozy.client.files.statByPath(path)
-      return { data: [normalizeFile(file)] }
-    } catch (err) {
-      return null
-    }
-  }
-
-  async createFile(file, dirID) {
-    const created = await cozy.client.files.create(file, { dirID })
-    return { data: [normalizeFile(created)] }
-  }
-
-  async trashFile(file) {
-    await cozy.client.files.trashById(file.id)
-    return { data: [file] }
-  }
-
-  async fetchReferencedFiles(doc, skip = 0) {
-    // WARN: _type and _id are needed by cozy.client.data.fetchReferencedFiles
-    const normalized = { ...doc, _type: doc.type, _id: doc.id }
-    // WARN: the stack API is probably not ideal here: referencedFiles are in the 'included' property
-    // (that should be used when fetching an entity AND its relations) and the 'data' property
-    // only contains uplets { id, type }
-    const {
-      included,
-      meta
-    } = await cozy.client.data.fetchReferencedFiles(normalized, {
-      skip,
-      limit: FETCH_LIMIT
-    })
-    return {
-      data: !included
-        ? []
-        : included.map(file => ({
-            ...file,
-            ...file.attributes,
-            type: 'io.cozy.files'
-          })),
-      meta,
-      next: meta.count > skip + FETCH_LIMIT,
-      skip
-    }
-  }
-
-  async addReferencedFiles(doc, ids) {
-    await cozy.client.data.addReferencedFiles(doc, ids)
-    return ids
-  }
-
-  async removeReferencedFiles(doc, ids) {
-    // WARN: _type and _id are needed by cozy.client.data.removeReferencedFiles
-    const normalized = { ...doc, _type: doc.type, _id: doc.id }
-    await cozy.client.data.removeReferencedFiles(normalized, ids)
-    return ids
-  }
-
-  async fetchSharingPermissions(doctype) {
-    const fetchPermissions = (doctype, sharingType) =>
-      cozy.client.fetchJSON(
-        'GET',
-        `/permissions/doctype/${doctype}/${sharingType}`
-      )
-
-    const byMe = await fetchPermissions(doctype, SHARED_WITH_OTHERS)
-    const byLink = await fetchPermissions(doctype, SHARED_BY_LINK)
-    const withMe = await fetchPermissions(doctype, SHARED_WITH_ME)
-
-    return { byMe, byLink, withMe }
-  }
-
-  fetchSharing(id) {
-    return cozy.client.fetchJSON('GET', `/sharings/${id}`)
-  }
-
-  createSharing(permissions, contactIds, sharingType, description) {
-    return cozy.client.fetchJSON('POST', '/sharings/', {
-      desc: description,
-      permissions,
-      recipients: contactIds.map(contactId => ({
-        recipient: {
-          id: contactId,
-          type: 'io.cozy.contacts'
-        }
-      })),
-      sharing_type: sharingType
-    })
-  }
-
-  revokeSharing(sharingId) {
-    return cozy.client.fetchJSON('DELETE', `/sharings/${sharingId}`)
-  }
-
-  revokeSharingForClient(sharingId, clientId) {
-    return cozy.client.fetchJSON(
-      'DELETE',
-      `/sharings/${sharingId}/recipient/${clientId}`
-    )
-  }
-
-  createSharingLink(permissions) {
-    return cozy.client.fetchJSON('POST', `/permissions?codes=email`, {
-      data: {
-        type: 'io.cozy.permissions',
-        attributes: {
-          permissions
-        }
-      }
-    })
-  }
-
-  revokeSharingLink(permission) {
-    return cozy.client.fetchJSON('DELETE', `/permissions/${permission._id}`)
-  }
-}
-
-const normalizeFile = file => ({
-  ...file,
-  ...file.attributes,
-  id: file._id,
-  type: file._type
-})
diff --git a/src/lib/redux-cozy-client/CozyClient.js b/src/lib/redux-cozy-client/CozyClient.js
deleted file mode 100644
index 683dda28e5..0000000000
--- a/src/lib/redux-cozy-client/CozyClient.js
+++ /dev/null
@@ -1,138 +0,0 @@
-/* global cozy */
-import { CozyAPI } from '.'
-
-export default class CozyClient {
-  constructor(config) {
-    this.indexes = {}
-    this.specialDirectories = {}
-    this.api = new CozyAPI(config)
-  }
-
-  async fetchCollection(name, doctype, options = {}, skip = 0) {
-    if (options.selector) {
-      const index = await this.getCollectionIndex(name, doctype, options)
-      return this.api.queryDocuments(doctype, index, { ...options, skip })
-    }
-    return this.api.fetchDocuments(doctype)
-  }
-
-  fetchDocument(doctype, id) {
-    return this.api.fetchDocument(doctype, id)
-  }
-
-  fetchReferencedFiles(doc, skip = 0) {
-    return this.api.fetchReferencedFiles(doc, skip)
-  }
-
-  addReferencedFiles(doc, ids) {
-    return this.api.addReferencedFiles(doc, ids)
-  }
-
-  removeReferencedFiles(doc, ids) {
-    return this.api.removeReferencedFiles(doc, ids)
-  }
-
-  createDocument(doc) {
-    return this.api.createDocument(doc)
-  }
-
-  updateDocument(doc) {
-    return this.api.updateDocument(doc)
-  }
-
-  deleteDocument(doc) {
-    return this.api.deleteDocument(doc)
-  }
-
-  async fetchSharings(doctype) {
-    const permissions = await this.api.fetchSharingPermissions(doctype)
-    const sharingIds = [
-      ...permissions.byMe.map(p => p.attributes.source_id),
-      ...permissions.withMe.map(p => p.attributes.source_id)
-    ]
-    const sharings = await Promise.all(
-      sharingIds.map(id => this.api.fetchSharing(id))
-    )
-    return { permissions, sharings }
-  }
-
-  createSharing(permissions, contactIds, sharingType, description) {
-    return this.api.createSharing(
-      permissions,
-      contactIds,
-      sharingType,
-      description
-    )
-  }
-
-  revokeSharing(sharingId) {
-    return this.api.revokeSharing(sharingId)
-  }
-
-  revokeSharingForClient(sharingId, clientId) {
-    return this.api.revokeSharingForClient(sharingId, clientId)
-  }
-
-  createSharingLink(permissions) {
-    return this.api.createSharingLink(permissions)
-  }
-
-  revokeSharingLink(permission) {
-    return this.api.revokeSharingLink(permission)
-  }
-
-  fetchFile(id) {
-    return this.api.fetchFile(id)
-  }
-
-  createFile(file, dirID) {
-    return this.api.createFile(file, dirID)
-  }
-
-  trashFile(file) {
-    return this.api.trashFile(file)
-  }
-
-  async ensureDirectoryExists(path) {
-    if (!this.specialDirectories[path]) {
-      const dir = await cozy.client.files.createDirectoryByPath(path)
-      this.specialDirectories[path] = dir._id
-    }
-    return this.specialDirectories[path]
-  }
-
-  async checkUniquenessOf(doctype, property, value) {
-    const index = await this.getUniqueIndex(doctype, property)
-    const existingDocs = await cozy.client.data.query(index, {
-      selector: { [property]: value },
-      fields: ['_id']
-    })
-    return existingDocs.length === 0
-  }
-
-  async getCollectionIndex(name, doctype, options) {
-    if (!this.indexes[name]) {
-      this.indexes[name] = await this.api.createIndex(
-        doctype,
-        this.getIndexFields(options)
-      )
-    }
-    return this.indexes[name]
-  }
-
-  async getUniqueIndex(doctype, property) {
-    const name = `${doctype}/${property}`
-    if (!this.indexes[name]) {
-      this.indexes[name] = await this.api.createIndex(doctype, [property])
-    }
-    return this.indexes[name]
-  }
-
-  getIndexFields(options) {
-    const { selector, sort } = options
-    if (sort) {
-      return [...Object.keys(selector), ...Object.keys(sort)]
-    }
-    return Object.keys(selector)
-  }
-}
diff --git a/src/lib/redux-cozy-client/CozyProvider.jsx b/src/lib/redux-cozy-client/CozyProvider.jsx
deleted file mode 100644
index 7e3ffebefe..0000000000
--- a/src/lib/redux-cozy-client/CozyProvider.jsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import { Component } from 'react'
-import PropTypes from 'prop-types'
-
-export default class CozyProvider extends Component {
-  static propTypes = {
-    store: PropTypes.shape({
-      subscribe: PropTypes.func.isRequired,
-      dispatch: PropTypes.func.isRequired,
-      getState: PropTypes.func.isRequired
-    }),
-    client: PropTypes.object.isRequired,
-    children: PropTypes.element.isRequired
-  }
-
-  static childContextTypes = {
-    store: PropTypes.object,
-    client: PropTypes.object.isRequired
-  }
-
-  static contextTypes = {
-    store: PropTypes.object
-  }
-
-  getChildContext() {
-    return {
-      store: this.props.store || this.context.store,
-      client: this.props.client
-    }
-  }
-
-  render() {
-    return (this.props.children && this.props.children[0]) || null
-  }
-}
diff --git a/src/lib/redux-cozy-client/README.md b/src/lib/redux-cozy-client/README.md
deleted file mode 100644
index 6c19a0b939..0000000000
--- a/src/lib/redux-cozy-client/README.md
+++ /dev/null
@@ -1,56 +0,0 @@
-# redux-cozy-client
-A simple and declarative way of managing [cozy-stack](https://github.com/cozy/cozy-stack) API calls with Redux.
-
-## Introduction
-
-## Usage
-
-### Redux integration
-
-To integrate `redux-cozy-client` with your Redux store, you need to add a reducer and a middleware:
-
-```js
-TODO
-```
-
-### React integration
-
-To make it easier to integrate data fetching in your component, you can use a specific higher-order component called `cozyConnect`. Basic example of usage:
-
-```jsx
-TODO
-```
-
-### Sharing
-
-#### fetchSharings(doctype [, id])
-
-Depending on whether this action creator is called with or without a document ID, a different prop will be injected by `cozyConnect`:
-
- - without an ID, you'll get lists of shared documents' IDs:
- ```js
-{
-  byMe: [<array of IDs of documents that the user has shared with someone>],
-  withMe: [<array of IDs of documents that have been shared with the user>],
-  byLink: [<array of IDs of documents that the user has shared by link>]
-}
- ```
- - with an ID, you'll get more detailed informations about the document's sharings:
- ```js
- {
-  byMe: <boolean>,
-  withMe: <boolean>,
-  byLink: <boolean>,
-  readOnly: <boolean>,
-  sharingType: 'master-slave' | 'master-master',
-  owner
- }
- ```
-
-## TODO
- - Revert "normalization" of documents' `_type` property to `type`: some doctypes (files, bank.accounts, ...) use a `type` property ;
- - Handle the `_rev` property sent by the stack when updating a document. Having the `_rev` in the store would eliminate 409 Conflict errors when updating a document multiple times in a row ;
- - "Debounce" the fetch calls: if 2 components dispatch the same fetch, the middleware should not send the 2d fetch ;
- - Use the redux store as a cache: if a component dispatch a fetch for a second time, the fetch should only be dispatched if the data in the store is too old ;
- - Add support for belongsTo/hasOne/hasMany associations: IDs preloading (using listReferencedFiles for instance),
- count properties, etc. These associations would be defined in a doctype schema of some sort ;
diff --git a/src/lib/redux-cozy-client/__tests__/store.spec.js b/src/lib/redux-cozy-client/__tests__/store.spec.js
deleted file mode 100644
index e63aef424e..0000000000
--- a/src/lib/redux-cozy-client/__tests__/store.spec.js
+++ /dev/null
@@ -1,121 +0,0 @@
-import { combineReducers } from 'redux'
-import {
-  reducer as cozyReducer,
-  fetchCollection,
-  getCollection,
-  createDocument
-} from '..'
-
-const reducer = combineReducers({ cozy: cozyReducer })
-const dispatchInitialAction = (compositeAction, initialState = undefined) => {
-  const { types, ...rest } = compositeAction
-  return reducer(initialState, { type: types[0], ...rest })
-}
-
-const dispatchSuccessfulAction = (
-  compositeAction,
-  response,
-  initialState = undefined
-) => {
-  const { types, ...rest } = compositeAction
-  const actions = [
-    { type: types[0], ...rest },
-    { type: types[1], ...rest, response }
-  ]
-  return actions.reduce((state, action) => reducer(state, action), initialState)
-}
-
-describe('Redux store tests', () => {
-  describe('Given the store is empty', () => {
-    it('should return a default state', () => {
-      expect(getCollection(reducer(undefined, {}), 'rockets')).toEqual({
-        type: null,
-        fetchStatus: 'pending',
-        lastFetch: null,
-        hasMore: false,
-        count: 0,
-        ids: [],
-        data: null
-      })
-    })
-
-    describe('When a collection is fetched', () => {
-      it('should have a `loading` status', () => {
-        const state = dispatchInitialAction(
-          fetchCollection('rockets', 'io.cozy.rockets')
-        )
-        const collection = getCollection(state, 'rockets')
-        expect(collection.fetchStatus).toBe('loading')
-      })
-    })
-  })
-
-  const fakeFetchResponse = {
-    data: [
-      {
-        id: '33dda00f0eec15bc3b3c59a615001ac7',
-        type: 'io.cozy.rockets',
-        name: 'Falcon 9'
-      },
-      {
-        id: '33dda00f0eec15bc3b3c59a615001ac8',
-        type: 'io.cozy.rockets',
-        name: 'Falcon Heavy'
-      },
-      {
-        id: '33dda00f0eec15bc3b3c59a615001ac9',
-        type: 'io.cozy.rockets',
-        name: 'BFR'
-      }
-    ]
-  }
-
-  describe('Given a collection has been successfully fetched', () => {
-    let state, collection
-
-    beforeEach(() => {
-      state = dispatchSuccessfulAction(
-        fetchCollection('rockets', 'io.cozy.rockets'),
-        fakeFetchResponse
-      )
-      collection = getCollection(state, 'rockets')
-    })
-
-    it('should have a `loaded` status', () => {
-      expect(collection.fetchStatus).toBe('loaded')
-    })
-
-    it('should have a `data` property with the list of documents', () => {
-      expect(collection.data).toEqual(fakeFetchResponse.data)
-    })
-
-    describe('When a document is successfully created on the server', () => {
-      const fakeResponse = {
-        data: [
-          {
-            id: '33dda00f0eec15bc3b3c59a615001ac5',
-            type: 'io.cozy.rockets',
-            name: 'Saturn V'
-          }
-        ]
-      }
-
-      it('should be found in the store', () => {})
-
-      it('should update collections listed in the `updateCollections` option', () => {
-        state = dispatchSuccessfulAction(
-          createDocument(
-            { type: 'io.cozy.rockets', name: 'Saturn V' },
-            {
-              updateCollections: ['rockets']
-            }
-          ),
-          fakeResponse,
-          state
-        )
-        collection = getCollection(state, 'rockets')
-        expect(collection.data[3]).toEqual(fakeResponse.data[0])
-      })
-    })
-  })
-})
diff --git a/src/lib/redux-cozy-client/connect.jsx b/src/lib/redux-cozy-client/connect.jsx
deleted file mode 100644
index a03afe56c3..0000000000
--- a/src/lib/redux-cozy-client/connect.jsx
+++ /dev/null
@@ -1,56 +0,0 @@
-import React, { Component } from 'react'
-import { connect as reduxConnect } from 'react-redux'
-
-import { applySelectorForAction, enhancePropsForActions } from '.'
-import { mapValues, filterValues } from './utils'
-
-const connect = (
-  mapDocumentsToProps,
-  mapActionsToProps = null
-) => WrappedComponent => {
-  class Wrapper extends Component {
-    componentDidMount() {
-      const { fetchActions } = this.props
-      const dispatch = this.context.store.dispatch
-      for (const propName in fetchActions) {
-        dispatch(fetchActions[propName])
-      }
-    }
-
-    render() {
-      const { t, f, client, store } = this.context
-      const { fetchActions } = this.props
-      const props = {
-        t,
-        f,
-        client,
-        ...this.props,
-        ...enhancePropsForActions(this.props, fetchActions, store.dispatch)
-      }
-      return <WrappedComponent {...props} />
-    }
-  }
-
-  const makeMapStateToProps = (initialState, initialOwnProps) => {
-    const initialProps = mapDocumentsToProps(initialOwnProps)
-
-    const isAction = action => action && action.types && action.promise
-    const fetchActions = filterValues(initialProps, prop => isAction(prop))
-    const otherProps = filterValues(initialProps, prop => !isAction(prop))
-
-    const mapStateToProps = state => ({
-      ...mapValues(
-        fetchActions,
-        action =>
-          isAction(action) ? applySelectorForAction(state, action) : action
-      ),
-      fetchActions,
-      ...otherProps
-    })
-    return mapStateToProps
-  }
-
-  return reduxConnect(makeMapStateToProps, mapActionsToProps)(Wrapper)
-}
-
-export default connect
diff --git a/src/lib/redux-cozy-client/helpers.js b/src/lib/redux-cozy-client/helpers.js
deleted file mode 100644
index 7d05b55bb5..0000000000
--- a/src/lib/redux-cozy-client/helpers.js
+++ /dev/null
@@ -1,35 +0,0 @@
-/* global cozy */
-
-const slugify = text =>
-  text
-    .toString()
-    .toLowerCase()
-    .replace(/\s+/g, '-') // Replace spaces with -
-    .replace(/[^\w-]+/g, '') // Remove all non-word chars
-    .replace(/--+/g, '-') // Replace multiple - with single -
-    .replace(/^-+/, '') // Trim - from start of text
-    .replace(/-+$/, '') // Trim - from end of text
-
-const forceFileDownload = (href, filename) => {
-  const element = document.createElement('a')
-  element.setAttribute('href', href)
-  element.setAttribute('download', filename)
-  element.style.display = 'none'
-  document.body.appendChild(element)
-  element.click()
-  document.body.removeChild(element)
-}
-
-// async helpers: they interact with the stack but not with the store
-export const downloadArchive = async (notSecureFilename, fileIds) => {
-  const filename = slugify(notSecureFilename)
-  const href = await cozy.client.files.getArchiveLinkByIds(fileIds, filename)
-  const fullpath = await cozy.client.fullpath(href)
-  forceFileDownload(fullpath, filename + '.zip')
-}
-
-export const downloadFile = async file => {
-  const response = await cozy.client.files.downloadById(file.id)
-  const blob = await response.blob()
-  forceFileDownload(window.URL.createObjectURL(blob), file.name)
-}
diff --git a/src/lib/redux-cozy-client/index.js b/src/lib/redux-cozy-client/index.js
deleted file mode 100644
index d84c5c7596..0000000000
--- a/src/lib/redux-cozy-client/index.js
+++ /dev/null
@@ -1,35 +0,0 @@
-export { default as CozyProvider } from './CozyProvider'
-export { default as CozyAPI } from './CozyAPI'
-export { default as CozyClient } from './CozyClient'
-export { default as cozyConnect } from './connect'
-export { default as cozyMiddleware } from './middleware'
-export {
-  default as reducer,
-  makeActionCreator,
-  fetchCollection,
-  fetchDocument,
-  fetchReferencedFiles,
-  addReferencedFiles,
-  removeReferencedFiles,
-  applySelectorForAction,
-  enhancePropsForActions,
-  getCollection,
-  getDocument,
-  createDocument,
-  updateDocument,
-  deleteDocument,
-  createFile,
-  trashFile,
-  CREATE_DOCUMENT
-} from './reducer'
-export {
-  fetchSharings,
-  getSharingDetails,
-  share,
-  unshare,
-  leave,
-  shareByLink,
-  revokeLink
-} from './slices/sharings'
-
-export { downloadArchive, downloadFile } from './helpers'
diff --git a/src/lib/redux-cozy-client/middleware.js b/src/lib/redux-cozy-client/middleware.js
deleted file mode 100644
index 50df6da353..0000000000
--- a/src/lib/redux-cozy-client/middleware.js
+++ /dev/null
@@ -1,40 +0,0 @@
-const cozyMiddleware = client => ({ dispatch, getState }) => {
-  return next => action => {
-    const { promise, type, types, ...rest } = action
-    if (!promise) {
-      return next(action)
-    }
-
-    if (!type && !types) {
-      return promise(client).then(action => dispatch(action))
-    }
-
-    if (type) {
-      return promise(client).then(response => {
-        next({ ...rest, response, type })
-        return response
-      })
-    }
-
-    const [REQUEST, SUCCESS, FAILURE] = types
-    next({ ...rest, type: REQUEST })
-
-    return promise(client)
-      .then(
-        response => {
-          next({ ...rest, response, type: SUCCESS })
-          return response
-        },
-        error => {
-          console.log(error)
-          next({ ...rest, error, type: FAILURE })
-        }
-      )
-      .catch(error => {
-        console.error('MIDDLEWARE ERROR:', error)
-        next({ ...rest, error, type: FAILURE })
-      })
-  }
-}
-
-export default cozyMiddleware
diff --git a/src/lib/redux-cozy-client/reducer.js b/src/lib/redux-cozy-client/reducer.js
deleted file mode 100644
index ffa55e9739..0000000000
--- a/src/lib/redux-cozy-client/reducer.js
+++ /dev/null
@@ -1,399 +0,0 @@
-import { combineReducers } from 'redux'
-import { removeObjectProperty, mapValues } from './utils'
-import sharings, {
-  FETCH_SHARINGS,
-  getSharings,
-  getSharingDetails
-} from './slices/sharings'
-
-const FETCH_DOCUMENT = 'FETCH_DOCUMENT'
-const FETCH_COLLECTION = 'FETCH_COLLECTION'
-const RECEIVE_DATA = 'RECEIVE_DATA'
-const RECEIVE_ERROR = 'RECEIVE_ERROR'
-export const CREATE_DOCUMENT = 'CREATE_DOCUMENT'
-const UPDATE_DOCUMENT = 'UPDATE_DOCUMENT'
-const DELETE_DOCUMENT = 'DELETE_DOCUMENT'
-const RECEIVE_NEW_DOCUMENT = 'RECEIVE_NEW_DOCUMENT'
-const RECEIVE_UPDATED_DOCUMENT = 'RECEIVE_UPDATED_DOCUMENT'
-const RECEIVE_DELETED_DOCUMENT = 'RECEIVE_DELETED_DOCUMENT'
-const FETCH_REFERENCED_FILES = 'FETCH_REFERENCED_FILES'
-const ADD_REFERENCED_FILES = 'ADD_REFERENCED_FILES'
-const REMOVE_REFERENCED_FILES = 'REMOVE_REFERENCED_FILES'
-
-const documents = (state = {}, action) => {
-  switch (action.type) {
-    case RECEIVE_DATA:
-      const { data } = action.response
-      if (data.length === 0) return state
-      const dataDoctype = getArrayDoctype(data)
-      return {
-        ...state,
-        [dataDoctype]: {
-          ...state[dataDoctype],
-          ...objectifyDocumentsArray(data)
-        }
-      }
-    case RECEIVE_NEW_DOCUMENT:
-    case RECEIVE_UPDATED_DOCUMENT:
-      const doc = action.response.data[0]
-      return {
-        ...state,
-        [doc.type]: {
-          ...state[doc.type],
-          [doc.id]: doc
-        }
-      }
-    case RECEIVE_DELETED_DOCUMENT:
-      const deleted = action.response.data[0]
-      return {
-        ...state,
-        [deleted.type]: removeObjectProperty(state[deleted.type], deleted.id)
-      }
-    case ADD_REFERENCED_FILES:
-      return {
-        ...state,
-        'io.cozy.files': {
-          ...state['io.cozy.files'],
-          ...updateFilesReferences(
-            state['io.cozy.files'],
-            action.ids,
-            action.document
-          )
-        }
-      }
-    case REMOVE_REFERENCED_FILES:
-      return {
-        ...state,
-        'io.cozy.files': {
-          ...state['io.cozy.files'],
-          ...removeFilesReferences(
-            state['io.cozy.files'],
-            action.ids,
-            action.document
-          )
-        }
-      }
-    default:
-      return state
-  }
-}
-
-const objectifyDocumentsArray = documents =>
-  documents.reduce((obj, doc) => ({ ...obj, [doc.id]: doc }), {})
-
-const updateFileReference = (
-  { relationships: { referenced_by, ...relationships }, ...file },
-  doc
-) => ({
-  ...file,
-  relationships: {
-    ...relationships,
-    [referenced_by.data]:
-      referenced_by.data === null
-        ? [{ id: doc.id, type: doc.type }]
-        : [...referenced_by.data, { id: doc.id, type: doc.type }]
-  }
-})
-
-const updateFilesReferences = (files, newlyReferencedIds, doc) =>
-  newlyReferencedIds.reduce(
-    (updated, id) => ({
-      ...updated,
-      [id]: updateFileReference(files[id], doc)
-    }),
-    {}
-  )
-
-const removeFileReferences = (
-  { relationships: { referenced_by, ...relationships }, ...file },
-  doc
-) => ({
-  ...file,
-  relationships: {
-    ...relationships,
-    [referenced_by.data]: referenced_by.data.filter(
-      rel => rel.type !== doc.type && rel.id !== doc.id
-    )
-  }
-})
-
-const removeFilesReferences = (files, removedIds, doc) =>
-  removedIds.reduce(
-    (updated, id) => ({
-      ...updated,
-      [id]: removeFileReferences(files[id], doc)
-    }),
-    {}
-  )
-
-const getDoctype = ({ type: doctype }) => {
-  // TODO: don't know why the stack returns 'file' here..
-  if (doctype === 'file') {
-    return 'io.cozy.files'
-  }
-  return doctype
-}
-
-const getArrayDoctype = documents => getDoctype(documents[0])
-
-// collection reducers
-const collectionInitialState = {
-  type: null,
-  fetchStatus: 'pending',
-  lastFetch: null,
-  hasMore: false,
-  count: 0,
-  ids: []
-}
-
-const collection = (state = collectionInitialState, action) => {
-  switch (action.type) {
-    case FETCH_COLLECTION:
-    case FETCH_REFERENCED_FILES:
-      return {
-        ...state,
-        type: action.doctype || 'io.cozy.files',
-        fetchStatus: action.skip > 0 ? 'loadingMore' : 'loading'
-      }
-    case RECEIVE_DATA:
-      const response = action.response
-      return {
-        ...state,
-        fetchStatus: 'loaded',
-        lastFetch: Date.now(),
-        hasMore: response.next !== undefined ? response.next : state.hasMore,
-        count:
-          response.meta && response.meta.count
-            ? response.meta.count
-            : response.data.length,
-        ids: !action.skip
-          ? response.data.map(doc => doc.id)
-          : [...state.ids, ...response.data.map(doc => doc.id)]
-      }
-    case ADD_REFERENCED_FILES:
-      return {
-        ...state,
-        type: 'io.cozy.files',
-        count: state.count + action.ids.length,
-        ids: [...state.ids, ...action.ids]
-      }
-    case REMOVE_REFERENCED_FILES:
-      return {
-        ...state,
-        count: state.count - action.ids.length,
-        ids: state.ids.filter(id => action.ids.indexOf(id) === -1)
-      }
-    case RECEIVE_ERROR:
-      return {
-        ...state,
-        fetchStatus: 'failed'
-      }
-    case RECEIVE_NEW_DOCUMENT:
-      return {
-        ...state,
-        ids: [...state.ids, action.response.data[0].id]
-      }
-    case RECEIVE_DELETED_DOCUMENT:
-      return {
-        ...state,
-        ids: state.ids.filter(id => id !== action.response.data[0].id)
-      }
-    default:
-      return state
-  }
-}
-
-const collections = (state = {}, action) => {
-  const applyUpdate = (collections, updateAction) =>
-    updateAction.updateCollections.reduce(
-      (updated, name) => ({
-        ...updated,
-        [name]: collection(collections[name], action)
-      }),
-      {}
-    )
-
-  switch (action.type) {
-    case FETCH_COLLECTION:
-    case FETCH_REFERENCED_FILES:
-    case ADD_REFERENCED_FILES:
-    case REMOVE_REFERENCED_FILES:
-    case RECEIVE_DATA:
-    case RECEIVE_ERROR:
-      if (!action.collection) {
-        return state
-      }
-      return {
-        ...state,
-        [action.collection]: collection(state[action.collection], action)
-      }
-    case RECEIVE_NEW_DOCUMENT:
-    case RECEIVE_DELETED_DOCUMENT:
-      if (!action.updateCollections) {
-        return state
-      }
-      return {
-        ...state,
-        ...applyUpdate(state, action)
-      }
-    default:
-      return state
-  }
-}
-
-export default combineReducers({
-  collections,
-  documents,
-  sharings
-})
-
-export const fetchCollection = (name, doctype, options = {}, skip = 0) => ({
-  types: [FETCH_COLLECTION, RECEIVE_DATA, RECEIVE_ERROR],
-  collection: name,
-  doctype,
-  options,
-  skip,
-  promise: client => client.fetchCollection(name, doctype, options, skip)
-})
-
-export const fetchDocument = (doctype, id) => ({
-  types: [FETCH_DOCUMENT, RECEIVE_DATA, RECEIVE_ERROR],
-  doctype,
-  id,
-  promise: client => client.fetchDocument(doctype, id)
-})
-
-export const fetchReferencedFiles = (doc, skip = 0) => ({
-  types: [FETCH_REFERENCED_FILES, RECEIVE_DATA, RECEIVE_ERROR],
-  collection: `${doc.type}/${doc.id}#files`,
-  document: doc,
-  options: {},
-  skip,
-  promise: client => client.fetchReferencedFiles(doc, skip)
-})
-
-export const createDocument = (doc, actionOptions = {}) => ({
-  types: [CREATE_DOCUMENT, RECEIVE_NEW_DOCUMENT, RECEIVE_ERROR],
-  document: doc,
-  promise: client => client.createDocument(doc),
-  ...actionOptions
-})
-
-export const updateDocument = (doc, actionOptions = {}) => ({
-  types: [UPDATE_DOCUMENT, RECEIVE_UPDATED_DOCUMENT, RECEIVE_ERROR],
-  document: doc,
-  promise: client => client.updateDocument(doc),
-  ...actionOptions
-})
-
-export const deleteDocument = (doc, actionOptions = {}) => ({
-  types: [DELETE_DOCUMENT, RECEIVE_DELETED_DOCUMENT, RECEIVE_ERROR],
-  document: doc,
-  promise: client => client.deleteDocument(doc),
-  ...actionOptions
-})
-
-export const createFile = (file, dirID, actionOptions = {}) => ({
-  types: [CREATE_DOCUMENT, RECEIVE_NEW_DOCUMENT, RECEIVE_ERROR],
-  doctype: 'io.cozy.files',
-  promise: client => client.createFile(file, dirID),
-  ...actionOptions
-})
-
-export const trashFile = (file, actionOptions = {}) => ({
-  types: [DELETE_DOCUMENT, RECEIVE_DELETED_DOCUMENT, RECEIVE_ERROR],
-  document: file,
-  promise: client => client.trashFile(file),
-  ...actionOptions
-})
-
-export const addReferencedFiles = (doc, ids) => ({
-  type: ADD_REFERENCED_FILES,
-  collection: `${doc.type}/${doc.id}#files`,
-  document: doc,
-  ids,
-  promise: client => client.addReferencedFiles(doc, ids)
-})
-
-export const removeReferencedFiles = (doc, ids) => ({
-  type: REMOVE_REFERENCED_FILES,
-  collection: `${doc.type}/${doc.id}#files`,
-  document: doc,
-  ids,
-  promise: client => client.removeReferencedFiles(doc, ids)
-})
-
-export const makeActionCreator = promise => ({ promise })
-
-export const makeFetchMoreAction = (
-  { types, collection, document, doctype, options },
-  skip
-) =>
-  types[0] === FETCH_REFERENCED_FILES
-    ? fetchReferencedFiles(document, skip)
-    : fetchCollection(collection, doctype, options, skip)
-
-export const applySelectorForAction = (state, action) => {
-  switch (action.types[0]) {
-    case FETCH_COLLECTION:
-    case FETCH_REFERENCED_FILES:
-      return getCollection(state, action.collection)
-    case FETCH_DOCUMENT:
-      return getDocument(state, action.doctype, action.id)
-    case FETCH_SHARINGS:
-      return action.id
-        ? getSharingDetails(state, action.doctype, action.id, action.options)
-        : getSharings(state, action.doctype, action.options)
-    default:
-      return null
-  }
-}
-
-export const enhancePropsForActions = (props, fetchActions, dispatch) =>
-  mapValues(fetchActions, (action, propName) => {
-    const dataObject = props[propName]
-    switch (action.types[0]) {
-      case FETCH_COLLECTION:
-      case FETCH_REFERENCED_FILES:
-        return {
-          ...dataObject,
-          fetchMore: dataObject.hasMore
-            ? () =>
-                dispatch(makeFetchMoreAction(action, dataObject.data.length))
-            : null
-        }
-      default:
-        return dataObject
-    }
-  })
-
-// selectors
-const mapDocumentsToIds = (documents, doctype, ids) =>
-  ids.map(id => documents[doctype][id])
-
-export const getCollection = (state, name) => {
-  const collection = state.cozy.collections[name]
-  if (!collection) {
-    return { ...collectionInitialState, data: null }
-  }
-  return {
-    ...collection,
-    data: mapDocumentsToIds(
-      state.cozy.documents,
-      collection.type,
-      collection.ids
-    )
-  }
-}
-
-export const getDocument = (state, doctype, id) => {
-  const documents = state.cozy.documents[doctype]
-  if (!documents) {
-    return null
-  }
-  return documents[id]
-}
-
-export const isCollectionFetched = (state, name) =>
-  state.cozy.collections[name] &&
-  state.cozy.collections[name].fetchStatus === 'loaded'
diff --git a/src/lib/redux-cozy-client/slices/sharings.js b/src/lib/redux-cozy-client/slices/sharings.js
deleted file mode 100644
index 028e7f28c3..0000000000
--- a/src/lib/redux-cozy-client/slices/sharings.js
+++ /dev/null
@@ -1,407 +0,0 @@
-import { combineReducers } from 'redux'
-import { getTracker } from 'cozy-ui/react/helpers/tracker'
-import { getDocument, createDocument } from '../reducer'
-
-export const FETCH_SHARINGS = 'FETCH_SHARINGS'
-const RECEIVE_SHARINGS_DATA = 'RECEIVE_SHARINGS_DATA'
-const RECEIVE_FETCH_SHARINGS_ERROR = 'RECEIVE_FETCH_SHARINGS_ERROR'
-const CREATE_SHARING = 'CREATE_SHARING'
-const RECEIVE_NEW_SHARING = 'RECEIVE_NEW_SHARING'
-const CREATE_SHARING_LINK = 'CREATE_SHARING_LINK'
-const RECEIVE_NEW_SHARING_LINK = 'RECEIVE_NEW_SHARING_LINK'
-const REVOKE_SHARING_LINK = 'REVOKE_SHARING_LINK'
-const RECEIVE_SHARING_LINK_REVOKE = 'RECEIVE_SHARING_LINK_REVOKE'
-const REVOKE_SHARING = 'REVOKE_SHARING'
-const RECEIVE_SHARING_REVOKE = 'RECEIVE_SHARING_REVOKE'
-const RECEIVE_ERROR = 'RECEIVE_ERROR'
-
-const removeRecipient = (recipients, recipientId) => {
-  const idx = recipients.findIndex(r => r.recipient.id === recipientId)
-  return [...recipients.slice(0, idx), ...recipients.slice(idx + 1)]
-}
-
-const documents = (state = [], action) => {
-  switch (action.type) {
-    case RECEIVE_SHARINGS_DATA:
-      return action.response.sharings
-    case RECEIVE_NEW_SHARING:
-      return [...state, action.response]
-    case REVOKE_SHARING:
-      const idx = state.findIndex(
-        s => s.attributes.sharing_id === action.sharingId
-      )
-      if (idx === -1) return state
-      const sharing = state[idx]
-      const loneRecipient = sharing.attributes.recipients.length === 1
-      const newState = loneRecipient
-        ? { ...sharing, attributes: { ...sharing.attributes, revoked: true } }
-        : {
-            ...sharing,
-            attributes: {
-              ...sharing.attributes,
-              recipients: removeRecipient(
-                sharing.attributes.recipients,
-                action.recipientId
-              )
-            }
-          }
-      return [...state.slice(0, idx), newState, ...state.slice(idx + 1)]
-    default:
-      return state
-  }
-}
-
-const doctypePermsetInitialState = {
-  fetchStatus: 'loading',
-  byMe: [],
-  byLink: [],
-  withMe: []
-}
-
-const permissions = (state = {}, action) => {
-  let idx
-  switch (action.type) {
-    case FETCH_SHARINGS:
-      if (state[action.doctype]) {
-        return {
-          ...state,
-          [action.doctype]: { ...state[action.doctype], fetchStatus: 'loading' }
-        }
-      }
-      return { ...state, [action.doctype]: doctypePermsetInitialState }
-    case RECEIVE_SHARINGS_DATA:
-      return {
-        ...state,
-        [action.doctype]: {
-          fetchStatus: 'loaded',
-          ...action.response.permissions
-        }
-      }
-    case RECEIVE_FETCH_SHARINGS_ERROR:
-      return { ...state, [action.doctype]: { fetchStatus: 'error' } }
-    case RECEIVE_NEW_SHARING:
-      return {
-        ...state,
-        [action.doctype]: {
-          ...state[action.doctype],
-          byMe: [
-            ...state[action.doctype].byMe,
-            {
-              attributes: {
-                permissions: {
-                  rule0: { type: action.doctype, values: [action.id] }
-                },
-                source_id: action.response.attributes.sharing_id,
-                type: 'io.cozy.sharings'
-              }
-            }
-          ]
-        }
-      }
-    case RECEIVE_NEW_SHARING_LINK:
-      return {
-        ...state,
-        [action.doctype]: {
-          ...state[action.doctype],
-          byLink: [...state[action.doctype].byLink, action.response]
-        }
-      }
-    case REVOKE_SHARING_LINK:
-      idx = state[action.doctype].byLink.findIndex(
-        p => action.permission._id === p._id
-      )
-      if (idx === -1) return state
-      return {
-        ...state,
-        [action.doctype]: {
-          ...state[action.doctype],
-          byLink: [
-            ...state[action.doctype].byLink.slice(0, idx),
-            ...state[action.doctype].byLink.slice(idx + 1)
-          ]
-        }
-      }
-    default:
-      return state
-  }
-}
-
-export default combineReducers({ documents, permissions })
-
-// actions
-export const fetchSharings = (doctype, id = null, options = {}) => ({
-  types: [FETCH_SHARINGS, RECEIVE_SHARINGS_DATA, RECEIVE_FETCH_SHARINGS_ERROR],
-  doctype,
-  id,
-  options,
-  promise: client => client.fetchSharings(doctype)
-})
-
-export const share = (document, recipients, sharingType, sharingDesc) => async (
-  dispatch,
-  getState
-) => {
-  const recipientIds = await Promise.all(
-    recipients.map(
-      recipient =>
-        recipient.id ||
-        dispatch(createContact(recipient)).then(c => c.data[0].id)
-    )
-  )
-  trackSharingByEmail(document)
-  return dispatch(
-    createSharing(document, recipientIds, sharingType, sharingDesc)
-  )
-}
-
-export const unshare = (document, recipient) => async (dispatch, getState) => {
-  const sharing = getSharingForRecipient(getState(), document, recipient)
-  const loneRecipient = sharing.attributes.recipients.length === 1
-  return dispatch({
-    types: [REVOKE_SHARING, RECEIVE_SHARING_REVOKE, RECEIVE_ERROR],
-    doctype: document._type,
-    id: document._id,
-    sharingId: sharing.attributes.sharing_id,
-    recipientId: recipient._id,
-    promise: client =>
-      loneRecipient
-        ? client.revokeSharing(sharing.attributes.sharing_id)
-        : client.revokeSharingForClient(
-            sharing.attributes.sharing_id,
-            sharing.attributes.recipients.find(
-              r => r.recipient.id === recipient._id
-            ).Client.client_id
-          )
-  })
-}
-
-export const leave = document => async (dispatch, getState) => {
-  const sharings = getDocumentActiveSharings(
-    getState(),
-    document._type,
-    document._id
-  )
-  const sharing = sharings.find(s => s.attributes.owner === false)
-  return dispatch({
-    types: [REVOKE_SHARING, RECEIVE_SHARING_REVOKE, RECEIVE_ERROR],
-    doctype: document._type,
-    id: document._id,
-    sharingId: sharing.attributes.sharing_id,
-    promise: client => client.revokeSharing(sharing.attributes.sharing_id)
-  })
-}
-
-export const shareByLink = document => {
-  trackSharingByLink(document)
-  return createSharingLink(document)
-}
-
-export const revokeLink = document => async (dispatch, getState) => {
-  const perm = getSharingLinkPermission(
-    getState(),
-    document._type,
-    document._id
-  )
-  return dispatch({
-    types: [REVOKE_SHARING_LINK, RECEIVE_SHARING_LINK_REVOKE, RECEIVE_ERROR],
-    doctype: document._type,
-    id: document._id,
-    permission: perm,
-    promise: client => client.revokeSharingLink(perm)
-  })
-}
-
-const createSharing = (
-  document,
-  contactIds,
-  sharingType = 'master-slave',
-  description = ''
-) => ({
-  types: [CREATE_SHARING, RECEIVE_NEW_SHARING, RECEIVE_ERROR],
-  doctype: document._type,
-  id: document._id,
-  promise: client =>
-    client.createSharing(
-      getPermissionsFor(document),
-      contactIds,
-      sharingType,
-      description
-    )
-})
-
-const createSharingLink = document => ({
-  types: [CREATE_SHARING_LINK, RECEIVE_NEW_SHARING_LINK, RECEIVE_ERROR],
-  doctype: document._type,
-  id: document._id,
-  promise: client => client.createSharingLink(getPermissionsFor(document, true))
-})
-
-const createContact = ({ email }) =>
-  createDocument({
-    type: 'io.cozy.contacts',
-    email: [{ address: email, primary: true }]
-  })
-
-const getPermissionsFor = (document, publicLink = false) => {
-  const { _id, _type } = document
-  const verbs = publicLink ? ['GET'] : ['ALL']
-  // TODO: this works for albums, but it needs to be generalized and integrated
-  // with redux-cozy-client ; some sort of doctype "schema" will be needed here
-  return isFile(document)
-    ? {
-        files: {
-          type: 'io.cozy.files',
-          verbs,
-          values: [_id]
-        }
-      }
-    : {
-        collection: {
-          type: _type,
-          verbs,
-          values: [_id]
-        },
-        files: {
-          type: 'io.cozy.files',
-          verbs,
-          values: [`${_type}/${_id}`],
-          selector: 'referenced_by'
-        }
-      }
-}
-
-// selectors
-const getSharing = (state, id) =>
-  state.cozy.sharings.documents.find(s => s.attributes.sharing_id === id)
-const getContact = (state, id) => getDocument(state, 'io.cozy.contacts', id)
-const getDoctypePermissions = (state, doctype) => {
-  if (state.cozy.sharings.permissions[doctype]) {
-    return state.cozy.sharings.permissions[doctype]
-  }
-  return doctypePermsetInitialState
-}
-
-const getSharingLink = (state, doctype, id) => {
-  const perm = getSharingLinkPermission(state, doctype, id)
-  return perm
-    ? buildSharingLink(id, doctype, perm.attributes.codes.email)
-    : null
-}
-
-const getSharingLinkPermission = (state, doctype, id) => {
-  const perms = getDoctypePermissions(state, doctype)
-  const type = isFile({ _type: doctype }) ? 'files' : 'collection'
-  return perms.byLink.find(
-    p => p.attributes.permissions[type].values.indexOf(id) !== -1
-  )
-}
-
-const getSharingForRecipient = (state, document, recipient) => {
-  const sharings = getDocumentActiveSharings(
-    state,
-    document._type,
-    document._id
-  )
-  return sharings.find(s =>
-    s.attributes.recipients.find(r => r.recipient.id === recipient._id)
-  )
-}
-
-const getDocumentActiveSharings = (state, doctype, id) => {
-  const perms = getDoctypePermissions(state, doctype)
-  return [
-    ...perms.byMe.filter(
-      perm => perm.attributes.permissions['rule0'].values.indexOf(id) !== -1
-    ),
-    ...perms.withMe.filter(
-      perm => perm.attributes.permissions['rule0'].values.indexOf(id) !== -1
-    )
-  ]
-    .map(p => getSharing(state, p.attributes.source_id))
-    .filter(s => !s.attributes.revoked)
-}
-
-export const getSharings = (state, doctype, options = {}) => {
-  const perms = getDoctypePermissions(state, doctype)
-  const type = doctype === 'io.cozy.files' ? 'files' : 'collection'
-  return {
-    byMe: perms.byMe.map(p => p.attributes.permissions['rule0'].values[0]),
-    withMe: perms.withMe.map(p => p.attributes.permissions['rule0'].values[0]),
-    byLink: perms.byLink.map(p => p.attributes.permissions[type].values[0])
-  }
-}
-
-export const getSharingStatus = (state, doctype, id) => {
-  const sharings = getDocumentActiveSharings(state, doctype, id)
-  return {
-    shared: sharings.length !== 0,
-    owner: sharings.some(s => s.attributes.owner === true),
-    sharingType: sharings.some(
-      s => s.attributes.sharing_type === 'master-master'
-    )
-      ? 'master-master'
-      : 'master-slave',
-    sharings
-  }
-}
-
-export const getSharingDetails = (state, doctype, id, options = {}) => {
-  const { shared, owner, sharingType, sharings } = getSharingStatus(
-    state,
-    doctype,
-    id
-  )
-  const sharingLink = getSharingLink(state, doctype, id)
-  return {
-    shared,
-    owner,
-    sharingType,
-    sharingLink,
-    sharer:
-      shared && !owner
-        ? { name: 'John Doe', url: sharings[0].attributes.sharer.url }
-        : null,
-    readOnly: !owner && sharingType === 'master-slave',
-    recipients: shared && owner ? getSharingRecipients(state, sharings) : [],
-    byMe: shared && owner === true,
-    withMe: shared && !owner,
-    byLink: !!sharingLink
-  }
-}
-
-const getSharingRecipients = (state, sharings) =>
-  sharings
-    .filter(sharing => sharing.attributes.recipients)
-    .map(sharing =>
-      sharing.attributes.recipients.map(info => ({
-        contact: getContact(state, info.recipient.id),
-        status: info.status,
-        type: sharing.attributes.sharing_type
-      }))
-    )
-    .reduce((a, b) => a.concat(b), [])
-
-const buildSharingLink = (id, doctype, sharecode) =>
-  `${window.location.origin}/public?sharecode=${sharecode}&id=${id}${doctype ===
-  'file'
-    ? '&directdownload'
-    : ''}`
-
-// helpers
-const isFile = ({ _type, type }) =>
-  _type === 'io.cozy.files' || type === 'directory' || type === 'file'
-
-const track = (document, action) => {
-  const tracker = getTracker()
-  if (!tracker) {
-    return
-  }
-  tracker.push([
-    'trackEvent',
-    isFile(document) ? 'Drive' : 'Photos',
-    action,
-    `${action}${isFile(document) ? 'File' : 'Album'}`
-  ])
-}
-const trackSharingByLink = document => track(document, 'shareByLink')
-const trackSharingByEmail = document => track(document, 'shareByEmail')
diff --git a/src/lib/redux-cozy-client/utils.js b/src/lib/redux-cozy-client/utils.js
deleted file mode 100644
index 6e5746e123..0000000000
--- a/src/lib/redux-cozy-client/utils.js
+++ /dev/null
@@ -1,26 +0,0 @@
-export const mapValues = (object, transform) => {
-  let result = {}
-  for (const key in object) {
-    result[key] = transform(object[key], key)
-  }
-  return result
-}
-
-export const filterValues = (object, filter) => {
-  let result = {}
-  for (const key in object) {
-    if (filter(object[key], key)) {
-      result[key] = object[key]
-    }
-  }
-  return result
-}
-
-export const removeObjectProperty = (obj, prop) => {
-  return Object.keys(obj).reduce((result, key) => {
-    if (key !== prop) {
-      result[key] = obj[key]
-    }
-    return result
-  }, {})
-}
diff --git a/src/photos/components/ViewerToolbar.jsx b/src/photos/components/ViewerToolbar.jsx
index cc2c8f43b6..b69f075c42 100644
--- a/src/photos/components/ViewerToolbar.jsx
+++ b/src/photos/components/ViewerToolbar.jsx
@@ -4,7 +4,7 @@ import classNames from 'classnames'
 import React from 'react'
 import { translate } from 'cozy-ui/react/I18n'
 import { withRouter } from 'react-router'
-import { downloadFile } from 'redux-cozy-client'
+import { downloadFile } from 'cozy-client'
 
 export const ViewerToolbar = ({ t, router, hidden, currentPhoto }) => {
   const closeViewer = () => {
diff --git a/src/photos/containers/AddToAlbumModal.jsx b/src/photos/containers/AddToAlbumModal.jsx
index 36ef2b97f5..e4ebe5611b 100644
--- a/src/photos/containers/AddToAlbumModal.jsx
+++ b/src/photos/containers/AddToAlbumModal.jsx
@@ -2,7 +2,7 @@ import styles from '../styles/addToAlbum'
 
 import React, { Component } from 'react'
 import { connect } from 'react-redux'
-import { cozyConnect } from 'redux-cozy-client'
+import { cozyConnect } from 'cozy-client'
 import Modal, { ModalSection } from 'cozy-ui/react/Modal'
 import classNames from 'classnames'
 
diff --git a/src/photos/containers/AlbumItem.jsx b/src/photos/containers/AlbumItem.jsx
index 7aeaee4e4d..61dc2dec48 100644
--- a/src/photos/containers/AlbumItem.jsx
+++ b/src/photos/containers/AlbumItem.jsx
@@ -5,7 +5,7 @@ import classNames from 'classnames'
 import React, { Component } from 'react'
 import { Link, withRouter } from 'react-router'
 import { connect } from 'react-redux'
-import { cozyConnect, getSharingDetails } from 'redux-cozy-client'
+import { cozyConnect, getSharingDetails } from 'cozy-client'
 
 import { fetchAlbumPhotos } from '../ducks/albums'
 import ImageLoader from '../components/ImageLoader'
diff --git a/src/photos/containers/AlbumPhotos.jsx b/src/photos/containers/AlbumPhotos.jsx
index dfaf58c22a..3011796110 100644
--- a/src/photos/containers/AlbumPhotos.jsx
+++ b/src/photos/containers/AlbumPhotos.jsx
@@ -1,5 +1,5 @@
 import React, { Component } from 'react'
-import { cozyConnect } from 'redux-cozy-client'
+import { cozyConnect } from 'cozy-client'
 import { withRouter } from 'react-router'
 import styles from '../styles/layout'
 
@@ -17,18 +17,15 @@ import Topbar from '../components/Topbar'
 import Alerter from '../components/Alerter'
 
 export class AlbumPhotos extends Component {
-  constructor(props) {
-    super(props)
-    this.state = {
-      editing: false
-    }
+  state = {
+    editing: false
   }
 
-  editAlbumName() {
+  editAlbumName = () => {
     this.setState({ editing: true })
   }
 
-  renameAlbum(name) {
+  renameAlbum = name => {
     if (name.trim() === '') {
       Alerter.error('Error.album_rename_abort')
       return
@@ -54,7 +51,6 @@ export class AlbumPhotos extends Component {
     }
     const { album, photos, shared } = this.props
     const { editing } = this.state
-
     return (
       <div className={styles['pho-content-wrapper']}>
         {album.name &&
@@ -63,7 +59,7 @@ export class AlbumPhotos extends Component {
               viewName="albumContent"
               albumName={album.name}
               editing={editing}
-              onEdit={this.renameAlbum.bind(this)}
+              onEdit={this.renameAlbum}
             >
               <AlbumToolbar
                 album={album}
@@ -71,7 +67,7 @@ export class AlbumPhotos extends Component {
                 sharedByMe={shared.byMe}
                 readOnly={shared.readOnly}
                 photos={photos.data}
-                onRename={this.editAlbumName.bind(this)}
+                onRename={this.editAlbumName}
               />
             </Topbar>
           )}
diff --git a/src/photos/containers/AlbumsView.jsx b/src/photos/containers/AlbumsView.jsx
index e083408bfa..b9d1117172 100644
--- a/src/photos/containers/AlbumsView.jsx
+++ b/src/photos/containers/AlbumsView.jsx
@@ -1,5 +1,5 @@
 import React, { Component } from 'react'
-import { cozyConnect } from 'redux-cozy-client'
+import { cozyConnect } from 'cozy-client'
 import styles from '../styles/layout'
 
 import { AlbumsToolbar, fetchAlbums, fetchSharedAlbums } from '../ducks/albums'
diff --git a/src/photos/containers/Timeline.jsx b/src/photos/containers/Timeline.jsx
index eb680ebdfb..d5bc0307f6 100644
--- a/src/photos/containers/Timeline.jsx
+++ b/src/photos/containers/Timeline.jsx
@@ -1,5 +1,5 @@
 import React, { Component } from 'react'
-import { cozyConnect } from 'redux-cozy-client'
+import { cozyConnect } from 'cozy-client'
 import styles from '../styles/layout'
 
 import {
diff --git a/src/photos/ducks/albums/components/AlbumToolbar.jsx b/src/photos/ducks/albums/components/AlbumToolbar.jsx
index a3d879e153..563da0f086 100644
--- a/src/photos/ducks/albums/components/AlbumToolbar.jsx
+++ b/src/photos/ducks/albums/components/AlbumToolbar.jsx
@@ -1,7 +1,7 @@
 import React, { Component } from 'react'
 import { connect } from 'react-redux'
 import { withRouter, Link } from 'react-router'
-import { leave } from 'redux-cozy-client'
+import { leave } from 'cozy-client'
 import { translate } from 'cozy-ui/react/I18n'
 
 import ShareButton, {
diff --git a/src/photos/ducks/albums/components/PhotosPicker.jsx b/src/photos/ducks/albums/components/PhotosPicker.jsx
index 9db9fbccdb..52aeeeba83 100644
--- a/src/photos/ducks/albums/components/PhotosPicker.jsx
+++ b/src/photos/ducks/albums/components/PhotosPicker.jsx
@@ -1,5 +1,5 @@
 import React, { Component } from 'react'
-import { cozyConnect } from 'redux-cozy-client'
+import { cozyConnect } from 'cozy-client'
 import { withRouter } from 'react-router'
 
 import { fetchTimeline, getPhotosByMonth } from '../../timeline'
diff --git a/src/photos/ducks/albums/index.js b/src/photos/ducks/albums/index.js
index a930cc147e..c6f581c0c7 100644
--- a/src/photos/ducks/albums/index.js
+++ b/src/photos/ducks/albums/index.js
@@ -9,7 +9,7 @@ import {
   addReferencedFiles,
   removeReferencedFiles,
   downloadArchive
-} from 'redux-cozy-client'
+} from 'cozy-client'
 
 import AlbumToolbar from './components/AlbumToolbar'
 import AlbumsToolbar from './components/AlbumsToolbar'
@@ -20,12 +20,13 @@ export const DOCTYPE = 'io.cozy.photos.albums'
 export const fetchAlbums = () => fetchCollection('albums', DOCTYPE)
 export const fetchSharedAlbums = id => fetchSharings(DOCTYPE)
 export const fetchAlbumPhotos = (id, skip = 0) =>
-  fetchReferencedFiles({ type: DOCTYPE, id }, skip)
+  fetchReferencedFiles({ _type: DOCTYPE, id }, skip)
 export const fetchAlbum = id => fetchDocument(DOCTYPE, id)
 export const fetchAlbumSharings = id => fetchSharings(DOCTYPE, id)
 export const createAlbum = (name, createdAt = new Date()) =>
   createDocument(
-    { type: DOCTYPE, name, created_at: createdAt },
+    DOCTYPE,
+    { name, created_at: createdAt },
     { updateCollections: ['albums'] }
   )
 export const updateAlbum = album => updateDocument(album)
diff --git a/src/photos/ducks/selection/index.js b/src/photos/ducks/selection/index.js
index b1fbac13f7..e181b800bd 100644
--- a/src/photos/ducks/selection/index.js
+++ b/src/photos/ducks/selection/index.js
@@ -1,5 +1,5 @@
 import { combineReducers } from 'redux'
-import { downloadArchive } from 'redux-cozy-client'
+import { downloadArchive } from 'cozy-client'
 import SelectionBar from './SelectionBar'
 
 // constants
diff --git a/src/photos/ducks/timeline/index.js b/src/photos/ducks/timeline/index.js
index b860f2b544..0e08d200f9 100644
--- a/src/photos/ducks/timeline/index.js
+++ b/src/photos/ducks/timeline/index.js
@@ -9,7 +9,7 @@ import {
   makeActionCreator,
   createFile,
   trashFile
-} from 'redux-cozy-client'
+} from 'cozy-client'
 
 // constants
 const TIMELINE = 'timeline'
@@ -41,6 +41,7 @@ export const deletePhotos = ids => async dispatch => {
       const file = { ...rawFile, id: rawFile._id, type: rawFile._type }
       if (file.referenced_by) {
         for (const ref of file.referenced_by) {
+          console.log(ref)
           if (ref.type === ALBUMS_DOCTYPE) {
             await dispatch(removeFromAlbum(ref, [id]))
           }
diff --git a/src/photos/middlewares/EventTracker.js b/src/photos/middlewares/EventTracker.js
index 7653b1715d..f1be01df15 100644
--- a/src/photos/middlewares/EventTracker.js
+++ b/src/photos/middlewares/EventTracker.js
@@ -1,6 +1,6 @@
 import { ADD_TO_UPLOAD_QUEUE } from '../ducks/upload'
 import { DOCTYPE as DOCTYPE_ALBUM } from '../ducks/albums'
-import { CREATE_DOCUMENT } from 'redux-cozy-client'
+import { CREATE_DOCUMENT } from 'cozy-client'
 
 const CATEGORY = {
   INTERACTION: 'interaction'
diff --git a/src/photos/reducers/index.js b/src/photos/reducers/index.js
index bd02258297..6dcdebb7c2 100644
--- a/src/photos/reducers/index.js
+++ b/src/photos/reducers/index.js
@@ -5,7 +5,7 @@ import selection from '../ducks/selection'
 import lists from '../ducks/lists'
 import upload from '../ducks/upload'
 import alerterReducer from 'cozy-ui/react/Alerter'
-import { reducer } from 'redux-cozy-client'
+import { reducer } from 'cozy-client'
 
 const photosApp = combineReducers({
   cozy: reducer,
diff --git a/src/sharing/ShareModal.jsx b/src/sharing/ShareModal.jsx
index 608eb89427..ff5e2335e5 100644
--- a/src/sharing/ShareModal.jsx
+++ b/src/sharing/ShareModal.jsx
@@ -9,7 +9,7 @@ import {
   unshare,
   shareByLink,
   revokeLink
-} from 'redux-cozy-client'
+} from 'cozy-client'
 import Modal from 'cozy-ui/react/Modal'
 import { Tab, Tabs, TabList, TabPanels, TabPanel } from 'cozy-ui/react/Tabs'
 
diff --git a/src/sharing/SharingDetailsModal.jsx b/src/sharing/SharingDetailsModal.jsx
index c52b1fb0e4..e8458f0889 100644
--- a/src/sharing/SharingDetailsModal.jsx
+++ b/src/sharing/SharingDetailsModal.jsx
@@ -1,7 +1,7 @@
 import styles from './share.styl'
 
 import React, { Component } from 'react'
-import { cozyConnect, fetchSharings } from 'redux-cozy-client'
+import { cozyConnect, fetchSharings } from 'cozy-client'
 import { UserAvatar } from './components/Recipient'
 import Modal from 'cozy-ui/react/Modal'
 
diff --git a/targets/drive/web/main.jsx b/targets/drive/web/main.jsx
index 284f5cf831..35f4fdd9a1 100644
--- a/targets/drive/web/main.jsx
+++ b/targets/drive/web/main.jsx
@@ -8,7 +8,7 @@ import React from 'react'
 import { render } from 'react-dom'
 import { Router, hashHistory } from 'react-router'
 import { I18n } from 'cozy-ui/react/I18n'
-import { CozyClient, CozyProvider } from 'redux-cozy-client'
+import { CozyClient, CozyProvider } from 'cozy-client'
 import { shouldEnableTracking, getTracker } from 'cozy-ui/react/helpers/tracker'
 
 import AppRoute from 'drive/components/AppRoute'
diff --git a/targets/photos/web/main.jsx b/targets/photos/web/main.jsx
index 0c18948d2e..637cf31783 100755
--- a/targets/photos/web/main.jsx
+++ b/targets/photos/web/main.jsx
@@ -11,7 +11,7 @@ import { compose, createStore, applyMiddleware } from 'redux'
 import thunkMiddleware from 'redux-thunk'
 import { createLogger } from 'redux-logger'
 import { Router, hashHistory } from 'react-router'
-import { CozyClient, CozyProvider, cozyMiddleware } from 'redux-cozy-client'
+import { CozyClient, CozyProvider, cozyMiddleware } from 'cozy-client'
 import { I18n } from 'cozy-ui/react/I18n'
 
 import photosApp from 'photos/reducers'
diff --git a/targets/photos/web/public/App.jsx b/targets/photos/web/public/App.jsx
index 638d75c925..77863e7900 100644
--- a/targets/photos/web/public/App.jsx
+++ b/targets/photos/web/public/App.jsx
@@ -1,5 +1,5 @@
 import React, { Component } from 'react'
-import { cozyConnect } from 'redux-cozy-client'
+import { cozyConnect } from 'cozy-client'
 
 import PhotoBoard from 'photos/components/PhotoBoard'
 import Loading from 'photos/components/Loading'
diff --git a/targets/photos/web/public/main.jsx b/targets/photos/web/public/main.jsx
index 6c6a025a72..1005f18c72 100644
--- a/targets/photos/web/public/main.jsx
+++ b/targets/photos/web/public/main.jsx
@@ -6,7 +6,7 @@ import { createStore, applyMiddleware, combineReducers } from 'redux'
 import thunkMiddleware from 'redux-thunk'
 import { createLogger } from 'redux-logger'
 import { Router, Redirect, hashHistory, Route } from 'react-router'
-import { CozyClient, CozyProvider, cozyMiddleware, reducer } from 'redux-cozy-client'
+import { CozyClient, CozyProvider, cozyMiddleware, reducer } from 'cozy-client'
 import { I18n } from 'cozy-ui/react/I18n'
 
 import 'photos/styles/main'
@@ -19,17 +19,16 @@ const arrToObj = (obj = {}, varval = ['var', 'val']) => {
   return obj
 }
 
-const getQueryParameter = () => window
-  .location
-  .search
-  .substring(1)
-  .split('&')
-  .map(varval => varval.split('='))
-  .reduce(arrToObj, {})
+const getQueryParameter = () =>
+  window.location.search
+    .substring(1)
+    .split('&')
+    .map(varval => varval.split('='))
+    .reduce(arrToObj, {})
 
 document.addEventListener('DOMContentLoaded', init)
 
-function init () {
+function init() {
   const lang = document.documentElement.getAttribute('lang') || 'en'
   const root = document.querySelector('[role=application]')
   const data = root.dataset
@@ -40,7 +39,12 @@ function init () {
     token: sharecode
   })
 
-  if (data.cozyAppName && data.cozyAppEditor && data.cozyIconPath && data.cozyLocale) {
+  if (
+    data.cozyAppName &&
+    data.cozyAppEditor &&
+    data.cozyIconPath &&
+    data.cozyLocale
+  ) {
     cozy.bar.init({
       appName: data.cozyAppName,
       appEditor: data.cozyAppEditor,
@@ -58,15 +62,19 @@ function init () {
   )
 
   render(
-    <I18n lang={lang} dictRequire={(lang) => require(`photos/locales/${lang}`)}>
+    <I18n lang={lang} dictRequire={lang => require(`photos/locales/${lang}`)}>
       <CozyProvider store={store} client={client}>
         <Router history={hashHistory}>
-          <Route path='shared' component={props => <App albumId={id} {...props} />}>
-            <Route path=':photoId' component={Viewer} />
+          <Route
+            path="shared"
+            component={props => <App albumId={id} {...props} />}
+          >
+            <Route path=":photoId" component={Viewer} />
           </Route>
-          <Redirect from='/*' to='shared' />
+          <Redirect from="/*" to="shared" />
         </Router>
       </CozyProvider>
-    </I18n>
-  , root)
+    </I18n>,
+    root
+  )
 }

From 1497cc110ad365cc54ea3040db461a86b905c444 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Rougeron?= <goldoraf@gmail.com>
Date: Mon, 23 Oct 2017 15:34:24 +0200
Subject: [PATCH 26/30] [fix] Small sharing fixes

---
 src/drive/locales/en.json                    |  1 +
 src/lib/cozy-client/slices/sharings.js       |  4 +++-
 src/sharing/components/ShareAutocomplete.jsx | 15 +++++++++++++++
 src/sharing/components/ShareByEmail.jsx      | 12 +++++++++---
 4 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/src/drive/locales/en.json b/src/drive/locales/en.json
index ac539c807d..c7f7ac4f20 100644
--- a/src/drive/locales/en.json
+++ b/src/drive/locales/en.json
@@ -60,6 +60,7 @@
         "email": "email",
         "emailPlaceholder": "Enter email address or name of your recipient",
         "send": "Send",
+        "genericSuccess": "You sent an invite to %{count} contacts.",
         "success": "You sent an invite to %{email}."
       },
       "unshare": {
diff --git a/src/lib/cozy-client/slices/sharings.js b/src/lib/cozy-client/slices/sharings.js
index c61734779f..b0c7086361 100644
--- a/src/lib/cozy-client/slices/sharings.js
+++ b/src/lib/cozy-client/slices/sharings.js
@@ -32,7 +32,9 @@ const documents = (state = [], action) => {
       )
       if (idx === -1) return state
       const sharing = state[idx]
-      const loneRecipient = sharing.attributes.recipients.length === 1
+      const loneRecipient =
+        sharing.attributes.recipients === undefined || // for recipient-side revocation
+        sharing.attributes.recipients.length === 1
       const newState = loneRecipient
         ? { ...sharing, attributes: { ...sharing.attributes, revoked: true } }
         : {
diff --git a/src/sharing/components/ShareAutocomplete.jsx b/src/sharing/components/ShareAutocomplete.jsx
index a9306bf0c4..fba83bf4c3 100644
--- a/src/sharing/components/ShareAutocomplete.jsx
+++ b/src/sharing/components/ShareAutocomplete.jsx
@@ -72,6 +72,19 @@ export default class ShareAutocomplete extends Component {
     }
   }
 
+  onBlur = (event, { highlightedSuggestion }) => {
+    if (highlightedSuggestion) {
+      this.props.onPick(highlightedSuggestion)
+      this.setState(state => ({ ...state, inputValue: '' }))
+    } else if (
+      this.state.inputValue !== '' &&
+      this.state.inputValue.match(/\S+@\S+/)
+    ) {
+      this.props.onPick({ email: this.state.inputValue })
+      this.setState(state => ({ ...state, inputValue: '' }))
+    }
+  }
+
   onPick = value => {
     this.props.onPick(value)
     this.setState(state => ({ ...state, inputValue: '' }))
@@ -118,8 +131,10 @@ export default class ShareAutocomplete extends Component {
         onSuggestionsClearRequested={this.onSuggestionsClearRequested}
         renderSuggestion={contact => <Recipient contact={contact} />}
         renderInputComponent={props => this.renderInput(props)}
+        highlightFirstSuggestion
         inputProps={{
           onChange: this.onChange,
+          onBlur: this.onBlur,
           value: inputValue,
           type: 'email'
         }}
diff --git a/src/sharing/components/ShareByEmail.jsx b/src/sharing/components/ShareByEmail.jsx
index 73ba934eab..7a1d7d4ce4 100644
--- a/src/sharing/components/ShareByEmail.jsx
+++ b/src/sharing/components/ShareByEmail.jsx
@@ -11,8 +11,12 @@ import styles from '../share.styl'
 class ShareByEmailWrapper extends React.Component {
   share(recipients, sharingType) {
     const { document, documentType, sharingDesc } = this.props
-    return this.props
-      .onShare(document, recipients, sharingType, sharingDesc)
+    // TODO: remove the Promise.all thing when the stack is ready for multi-contacts sharing
+    return Promise.all(
+      recipients.map(recipient =>
+        this.props.onShare(document, [recipient], sharingType, sharingDesc)
+      )
+    )
       .then(() => {
         if (recipients.length === 1) {
           Alerter.info(`${documentType}.share.shareByEmail.success`, {
@@ -110,6 +114,9 @@ class ShareByEmail extends React.Component {
 
   sendSharingLink() {
     const { recipients, sharingType } = this.state
+    if (recipients.length === 0) {
+      return
+    }
     this.props
       .onSend(recipients, sharingType)
       .then(() => {
@@ -163,7 +170,6 @@ class ShareByEmail extends React.Component {
           </select>
           <button
             className={classnames(styles['c-btn'], styles['c-btn--regular'])}
-            disabled={this.state.recipients.length === 0}
             onClick={e => this.sendSharingLink()}
           >
             {t(`${documentType}.share.shareByEmail.send`)}

From bbff10bdd77ca15fe18258687e1d5107429b7cdf Mon Sep 17 00:00:00 2001
From: Enguerran <enguerran@ticabri.com>
Date: Mon, 23 Oct 2017 16:30:25 +0200
Subject: [PATCH 27/30] refactor: rename raven functions

---
 src/drive/mobile/actions/settings.js     |  2 +-
 src/drive/mobile/lib/init.js             |  2 +-
 src/drive/mobile/lib/reporter.js         | 10 +++++-----
 src/drive/mobile/store/configureStore.js |  7 ++-----
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/drive/mobile/actions/settings.js b/src/drive/mobile/actions/settings.js
index 4f2b731a31..eb1964c794 100644
--- a/src/drive/mobile/actions/settings.js
+++ b/src/drive/mobile/actions/settings.js
@@ -6,7 +6,7 @@ import { setClient, setFirstReplication } from '../../actions/settings'
 import { getDeviceName } from '../lib/device'
 import { openFolder, getOpenedFolderId } from '../../actions'
 import { REGISTRATION_ABORT, onRegistered } from '../lib/registration'
-import { logException, configure as configureReporter } from '../lib/reporter'
+import { logException, configureReporter } from '../lib/reporter'
 import { startTracker, stopTracker } from '../lib/tracker'
 import { revokeClient as reduxRevokeClient } from './authorization'
 
diff --git a/src/drive/mobile/lib/init.js b/src/drive/mobile/lib/init.js
index 24f2a3702f..9f6dfdc8d5 100644
--- a/src/drive/mobile/lib/init.js
+++ b/src/drive/mobile/lib/init.js
@@ -1,4 +1,4 @@
-import { configure as configureReporter } from './reporter'
+import { configureReporter } from './reporter'
 import { initClient, initBar, isClientRegistered } from './cozy-helper'
 import { revokeClient } from '../actions/authorization'
 import { startReplication } from '../actions/settings'
diff --git a/src/drive/mobile/lib/reporter.js b/src/drive/mobile/lib/reporter.js
index d689399227..baa22da61c 100644
--- a/src/drive/mobile/lib/reporter.js
+++ b/src/drive/mobile/lib/reporter.js
@@ -4,14 +4,14 @@ import Raven from 'raven-js'
 let isEnable = false
 export const ANALYTICS_URL = `https://${__SENTRY_TOKEN__}@sentry.cozycloud.cc/6`
 
-export const getConfig = () => ({
+export const getReporterConfiguration = () => ({
   shouldSendCallback: () => isEnable && !__DEVELOPMENT__,
   environment: __DEVELOPMENT__ ? 'development' : 'production'
 })
 
-export const configure = enable => {
+export const configureReporter = enable => {
   isEnable = enable
-  Raven.config(ANALYTICS_URL, getConfig()).install()
+  Raven.config(ANALYTICS_URL, getReporterConfiguration()).install()
 }
 
 export const logException = err => {
@@ -27,13 +27,13 @@ const logMessage = (message, level = 'info', force) => {
   return new Promise(resolve => {
     const updateConfig = force && !isEnable
     if (updateConfig) {
-      configure(true)
+      configureReporter(true)
     }
     Raven.captureMessage(message, {
       level
     })
     if (updateConfig) {
-      configure(false)
+      configureReporter(false)
     }
     resolve()
   })
diff --git a/src/drive/mobile/store/configureStore.js b/src/drive/mobile/store/configureStore.js
index 68f2c29fad..a73a2a219f 100644
--- a/src/drive/mobile/store/configureStore.js
+++ b/src/drive/mobile/store/configureStore.js
@@ -2,10 +2,7 @@
 import { saveState } from './persistedState'
 import RavenMiddleWare from 'redux-raven-middleware'
 import { createLogger } from 'redux-logger'
-import {
-  ANALYTICS_URL,
-  getConfig as getAnalyticsConfiguration
-} from '../lib/reporter'
+import { ANALYTICS_URL, getReporterConfiguration } from '../lib/reporter'
 import { compose, createStore, applyMiddleware } from 'redux'
 import {
   shouldEnableTracking,
@@ -28,7 +25,7 @@ const configureStore = (initialState = {}) => {
   const loggerMiddleware = createLogger(loggerOptions)
   const ravenMiddleWare = RavenMiddleWare(
     ANALYTICS_URL,
-    getAnalyticsConfiguration()
+    getReporterConfiguration()
   )
   const middlewares = [thunkMiddleware, ravenMiddleWare]
   if (shouldEnableTracking() && getTracker()) {

From 6880d2502cbb0934833cfa7812541965fd85968e Mon Sep 17 00:00:00 2001
From: Enguerran <enguerran@ticabri.com>
Date: Mon, 23 Oct 2017 17:25:52 +0200
Subject: [PATCH 28/30] fix: use sentry dev project

---
 config/webpack.target.mobile.js  |  4 +++-
 src/drive/mobile/lib/reporter.js | 19 +++++++++++--------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/config/webpack.target.mobile.js b/config/webpack.target.mobile.js
index 70d57b416c..7f6ba47391 100644
--- a/config/webpack.target.mobile.js
+++ b/config/webpack.target.mobile.js
@@ -19,7 +19,9 @@ module.exports = function(production, app) {
       new DefinePlugin({
         __ALLOW_HTTP__: !production,
         __TARGET__: JSON.stringify('mobile'),
-        __SENTRY_TOKEN__: JSON.stringify('9259817fbb44484b8b7a0a817d968ae4'),
+        __SENTRY_TOKEN__: production
+          ? JSON.stringify('9259817fbb44484b8b7a0a817d968ae4')
+          : JSON.stringify('29bd1255b6d544a1b65435a634c9ff67'),
         __APP_VERSION__: JSON.stringify(pkg.version)
       }),
       new ProvidePlugin({
diff --git a/src/drive/mobile/lib/reporter.js b/src/drive/mobile/lib/reporter.js
index baa22da61c..fa6a34c8df 100644
--- a/src/drive/mobile/lib/reporter.js
+++ b/src/drive/mobile/lib/reporter.js
@@ -1,16 +1,20 @@
 /* global __SENTRY_TOKEN__, __DEVELOPMENT__ */
 import Raven from 'raven-js'
 
-let isEnable = false
-export const ANALYTICS_URL = `https://${__SENTRY_TOKEN__}@sentry.cozycloud.cc/6`
+let isEnabled = false
+const PROD_ANALYTICS_URL = `https://${__SENTRY_TOKEN__}@sentry.cozycloud.cc/6`
+const DEV_ANALYTICS_URL = `https://${__SENTRY_TOKEN__}@sentry.cozycloud.cc/2`
+export const ANALYTICS_URL = __DEVELOPMENT__
+  ? DEV_ANALYTICS_URL
+  : PROD_ANALYTICS_URL
 
 export const getReporterConfiguration = () => ({
-  shouldSendCallback: () => isEnable && !__DEVELOPMENT__,
+  shouldSendCallback: () => isEnabled,
   environment: __DEVELOPMENT__ ? 'development' : 'production'
 })
 
 export const configureReporter = enable => {
-  isEnable = enable
+  isEnabled = enable
   Raven.config(ANALYTICS_URL, getReporterConfiguration()).install()
 }
 
@@ -25,15 +29,14 @@ export const logException = err => {
 
 const logMessage = (message, level = 'info', force) => {
   return new Promise(resolve => {
-    const updateConfig = force && !isEnable
-    if (updateConfig) {
+    if (force) {
       configureReporter(true)
     }
     Raven.captureMessage(message, {
       level
     })
-    if (updateConfig) {
-      configureReporter(false)
+    if (force) {
+      configureReporter(isEnabled)
     }
     resolve()
   })

From 6ee50258167dd58175163577db550d2b4f0ebfc3 Mon Sep 17 00:00:00 2001
From: Enguerran <enguerran@ticabri.com>
Date: Mon, 23 Oct 2017 17:34:07 +0200
Subject: [PATCH 29/30] feat: add serverUrl in sentry msg

---
 src/drive/mobile/containers/settings/Support.jsx | 12 +++++++++---
 src/drive/mobile/lib/reporter.js                 | 11 +++++++----
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/drive/mobile/containers/settings/Support.jsx b/src/drive/mobile/containers/settings/Support.jsx
index 42f79784a6..52231c5e4c 100644
--- a/src/drive/mobile/containers/settings/Support.jsx
+++ b/src/drive/mobile/containers/settings/Support.jsx
@@ -16,7 +16,8 @@ export const Support = ({
   isDebug,
   success,
   failure,
-  offline
+  offline,
+  serverUrl
 }) => (
   <SettingCategory
     title={t('mobile.settings.support.title')}
@@ -39,7 +40,11 @@ export const Support = ({
         onClick: async () => {
           if (isOnline()) {
             try {
-              await logInfo(t('mobile.settings.support.logs.title'), true)
+              await logInfo(
+                t('mobile.settings.support.logs.title'),
+                serverUrl,
+                true
+              )
               success()
             } catch (e) {
               failure()
@@ -54,7 +59,8 @@ export const Support = ({
 )
 
 const mapStateToProps = state => ({
-  analytics: state.mobile.settings.analytics
+  analytics: state.mobile.settings.analytics,
+  serverUrl: state.mobile.settings.serverUrl
 })
 
 const mapDispatchToProps = dispatch => ({
diff --git a/src/drive/mobile/lib/reporter.js b/src/drive/mobile/lib/reporter.js
index fa6a34c8df..51b91ce522 100644
--- a/src/drive/mobile/lib/reporter.js
+++ b/src/drive/mobile/lib/reporter.js
@@ -27,12 +27,15 @@ export const logException = err => {
   })
 }
 
-const logMessage = (message, level = 'info', force) => {
+const logMessage = (message, serverUrl, level = 'info', force) => {
   return new Promise(resolve => {
     if (force) {
       configureReporter(true)
     }
-    Raven.captureMessage(message, {
+    Raven.setUserContext = {
+      url: serverUrl
+    }
+    Raven.captureMessage(`[${serverUrl}] ${message}`, {
       level
     })
     if (force) {
@@ -42,5 +45,5 @@ const logMessage = (message, level = 'info', force) => {
   })
 }
 
-export const logInfo = (message, force = false) =>
-  logMessage(message, 'info', force)
+export const logInfo = (message, serverUrl, force = false) =>
+  logMessage(message, serverUrl, 'info', force)

From 88a24e0b702b221e8589618b280523e855ea5f4e Mon Sep 17 00:00:00 2001
From: Yannick Lohse <contact@yannick-lohse.fr>
Date: Tue, 24 Oct 2017 10:14:12 +0200
Subject: [PATCH 30/30] chore: update version number and changelog

---
 package.json                                                    | 2 +-
 targets/drive/mobile/config.xml                                 | 2 +-
 .../mobile/fastlane/metadata/android/en-US/changelogs/609.txt   | 2 ++
 .../mobile/fastlane/metadata/android/fr-FR/changelogs/609.txt   | 2 ++
 4 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 targets/drive/mobile/fastlane/metadata/android/en-US/changelogs/609.txt
 create mode 100644 targets/drive/mobile/fastlane/metadata/android/fr-FR/changelogs/609.txt

diff --git a/package.json b/package.json
index 98a307b3b5..30db5bcb4e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cozy-drive",
-  "version": "0.6.0",
+  "version": "0.6.9",
   "main": "src/main.jsx",
   "scripts": {
     "build:drive": "npm run build:drive:browser",
diff --git a/targets/drive/mobile/config.xml b/targets/drive/mobile/config.xml
index 53ba0430c5..a7e6c31725 100644
--- a/targets/drive/mobile/config.xml
+++ b/targets/drive/mobile/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="io.cozy.drive.mobile" version="0.6.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="io.cozy.drive.mobile" version="0.6.9" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>Cozy Drive</name>
     <description>Sync files from your Cozy.</description>
     <author email="contact@cozycloud.cc" href="https://cozy.io">Cozy Cloud</author>
diff --git a/targets/drive/mobile/fastlane/metadata/android/en-US/changelogs/609.txt b/targets/drive/mobile/fastlane/metadata/android/en-US/changelogs/609.txt
new file mode 100644
index 0000000000..63ecb89680
--- /dev/null
+++ b/targets/drive/mobile/fastlane/metadata/android/en-US/changelogs/609.txt
@@ -0,0 +1,2 @@
+- Improvement of button responsiveness on iOS
+- Massive improvement of photo backup, especially on iOS
diff --git a/targets/drive/mobile/fastlane/metadata/android/fr-FR/changelogs/609.txt b/targets/drive/mobile/fastlane/metadata/android/fr-FR/changelogs/609.txt
new file mode 100644
index 0000000000..3f23516c85
--- /dev/null
+++ b/targets/drive/mobile/fastlane/metadata/android/fr-FR/changelogs/609.txt
@@ -0,0 +1,2 @@
+- Amélioration de la vitesse de réaction des boutons sur iOS
+- Amélioration massive de la sauvegarde de photos, particulièrement sur iOS