Merge branch 'master' into add_country_flags

# Conflicts:
#	modern/package-lock.json

1 files changed, 35 insertions, 0 deletions

diff --git a/modern/src/ErrorBoundary.jsx b/modern/src/ErrorBoundary.jsx
new file mode 100644
index 00000000..93a6fe0f
--- /dev/null
+++ b/modern/src/ErrorBoundary.jsx
@@ -0,0 +1,35 @@
+import React from 'react';
+import { Alert } from '@mui/material';
+
+class ErrorBoundary extends React.Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      error: null,
+    };
+  }
+
+  static getDerivedStateFromError(error) {
+    return { error };
+  }
+
+  /* eslint-disable react/no-danger */
+  render() {
+    const { error } = this.state;
+    if (error) {
+      return (
+        <Alert severity="error">
+          <code
+            dangerouslySetInnerHTML={{
+              __html: error.stack.replaceAll('\n', '<br>').replaceAll(' ', '&nbsp;'),
+            }}
+          />
+        </Alert>
+      );
+    }
+    const { children } = this.props;
+    return children;
+  }
+}
+
+export default ErrorBoundary;