Merge branch 'master' into add_country_flags

# Conflicts:
#	modern/package-lock.json

15 files changed, 6 insertions, 0 deletions

diff --git a/modern/src/common/components/AddressValue.js b/modern/src/common/components/AddressValue.jsx
index 827a71de..827a71de 100644
--- a/modern/src/common/components/AddressValue.js
+++ b/modern/src/common/components/AddressValue.jsx
diff --git a/modern/src/common/components/BottomMenu.js b/modern/src/common/components/BottomMenu.jsx
index 07fa2e11..07fa2e11 100644
--- a/modern/src/common/components/BottomMenu.js
+++ b/modern/src/common/components/BottomMenu.jsx
diff --git a/modern/src/common/components/ErrorHandler.js b/modern/src/common/components/ErrorHandler.jsx
index 5c9c26d9..5c9c26d9 100644
--- a/modern/src/common/components/ErrorHandler.js
+++ b/modern/src/common/components/ErrorHandler.jsx
diff --git a/modern/src/common/components/LinkField.js b/modern/src/common/components/LinkField.jsx
index 08c6213a..08c6213a 100644
--- a/modern/src/common/components/LinkField.js
+++ b/modern/src/common/components/LinkField.jsx
diff --git a/modern/src/common/components/LocalizationProvider.js b/modern/src/common/components/LocalizationProvider.jsx
index a6a14859..a6a14859 100644
--- a/modern/src/common/components/LocalizationProvider.js
+++ b/modern/src/common/components/LocalizationProvider.jsx
diff --git a/modern/src/common/components/NavBar.js b/modern/src/common/components/NavBar.jsx
index a53960fd..a53960fd 100644
--- a/modern/src/common/components/NavBar.js
+++ b/modern/src/common/components/NavBar.jsx
diff --git a/modern/src/common/components/PageLayout.js b/modern/src/common/components/PageLayout.jsx
index e81c9754..e81c9754 100644
--- a/modern/src/common/components/PageLayout.js
+++ b/modern/src/common/components/PageLayout.jsx
diff --git a/modern/src/common/components/PositionValue.js b/modern/src/common/components/PositionValue.jsx
index 58841939..58841939 100644
--- a/modern/src/common/components/PositionValue.js
+++ b/modern/src/common/components/PositionValue.jsx
diff --git a/modern/src/common/components/RemoveDialog.js b/modern/src/common/components/RemoveDialog.jsx
index 9a2a27fb..9a2a27fb 100644
--- a/modern/src/common/components/RemoveDialog.js
+++ b/modern/src/common/components/RemoveDialog.jsx
diff --git a/modern/src/common/components/SelectField.js b/modern/src/common/components/SelectField.jsx
index 35f817a0..35f817a0 100644
--- a/modern/src/common/components/SelectField.js
+++ b/modern/src/common/components/SelectField.jsx
diff --git a/modern/src/common/components/SideNav.js b/modern/src/common/components/SideNav.jsx
index 97968bd1..97968bd1 100644
--- a/modern/src/common/components/SideNav.js
+++ b/modern/src/common/components/SideNav.jsx
diff --git a/modern/src/common/components/SplitButton.js b/modern/src/common/components/SplitButton.jsx
index 84876f15..84876f15 100644
--- a/modern/src/common/components/SplitButton.js
+++ b/modern/src/common/components/SplitButton.jsx
diff --git a/modern/src/common/components/StatusCard.js b/modern/src/common/components/StatusCard.jsx
index c389636c..c389636c 100644
--- a/modern/src/common/components/StatusCard.js
+++ b/modern/src/common/components/StatusCard.jsx
diff --git a/modern/src/common/components/TableShimmer.js b/modern/src/common/components/TableShimmer.jsx
index 08a984a4..08a984a4 100644
--- a/modern/src/common/components/TableShimmer.js
+++ b/modern/src/common/components/TableShimmer.jsx
diff --git a/modern/src/common/theme/components.js b/modern/src/common/theme/components.js
index d0c7f9c6..572f876e 100644
--- a/modern/src/common/theme/components.js
+++ b/modern/src/common/theme/components.js
@@ -33,4 +33,10 @@ export default {
       },
     },
   },
+  MuiTooltip: {
+    defaultProps: {
+      enterDelay: 500,
+      enterNextDelay: 500,
+    },
+  },
 };