From adc3fbb9a286ae56d503b2b7225f977b84231344 Mon Sep 17 00:00:00 2001
From: Apostolof <apotwohd@gmail.com>
Date: Mon, 2 Nov 2020 23:30:42 +0200
Subject: [PATCH] Update eslintrc files

---
 packages/concordia-app/.eslintrc.js       | 13 +++++++++----
 packages/concordia-contracts/.eslintrc.js | 11 ++---------
 yarn.lock                                 |  2 +-
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/packages/concordia-app/.eslintrc.js b/packages/concordia-app/.eslintrc.js
index c2321b9..db831ff 100644
--- a/packages/concordia-app/.eslintrc.js
+++ b/packages/concordia-app/.eslintrc.js
@@ -23,18 +23,23 @@ module.exports = {
         'react'
     ],
     'rules': {
-        "indent": ["error", 4],
-        "react/jsx-indent": ["error", 4],
-        "react/jsx-indent-props": ["error", 4],
-        'react/jsx-filename-extension': 'off',
         'react/jsx-props-no-spreading': 'off',
         'import/extensions': 'off',
+        "react/jsx-indent": [
+            'error',
+            4,
+            {
+                checkAttributes: true,
+                indentLogicalExpressions: true
+            }
+        ],
         'react/require-default-props': 'off',
         'react/prop-types': 'off',
         'max-len': ['warn', {'code': 120, 'tabWidth': 4}],
         'no-unused-vars': 'warn',
         'no-console': 'warn',
         'no-shadow': 'warn',
+        "no-multi-str": "warn"
     },
     'settings': {
         'import/resolver': {
diff --git a/packages/concordia-contracts/.eslintrc.js b/packages/concordia-contracts/.eslintrc.js
index 8261734..3b8b151 100644
--- a/packages/concordia-contracts/.eslintrc.js
+++ b/packages/concordia-contracts/.eslintrc.js
@@ -17,9 +17,6 @@ module.exports = {
         'assert': 'readonly'
     },
     'parserOptions': {
-        'ecmaFeatures': {
-            'jsx': true
-        },
         'ecmaVersion': 2018,
         'sourceType': 'module'
     },
@@ -27,11 +24,6 @@ module.exports = {
         'react'
     ],
     'rules': {
-        "indent": ["error", 4],
-        "react/jsx-indent": ["error", 4],
-        "react/jsx-indent-props": ["error", 4],
-        'react/jsx-filename-extension': 'off',
-        'react/jsx-props-no-spreading': 'off',
         'import/extensions': 'off',
         'react/require-default-props': 'off',
         'react/prop-types': 'off',
@@ -39,11 +31,12 @@ module.exports = {
         'no-unused-vars': 'warn',
         'no-console': 'warn',
         'no-shadow': 'warn',
+        "no-multi-str": "warn"
     },
     'settings': {
         'import/resolver': {
             'node': {
-                'extensions': ['.js', '.jsx']
+                'extensions': ['.js']
             }
         }
     },
diff --git a/yarn.lock b/yarn.lock
index c651b92..48aaf59 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3277,7 +3277,7 @@ babel-code-frame@^6.22.0:
     esutils "^2.0.2"
     js-tokens "^3.0.2"
 
-babel-eslint@10.1.0:
+babel-eslint@10.1.0, babel-eslint@^10.0.0:
   version "10.1.0"
   resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.1.0.tgz#6968e568a910b78fb3779cdd8b6ac2f479943232"
   integrity sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==