cozy-harvest-lib 20.1.0 → 20.1.2

package/CHANGELOG.md

@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [20.1.2](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@20.1.1...cozy-harvest-lib@20.1.2) (2023-10-27)
+
+
+### Bug Fixes
+
+* Wrap offers into json flag instead an array ([560c1bf](https://github.com/cozy/cozy-libs/commit/560c1bf0d905736182784db51eba93406077a466))
+
+
+
+
+
+## [20.1.1](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@20.1.0...cozy-harvest-lib@20.1.1) (2023-10-27)
+
+
+### Bug Fixes
+
+* **harvest:** Set FlagshipUI on connectionBackdrop ([b7aa9e6](https://github.com/cozy/cozy-libs/commit/b7aa9e69b77dbdd8a1f43f0a3800a08eadd2dd66))
+
+
+
+
+
 # [20.1.0](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@20.0.0...cozy-harvest-lib@20.1.0) (2023-10-26)
 
 

package/dist/components/AccountForm/ConnectionBackdrop.js

@@ -1,4 +1,6 @@
-import React from 'react';
+import React, { useEffect } from 'react';
+import { createPortal } from 'react-dom';
+import { useWebviewIntent } from 'cozy-intent';
 import Backdrop from 'cozy-ui/transpiled/react/Backdrop';
 import LinearProgress from 'cozy-ui/transpiled/react/LinearProgress';
 import MuiCozyTheme from 'cozy-ui/transpiled/react/MuiCozyTheme';
@@ -51,4 +53,33 @@ var ConnectionBackdrop = function ConnectionBackdrop(_ref) {
   }))))));
 };
 
-export default ConnectionBackdrop;
+var ConnectionBackdropWrapper = function ConnectionBackdropWrapper(_ref2) {
+  var name = _ref2.name;
+  var webviewIntent = useWebviewIntent();
+  useEffect(function () {
+    if (webviewIntent) {
+      // On mounting, we want to ensure the UI displays white icone because the backdrop is dark
+      // The WorkerView is then responsible to change back the icons to dark on white theme
+      webviewIntent.call('setFlagshipUI', {
+        bottomTheme: 'light',
+        topTheme: 'light'
+      }, 'ConnectionBackdrop Start');
+    } // As a precaution, we set the icons back to dark on white theme when unmounting
+    // This is to ensure the icons are not stuck in white on white theme in unhappy paths
+
+
+    return function () {
+      if (webviewIntent) {
+        webviewIntent.call('setFlagshipUI', {
+          bottomTheme: 'dark',
+          topTheme: 'dark'
+        }, 'ConnectionBackdrop End');
+      }
+    };
+  }, [webviewIntent]);
+  return /*#__PURE__*/createPortal( /*#__PURE__*/React.createElement(ConnectionBackdrop, {
+    name: name
+  }), document.body);
+};
+
+export default ConnectionBackdropWrapper;

package/dist/components/AccountsPaywall/helpers.js

@@ -101,7 +101,7 @@ export function computeNbAccounts(accounts) {
  */
 
 export function hasReachMaxAccounts(accounts) {
-  var offers = flag('harvest.accounts.offers') || [];
+  var offers = flag('harvest.accounts.offers.list') || [];
   var nbAccounts = computeNbAccounts(accounts, offers);
   var maxAccounts = computeMaxAccounts();
 

package/dist/components/FlowProvider.js

@@ -16,7 +16,6 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import { createPortal } from 'react-dom';
 import { withClient } from 'cozy-client';
 import { translate } from 'cozy-ui/transpiled/react/providers/I18n';
 import ConnectionBackdrop from './AccountForm/ConnectionBackdrop';
@@ -204,9 +203,9 @@ export var FlowProvider = /*#__PURE__*/function (_Component) {
         flow: flow,
         dismissAction: this.dismissTwoFAModal,
         into: "coz-harvest-modal-place"
-      }), showConnectionBackdrop && /*#__PURE__*/createPortal( /*#__PURE__*/React.createElement(ConnectionBackdrop, {
+      }), showConnectionBackdrop && /*#__PURE__*/React.createElement(ConnectionBackdrop, {
         name: flow.konnector.name
-      }), document.body));
+      }));
     }
   }]);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-harvest-lib",
-  "version": "20.1.0",
+  "version": "20.1.2",
   "description": "Provides logic, modules and components for Cozy's harvest applications.",
   "main": "dist/index.js",
   "author": "Cozy",
@@ -112,5 +112,5 @@
     "react-router-dom": ">=4.3.1"
   },
   "sideEffects": false,
-  "gitHead": "0f7ae07a012040097fd495eaeed55f2bc01a09a2"
+  "gitHead": "6da69c3efe784f0d6a3dd71c0bf28b79ed7c03a6"
 }

package/src/components/AccountForm/ConnectionBackdrop.jsx

@@ -1,5 +1,7 @@
-import React from 'react'
+import React, { useEffect } from 'react'
+import { createPortal } from 'react-dom'
 
+import { useWebviewIntent } from 'cozy-intent'
 import Backdrop from 'cozy-ui/transpiled/react/Backdrop'
 import LinearProgress from 'cozy-ui/transpiled/react/LinearProgress'
 import MuiCozyTheme from 'cozy-ui/transpiled/react/MuiCozyTheme'
@@ -55,4 +57,40 @@ const ConnectionBackdrop = ({ name }) => {
   )
 }
 
-export default ConnectionBackdrop
+const ConnectionBackdropWrapper = ({ name }) => {
+  const webviewIntent = useWebviewIntent()
+
+  useEffect(() => {
+    if (webviewIntent) {
+      // On mounting, we want to ensure the UI displays white icone because the backdrop is dark
+      // The WorkerView is then responsible to change back the icons to dark on white theme
+      webviewIntent.call(
+        'setFlagshipUI',
+        {
+          bottomTheme: 'light',
+          topTheme: 'light'
+        },
+        'ConnectionBackdrop Start'
+      )
+    }
+
+    // As a precaution, we set the icons back to dark on white theme when unmounting
+    // This is to ensure the icons are not stuck in white on white theme in unhappy paths
+    return () => {
+      if (webviewIntent) {
+        webviewIntent.call(
+          'setFlagshipUI',
+          {
+            bottomTheme: 'dark',
+            topTheme: 'dark'
+          },
+          'ConnectionBackdrop End'
+        )
+      }
+    }
+  }, [webviewIntent])
+
+  return createPortal(<ConnectionBackdrop name={name} />, document.body)
+}
+
+export default ConnectionBackdropWrapper

package/src/components/AccountsPaywall/helpers.js

@@ -96,7 +96,7 @@ export function computeNbAccounts(accounts, offers = []) {
  * @returns {boolean} whether the number of accounts allowed for all konnectors has been reached
  */
 export function hasReachMaxAccounts(accounts) {
-  const offers = flag('harvest.accounts.offers') || []
+  const offers = flag('harvest.accounts.offers.list') || []
 
   const nbAccounts = computeNbAccounts(accounts, offers)
 

package/src/components/FlowProvider.jsx

@@ -1,6 +1,5 @@
 import PropTypes from 'prop-types'
 import React, { Component } from 'react'
-import { createPortal } from 'react-dom'
 
 import { withClient } from 'cozy-client'
 import { translate } from 'cozy-ui/transpiled/react/providers/I18n'
@@ -176,11 +175,9 @@ export class FlowProvider extends Component {
           />
         )}
 
-        {showConnectionBackdrop &&
-          createPortal(
-            <ConnectionBackdrop name={flow.konnector.name} />,
-            document.body
-          )}
+        {showConnectionBackdrop && (
+          <ConnectionBackdrop name={flow.konnector.name} />
+        )}
       </>
     )
   }