cozy-ui-plus 3.1.2 → 4.1.0

package/CHANGELOG.md

@@ -3,6 +3,24 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.1.0](https://github.com/cozy/cozy-libs/compare/cozy-ui-plus@4.0.0...cozy-ui-plus@4.1.0) (2025-12-10)
+
+### Features
+
+- **ui-plus:** Add possibility to overrides fields in Contacts AddModal ([7224485](https://github.com/cozy/cozy-libs/commit/72244856a99c879d54b1317e402a095afcb8b3f6))
+- **ui-plus:** Change required logic for Contacts AddModal ([cdd5650](https://github.com/cozy/cozy-libs/commit/cdd565070ddb98a515c63ee9f2026b4e2fa1532d))
+- **ui-plus:** Contacts AddModal form input values are now overridable ([50e7502](https://github.com/cozy/cozy-libs/commit/50e7502e5143e0479941c8aeabe67e90796a735c))
+
+# [4.0.0](https://github.com/cozy/cozy-libs/compare/cozy-ui-plus@3.1.2...cozy-ui-plus@4.0.0) (2025-12-04)
+
+### Features
+
+- Add twake-i18n in packages ([f8689a9](https://github.com/cozy/cozy-libs/commit/f8689a9a58dc6384ccf494a19fd1afb595da39f0))
+
+### BREAKING CHANGES
+
+- You must have `twake-i18n >= 0.3.0` and `cozy-ui >= 135.0.0`
+
 ## [3.1.2](https://github.com/cozy/cozy-libs/compare/cozy-ui-plus@3.1.1...cozy-ui-plus@3.1.2) (2025-12-04)
 
 **Note:** Version bump only for package cozy-ui-plus

package/dist/AppSections/Sections.js

@@ -29,14 +29,12 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _twakeI18n = require("twake-i18n");
+
 var _Typography = _interopRequireDefault(require("cozy-ui/transpiled/react/Typography"));
 
 var _Breakpoints = require("cozy-ui/transpiled/react/providers/Breakpoints");
 
-var _I18n = require("cozy-ui/transpiled/react/providers/I18n");
-
-var _withOnlyLocales = _interopRequireDefault(require("cozy-ui/transpiled/react/providers/I18n/withOnlyLocales"));
-
 var catUtils = _interopRequireWildcard(require("./categories"));
 
 var _AppsSection = _interopRequireDefault(require("./components/AppsSection"));
@@ -402,9 +400,9 @@ var SectionsWrapper = function SectionsWrapper(_ref5) {
   var config = _ref5.config,
       props = (0, _objectWithoutProperties2.default)(_ref5, _excluded);
   var i18nConfig = (0, _generateI18nConfig.generateI18nConfig)(config === null || config === void 0 ? void 0 : config.categories);
-  (0, _I18n.useExtendI18n)(i18nConfig);
+  (0, _twakeI18n.useExtendI18n)(i18nConfig);
 
-  var _useI18n = (0, _I18n.useI18n)(),
+  var _useI18n = (0, _twakeI18n.useI18n)(),
       t = _useI18n.t;
 
   var breakpoints = (0, _Breakpoints.useBreakpoints)();
@@ -456,6 +454,6 @@ Sections.defaultProps = {
   })
 };
 
-var _default = (0, _withOnlyLocales.default)(locales)(SectionsWrapper);
+var _default = (0, _twakeI18n.withOnlyLocales)(locales)(SectionsWrapper);
 
 exports.default = _default;

package/dist/AppSections/components/AppsSection.js

@@ -17,7 +17,7 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _Breakpoints = _interopRequireDefault(require("cozy-ui/transpiled/react/providers/Breakpoints"));
 
-var _I18n = require("cozy-ui/transpiled/react/providers/I18n");
+var _twakeI18n = require("twake-i18n");
 
 var _AppTile = _interopRequireDefault(require("../../AppTile"));
 
@@ -61,7 +61,7 @@ var AppsSection = function AppsSection(_ref) {
   var _useBreakpoints = (0, _Breakpoints.default)(),
       isMobile = _useBreakpoints.isMobile;
 
-  var _useI18n = (0, _I18n.useI18n)(),
+  var _useI18n = (0, _twakeI18n.useI18n)(),
       t = _useI18n.t;
 
   var apps = (0, _react.useMemo)(function () {

package/dist/AppTile/index.js

@@ -17,14 +17,14 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _react = _interopRequireDefault(require("react"));
 
+var _twakeI18n = require("twake-i18n");
+
 var _Icon = _interopRequireDefault(require("cozy-ui/transpiled/react/Icon"));
 
 var _WrenchCircle = _interopRequireDefault(require("cozy-ui/transpiled/react/Icons/WrenchCircle"));
 
 var _Tile = _interopRequireWildcard(require("cozy-ui/transpiled/react/Tile"));
 
-var _I18n = require("cozy-ui/transpiled/react/providers/I18n");
-
 var _helpers = require("./helpers");
 
 var _AppIcon = _interopRequireDefault(require("../AppIcon"));
@@ -103,7 +103,7 @@ var getAppIconProps = function getAppIconProps() {
   };
 };
 
-var useI18n = (0, _I18n.createUseI18n)(locales);
+var useI18n = (0, _twakeI18n.createUseI18n)(locales);
 
 var AppTile = function AppTile(_ref) {
   var app = _ref.app,

package/dist/Contacts/AddModal/ContactAddressDialog/index.js

@@ -13,12 +13,12 @@ var _react = _interopRequireDefault(require("react"));
 
 var _reactFinalForm = require("react-final-form");
 
+var _twakeI18n = require("twake-i18n");
+
 var _Buttons = _interopRequireDefault(require("cozy-ui/transpiled/react/Buttons"));
 
 var _CozyDialogs = require("cozy-ui/transpiled/react/CozyDialogs");
 
-var _I18n = require("cozy-ui/transpiled/react/providers/I18n");
-
 var _helpers = require("./helpers");
 
 var _locales = require("./locales");
@@ -31,9 +31,9 @@ var ContactAddressModal = function ContactAddressModal(_ref) {
   var onClose = _ref.onClose,
       name = _ref.name,
       subFields = _ref.subFields;
-  (0, _I18n.useExtendI18n)(_locales.locales);
+  (0, _twakeI18n.useExtendI18n)(_locales.locales);
 
-  var _useI18n = (0, _I18n.useI18n)(),
+  var _useI18n = (0, _twakeI18n.useI18n)(),
       t = _useI18n.t;
 
   var _useForm = (0, _reactFinalForm.useForm)(),

package/dist/Contacts/AddModal/ContactForm/FieldInput.js

@@ -21,7 +21,7 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _reactFinalForm = require("react-final-form");
 
-var _I18n = require("cozy-ui/transpiled/react/providers/I18n");
+var _twakeI18n = require("twake-i18n");
 
 var _FieldInputWrapper = _interopRequireDefault(require("./FieldInputWrapper"));
 
@@ -56,8 +56,7 @@ var FieldInput = function FieldInput(_ref) {
       error = _ref.error,
       helperText = _ref.helperText,
       label = _ref.label,
-      isInvisible = _ref.isInvisible,
-      required = _ref.required;
+      isInvisible = _ref.isInvisible;
 
   var _useState = (0, _react.useState)((0, _uniqueId.default)('field_')),
       _useState2 = (0, _slicedToArray2.default)(_useState, 1),
@@ -79,9 +78,9 @@ var FieldInput = function FieldInput(_ref) {
       isRelatedContactDialogOpen = _useState8[0],
       setIsRelatedContactDialogOpen = _useState8[1];
 
-  (0, _I18n.useExtendI18n)(_locales.locales);
+  (0, _twakeI18n.useExtendI18n)(_locales.locales);
 
-  var _useI18n = (0, _I18n.useI18n)(),
+  var _useI18n = (0, _twakeI18n.useI18n)(),
       t = _useI18n.t;
 
   var handleClick = function handleClick() {
@@ -104,7 +103,6 @@ var FieldInput = function FieldInput(_ref) {
       'u-dn': isInvisible
     })
   }, /*#__PURE__*/_react.default.createElement(_reactFinalForm.Field, {
-    required: required,
     error: error,
     helperText: helperText,
     label: label,
@@ -153,12 +151,10 @@ FieldInput.propTypes = {
   }),
   // Destructuring props
   id: _propTypes.default.string,
-  label: _propTypes.default.string,
-  required: _propTypes.default.bool
+  label: _propTypes.default.string
 };
 FieldInput.defaultProps = {
-  labelProps: null,
-  required: false
+  labelProps: null
 };
 var _default = FieldInput;
 exports.default = _default;

package/dist/Contacts/AddModal/ContactForm/FieldInputAccordion.js

@@ -13,6 +13,8 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _twakeI18n = require("twake-i18n");
+
 var _Icon = _interopRequireDefault(require("cozy-ui/transpiled/react/Icon"));
 
 var _IconButton = _interopRequireDefault(require("cozy-ui/transpiled/react/IconButton"));
@@ -21,8 +23,6 @@ var _Dropdown = _interopRequireDefault(require("cozy-ui/transpiled/react/Icons/D
 
 var _Dropup = _interopRequireDefault(require("cozy-ui/transpiled/react/Icons/Dropup"));
 
-var _I18n = require("cozy-ui/transpiled/react/providers/I18n");
-
 var _FieldInput = _interopRequireDefault(require("./FieldInput"));
 
 var _locales = require("./locales");
@@ -43,9 +43,9 @@ var FieldInputAccordion = function FieldInputAccordion(_ref) {
       contacts = _ref.contacts,
       error = _ref.error,
       helperText = _ref.helperText;
-  (0, _I18n.useExtendI18n)(_locales.locales);
+  (0, _twakeI18n.useExtendI18n)(_locales.locales);
 
-  var _useI18n = (0, _I18n.useI18n)(),
+  var _useI18n = (0, _twakeI18n.useI18n)(),
       t = _useI18n.t;
 
   var _useState = (0, _react.useState)(false),

package/dist/Contacts/AddModal/ContactForm/FieldInputArray.js

@@ -15,6 +15,8 @@ var _react = _interopRequireDefault(require("react"));
 
 var _reactFinalFormArrays = require("react-final-form-arrays");
 
+var _twakeI18n = require("twake-i18n");
+
 var _Buttons = _interopRequireDefault(require("cozy-ui/transpiled/react/Buttons"));
 
 var _Icon = _interopRequireDefault(require("cozy-ui/transpiled/react/Icon"));
@@ -27,8 +29,6 @@ var _Plus = _interopRequireDefault(require("cozy-ui/transpiled/react/Icons/Plus"
 
 var _ListItemIcon = _interopRequireDefault(require("cozy-ui/transpiled/react/ListItemIcon"));
 
-var _I18n = require("cozy-ui/transpiled/react/providers/I18n");
-
 var _FieldInput = _interopRequireDefault(require("./FieldInput"));
 
 var _helpers = require("./helpers");
@@ -43,15 +43,13 @@ var FieldInputArray = function FieldInputArray(_ref) {
       label = _ref$attributes.label,
       restAttributes = (0, _objectWithoutProperties2.default)(_ref$attributes, _excluded),
       contacts = _ref.contacts,
-      _ref$formProps = _ref.formProps,
-      valid = _ref$formProps.valid,
-      submitFailed = _ref$formProps.submitFailed,
-      errors = _ref$formProps.errors;
-  (0, _I18n.useExtendI18n)(_locales.locales);
+      formProps = _ref.formProps;
+  (0, _twakeI18n.useExtendI18n)(_locales.locales);
 
-  var _useI18n = (0, _I18n.useI18n)(),
+  var _useI18n = (0, _twakeI18n.useI18n)(),
       t = _useI18n.t;
 
+  var errors = formProps.errors;
   return /*#__PURE__*/_react.default.createElement(_reactFinalFormArrays.FieldArray, {
     name: name
   }, function (_ref2) {
@@ -62,7 +60,7 @@ var FieldInputArray = function FieldInputArray(_ref) {
       var key = ((_fields$value$index = fields.value[index]) === null || _fields$value$index === void 0 ? void 0 : _fields$value$index.fieldId) || nameWithIndex;
       var showRemove = (_fields$value$index2 = fields.value[index]) === null || _fields$value$index2 === void 0 ? void 0 : _fields$value$index2[name];
       var inputName = "".concat(nameWithIndex, ".").concat(name);
-      var isError = _helpers.fieldsRequired.includes(inputName) && !valid && submitFailed;
+      var isError = (0, _helpers.makeIsRequiredError)(restAttributes.required, formProps);
       return /*#__PURE__*/_react.default.createElement("div", {
         key: key,
         className: (0, _classnames.default)('u-flex u-flex-items-baseline', {

package/dist/Contacts/AddModal/ContactForm/FieldInputLayout.js

@@ -15,9 +15,9 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _react = _interopRequireDefault(require("react"));
 
-var _Icon = _interopRequireDefault(require("cozy-ui/transpiled/react/Icon"));
+var _twakeI18n = require("twake-i18n");
 
-var _I18n = require("cozy-ui/transpiled/react/providers/I18n");
+var _Icon = _interopRequireDefault(require("cozy-ui/transpiled/react/Icon"));
 
 var _FieldInput = _interopRequireDefault(require("./FieldInput"));
 
@@ -41,18 +41,16 @@ var FieldInputLayout = function FieldInputLayout(_ref) {
       contacts = _ref.contacts,
       showSecondaryFields = _ref.showSecondaryFields,
       formProps = _ref.formProps;
-  (0, _I18n.useExtendI18n)(_locales.locales);
+  (0, _twakeI18n.useExtendI18n)(_locales.locales);
 
-  var _useI18n = (0, _I18n.useI18n)(),
+  var _useI18n = (0, _twakeI18n.useI18n)(),
       t = _useI18n.t;
 
-  var valid = formProps.valid,
-      submitFailed = formProps.submitFailed,
-      errors = formProps.errors;
+  var errors = formProps.errors;
   var name = attributes.name,
       label = attributes.label,
       restAttributes = (0, _objectWithoutProperties2.default)(attributes, _excluded2);
-  var isError = _helpers.fieldsRequired.includes(name) && !valid && submitFailed;
+  var isError = (0, _helpers.makeIsRequiredError)(restAttributes.required, formProps);
   return /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)('u-mt-1', {
       'u-flex-items-center': !layout,

package/dist/Contacts/AddModal/ContactForm/FieldInputWrapper.js

@@ -35,7 +35,7 @@ var FieldInputWrapper = function FieldInputWrapper(_ref) {
       fullWidth = _ref.fullWidth,
       props = (0, _objectWithoutProperties2.default)(_ref, _excluded2);
   var Component = component || (restAttributes.customLabelOptions ? _TextFieldCustomLabelSelect.default : restAttributes !== null && restAttributes !== void 0 && restAttributes.select ? _TextFieldSelect.default : _TextField.default);
-  return /*#__PURE__*/_react.default.createElement(Component, (0, _extends2.default)({}, restAttributes, input, props, {
+  return /*#__PURE__*/_react.default.createElement(Component, (0, _extends2.default)({}, input, restAttributes, props, {
     variant: variant,
     fullWidth: fullWidth,
     minRows: "2"

package/dist/Contacts/AddModal/ContactForm/TextFieldCustomLabelSelect.js

@@ -15,7 +15,7 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _I18n = require("cozy-ui/transpiled/react/providers/I18n");
+var _twakeI18n = require("twake-i18n");
 
 var _TextFieldSelect = _interopRequireDefault(require("./TextFieldSelect"));
 
@@ -40,9 +40,9 @@ var TextFieldCustomLabelSelect = function TextFieldCustomLabelSelect(_ref) {
       customLabelOptions = _ref.customLabelOptions,
       _onChange = _ref.onChange,
       props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
-  (0, _I18n.useExtendI18n)(_locales.locales);
+  (0, _twakeI18n.useExtendI18n)(_locales.locales);
 
-  var _useI18n = (0, _I18n.useI18n)(),
+  var _useI18n = (0, _twakeI18n.useI18n)(),
       t = _useI18n.t;
 
   var _useState = (0, _react.useState)(false),

package/dist/Contacts/AddModal/ContactForm/TextFieldSelect.js

@@ -15,12 +15,12 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 
 var _react = _interopRequireDefault(require("react"));
 
+var _twakeI18n = require("twake-i18n");
+
 var _MenuItem = _interopRequireDefault(require("cozy-ui/transpiled/react/MenuItem"));
 
 var _TextField = _interopRequireDefault(require("cozy-ui/transpiled/react/TextField"));
 
-var _I18n = require("cozy-ui/transpiled/react/providers/I18n");
-
 var _locales = require("./locales");
 
 var _types = require("../types");
@@ -34,9 +34,9 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 var TextFieldSelect = function TextFieldSelect(_ref) {
   var options = _ref.options,
       props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
-  (0, _I18n.useExtendI18n)(_locales.locales);
+  (0, _twakeI18n.useExtendI18n)(_locales.locales);
 
-  var _useI18n = (0, _I18n.useI18n)(),
+  var _useI18n = (0, _twakeI18n.useI18n)(),
       t = _useI18n.t;
 
   var _options = (0, _toConsumableArray2.default)(options.map(function (option) {

package/dist/Contacts/AddModal/ContactForm/helpers.js

@@ -5,16 +5,16 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.validateFields = exports.removeRelatedContactRelationships = exports.removeField = exports.removeAsscociatedData = exports.moveToHead = exports.movePrimaryToHead = exports.makeTypeAndLabel = exports.makeRelatedContact = exports.makeItemLabel = exports.makeInitialCustomValue = exports.makeImppValues = exports.makeFields = exports.makeCustomLabel = exports.hasExtendedAddress = exports.getRelatedContactRelationships = exports.fieldsRequired = exports.createAddress = exports.addField = void 0;
+exports.validateFields = exports.removeRelatedContactRelationships = exports.removeField = exports.removeAsscociatedData = exports.moveToHead = exports.movePrimaryToHead = exports.makeTypeAndLabel = exports.makeRelatedContact = exports.makeItemLabel = exports.makeIsRequiredError = exports.makeInitialCustomValue = exports.makeImppValues = exports.makeFields = exports.makeCustomLabel = exports.hasNoValues = exports.hasExtendedAddress = exports.getRelatedContactRelationships = exports.getFirstValueIfArray = exports.createAddress = exports.addField = void 0;
 
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
 var _get = _interopRequireDefault(require("lodash/get"));
 
 var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
@@ -35,27 +35,69 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
-var fieldsRequired = ['givenName', 'familyName', 'email[0].email', 'cozy'];
+var getFirstValueIfArray = function getFirstValueIfArray(values) {
+  return Object.keys(values).reduce(function (acc, key) {
+    var val = values[key];
+    acc[key] = Array.isArray(val) ? val[0] : val;
+    return acc;
+  }, {});
+};
 /**
- * Returns errors if all required fields are empty
+ * Returns true if all fields have no values
  * @param {object} values - Fields values
- * @param {func} t - Translation function
+ * @param {import('../types').Field[]} fields - Fields configuration
+ * @returns {boolean} True if all fields have no values
+ */
+
+
+exports.getFirstValueIfArray = getFirstValueIfArray;
+
+var hasNoValues = function hasNoValues(values, fields) {
+  var _values = getFirstValueIfArray(values);
+
+  return fields.every(function (field) {
+    return !(0, _get.default)(_values, field.name);
+  });
+};
+/**
+ * Returns true if the input is required and the form is invalid
+ * @param {boolean} required - Whether the input is required
+ * @param {object} formProps - The form props
+ * @returns {boolean} True if the input is required and the form is invalid
+ */
+
+
+exports.hasNoValues = hasNoValues;
+
+var makeIsRequiredError = function makeIsRequiredError(required, formProps) {
+  var valid = formProps.valid,
+      submitFailed = formProps.submitFailed;
+  return required && !valid && submitFailed;
+};
+/**
+ * Returns errors for required fields that are empty
+ * @param {object} values - Fields values
+ * @param {import('../types').Field[]} fields - Fields configuration
+ * @param {Function} t - Translation function
  * @returns {object} Errors
  */
 
-exports.fieldsRequired = fieldsRequired;
 
-var validateFields = function validateFields(values, t) {
+exports.makeIsRequiredError = makeIsRequiredError;
+
+var validateFields = function validateFields(values, fields, t) {
   var errors = {};
+  var fieldsRequired = fields.filter(function (field) {
+    return field.required;
+  });
 
-  if (fieldsRequired.every(function (field) {
-    return !(0, _get.default)(values, field);
-  })) {
-    fieldsRequired.forEach(function (field) {
-      errors[field] = t('Contacts.AddModal.ContactForm.fields.required');
-    });
-  }
+  var _values = getFirstValueIfArray(values);
 
+  fieldsRequired.forEach(function (field) {
+    if (!(0, _get.default)(_values, field.name)) {
+      errors[field.name] = field.layout === 'array' ? [(0, _defineProperty2.default)({}, field.name, t('Contacts.AddModal.ContactForm.fields.required'))] : t('Contacts.AddModal.ContactForm.fields.required');
+    }
+  });
   return errors;
 };
 /**
@@ -130,10 +172,10 @@ var movePrimaryToHead = moveToHead(function (v) {
 });
 exports.movePrimaryToHead = movePrimaryToHead;
 
-var createAddress = function createAddress(_ref) {
-  var address = _ref.address,
-      oldContact = _ref.oldContact,
-      t = _ref.t;
+var createAddress = function createAddress(_ref2) {
+  var address = _ref2.address,
+      oldContact = _ref2.oldContact,
+      t = _ref2.t;
   return address ? address.filter(function (val) {
     return val && val.address;
   }).map(function (addressField, index) {
@@ -149,9 +191,9 @@ var createAddress = function createAddress(_ref) {
     if (addressHasBeenModified) {
       // Use "code" instead "postcode", to be vcard 4.0 rfc 6350 compliant
       // eslint-disable-next-line no-unused-vars
-      var _ref2 = oldContactAddress || {},
-          postcode = _ref2.postcode,
-          oldContactAddressCleaned = (0, _objectWithoutProperties2.default)(_ref2, _excluded);
+      var _ref3 = oldContactAddress || {},
+          postcode = _ref3.postcode,
+          oldContactAddressCleaned = (0, _objectWithoutProperties2.default)(_ref3, _excluded);
 
       return _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, oldContactAddressCleaned), {}, {
         formattedAddress: addressField.address,
@@ -229,10 +271,10 @@ exports.getRelatedContactRelationships = getRelatedContactRelationships;
 var removeRelatedContactRelationships = function removeRelatedContactRelationships(contact) {
   if (!(contact !== null && contact !== void 0 && contact.relationships)) return contact;
   var updatedContact = (0, _merge.default)({}, contact);
-  var relationshipsWithoutRelatedContact = Object.entries(updatedContact.relationships).reduce(function (acc, _ref3) {
-    var _ref4 = (0, _slicedToArray2.default)(_ref3, 2),
-        relName = _ref4[0],
-        relValue = _ref4[1];
+  var relationshipsWithoutRelatedContact = Object.entries(updatedContact.relationships).reduce(function (acc, _ref4) {
+    var _ref5 = (0, _slicedToArray2.default)(_ref4, 2),
+        relName = _ref5[0],
+        relValue = _ref5[1];
 
     if ('related' === relName) {
       acc[relName] = relValue;
@@ -257,10 +299,10 @@ exports.removeRelatedContactRelationships = removeRelatedContactRelationships;
 
 var removeAsscociatedData = function removeAsscociatedData(contact) {
   if (!contact) return {};
-  return Object.entries(contact).reduce(function (cleanedContact, _ref5) {
-    var _ref6 = (0, _slicedToArray2.default)(_ref5, 2),
-        key = _ref6[0],
-        value = _ref6[1];
+  return Object.entries(contact).reduce(function (cleanedContact, _ref6) {
+    var _ref7 = (0, _slicedToArray2.default)(_ref6, 2),
+        key = _ref7[0],
+        value = _ref7[1];
 
     // Add `groups` condition to keep the old implementation functional, see below
     if (!(value instanceof _cozyClient.Association) || key === 'groups') {
@@ -456,9 +498,24 @@ var makeFields = function makeFields(customFields, defaultFields) {
   }
 
   var fields = (0, _toConsumableArray2.default)(defaultFields);
-  customFields.map(function (customField) {
-    if (customField.position) {
-      fields.splice(customField.position, 0, customField);
+  customFields.forEach(function (customField) {
+    var defaultField = fields.find(function (field) {
+      return field.name === customField.name;
+    });
+
+    var _field = defaultField || customField;
+
+    if (defaultField) {
+      Object.assign(_field, customField);
+    }
+
+    if (_field.position) {
+      if (defaultField) {
+        var fieldIndex = fields.indexOf(defaultField);
+        fields.splice(fieldIndex, 1);
+      }
+
+      fields.splice(_field.position, 0, _field);
     }
   });
   return fields;

package/dist/Contacts/AddModal/ContactForm/index.js

@@ -19,12 +19,12 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _reactFinalForm = require("react-final-form");
 
+var _twakeI18n = require("twake-i18n");
+
 var _HasMany = require("cozy-client/dist/associations/HasMany");
 
 var _Buttons = _interopRequireDefault(require("cozy-ui/transpiled/react/Buttons"));
 
-var _I18n = require("cozy-ui/transpiled/react/providers/I18n");
-
 var _FieldInputLayout = _interopRequireDefault(require("./FieldInputLayout"));
 
 var _contactToFormValues = _interopRequireDefault(require("./contactToFormValues"));
@@ -81,9 +81,9 @@ var ContactForm = function ContactForm(_ref) {
       showSecondaryFields = _useState2[0],
       setShowSecondaryFields = _useState2[1];
 
-  (0, _I18n.useExtendI18n)(_locales.locales);
+  (0, _twakeI18n.useExtendI18n)(_locales.locales);
 
-  var _useI18n = (0, _I18n.useI18n)(),
+  var _useI18n = (0, _twakeI18n.useI18n)(),
       t = _useI18n.t;
 
   var fields = customFieldsProps.fields,
@@ -104,9 +104,14 @@ var ContactForm = function ContactForm(_ref) {
       t: t
     }),
     validate: function validate(values) {
-      return (0, _helpers.validateFields)(values, t);
+      return (0, _helpers.validateFields)(values, _fields, t);
     },
     onSubmit: function onSubmit(formValues) {
+      // avoid creating an empty contact
+      if ((0, _helpers.hasNoValues)(formValues, _fields)) {
+        return;
+      }
+
       return _onSubmit((0, _formValuesToContact.default)({
         formValues: formValues,
         oldContact: contact,

package/dist/Contacts/AddModal/ContactForm/locales/index.js

@@ -32,7 +32,7 @@ var en = {
           relationship: "Relationship",
           note: "Notes",
           label: "Label",
-          required: "One of these fields must be filled in"
+          required: "All required fields must be filled in"
         },
         label: {
           none: "None",
@@ -107,7 +107,7 @@ var fr = {
           relationship: "Relation",
           note: "Notes",
           label: "Libell\xE9",
-          required: "Un de ces champs doit \xEAtre renseign\xE9"
+          required: "Tous les champs requis doivent \xEAtre renseign\xE9s"
         },
         label: {
           none: "Aucun",
@@ -182,7 +182,7 @@ var ru = {
           relationship: "\u041E\u0442\u043D\u043E\u0448\u0435\u043D\u0438\u0435",
           note: "\u0417\u0430\u043C\u0435\u0442\u043A\u0438",
           label: "\u041C\u0435\u0442\u043A\u0430",
-          required: "\u041E\u0434\u043D\u043E \u0438\u0437 \u044D\u0442\u0438\u0445 \u043F\u043E\u043B\u0435\u0439 \u0434\u043E\u043B\u0436\u043D\u043E \u0431\u044B\u0442\u044C \u0437\u0430\u043F\u043E\u043B\u043D\u0435\u043D\u043E"
+          required: "\u0412\u0441\u0435 \u043E\u0431\u044F\u0437\u0430\u0442\u0435\u043B\u044C\u043D\u044B\u0435 \u043F\u043E\u043B\u044F \u0434\u043E\u043B\u0436\u043D\u044B \u0431\u044B\u0442\u044C \u0437\u0430\u043F\u043E\u043B\u043D\u0435\u043D\u044B"
         },
         label: {
           none: "\u041D\u0435\u0442",
@@ -257,7 +257,7 @@ var vi = {
           relationship: "M\u1ED1i quan h\u1EC7",
           note: "Ghi ch\xFA",
           label: "Nh\xE3n",
-          required: "M\u1ED9t trong nh\u1EEFng tr\u01B0\u1EDDng n\xE0y ph\u1EA3i \u0111\u01B0\u1EE3c \u0111i\u1EC1n"
+          required: "T\u1EA5t c\u1EA3 c\xE1c tr\u01B0\u1EDDng b\u1EAFt bu\u1ED9c ph\u1EA3i \u0111\u01B0\u1EE3c \u0111i\u1EC1n"
         },
         label: {
           none: "Kh\xF4ng c\xF3",

package/dist/Contacts/AddModal/CustomLabelDialog/index.js

@@ -13,6 +13,8 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _twakeI18n = require("twake-i18n");
+
 var _Buttons = _interopRequireDefault(require("cozy-ui/transpiled/react/Buttons"));
 
 var _CozyDialogs = require("cozy-ui/transpiled/react/CozyDialogs");
@@ -27,8 +29,6 @@ var _TextField = _interopRequireDefault(require("cozy-ui/transpiled/react/TextFi
 
 var _Breakpoints = require("cozy-ui/transpiled/react/providers/Breakpoints");
 
-var _I18n = require("cozy-ui/transpiled/react/providers/I18n");
-
 var _locales = require("./locales");
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -42,9 +42,9 @@ var CustomLabelDialog = function CustomLabelDialog(_ref) {
       onSubmit = _ref.onSubmit,
       onClose = _ref.onClose;
   var customValueObj = JSON.parse(customValue || '{}');
-  (0, _I18n.useExtendI18n)(_locales.locales);
+  (0, _twakeI18n.useExtendI18n)(_locales.locales);
 
-  var _useI18n = (0, _I18n.useI18n)(),
+  var _useI18n = (0, _twakeI18n.useI18n)(),
       t = _useI18n.t;
 
   var _useBreakpoints = (0, _Breakpoints.useBreakpoints)(),