chore: turn error boundary into typescript

3 files changed, 25 insertions, 21 deletions

diff --git a/src/components/ui/button/index.tsx b/src/components/ui/button/index.tsx
index 9c64e909a..26fd6bcfe 100644
--- a/src/components/ui/button/index.tsx
+++ b/src/components/ui/button/index.tsx
@@ -2,7 +2,7 @@ import Icon from '@mdi/react';
 import classnames from 'classnames';
 import { Property } from 'csstype';
 import { Component, MouseEvent } from 'react';
-import injectStyle, { WithStylesProps } from 'react-jss';
+import withStyles, { WithStylesProps } from 'react-jss';
 import Loader from 'react-loader';
 
 import { Theme } from '../../../themes';
@@ -18,6 +18,7 @@ type ButtonType =
 
 interface IProps extends IFormField, WithStylesProps<typeof styles> {
   className?: string;
+  label?: string;
   disabled?: boolean;
   id?: string;
   type?: 'button' | 'reset' | 'submit' | undefined;
@@ -148,12 +149,19 @@ const styles = (theme: Theme) => ({
 });
 
 class ButtonComponent extends Component<IProps> {
-  public static defaultProps = {
+  customDefaultProps: {
+    disabled: boolean;
+    type: 'button' | 'reset' | 'submit' | undefined;
+    onClick: (
+      event: MouseEvent<HTMLButtonElement> | MouseEvent<HTMLAnchorElement>,
+    ) => void;
+    buttonType: ButtonType;
+    busy: boolean;
+  } = {
     type: 'button',
     disabled: false,
     onClick: () => null,
     buttonType: 'primary' as ButtonType,
-    stretch: false,
     busy: false,
   };
 
@@ -193,7 +201,7 @@ class ButtonComponent extends Component<IProps> {
       href,
       target,
       htmlForm,
-    } = this.props;
+    } = { ...this.customDefaultProps, ...this.props };
 
     const { busy } = this.state;
     let showLoader = false;
@@ -265,6 +273,4 @@ class ButtonComponent extends Component<IProps> {
   }
 }
 
-const Button = injectStyle(styles, { injectTheme: true })(ButtonComponent);
-
-export default Button;
+export default withStyles(styles, { injectTheme: true })(ButtonComponent);
diff --git a/src/components/util/ErrorBoundary/index.js b/src/components/util/ErrorBoundary/index.tsx
index c1861e5f7..846d6dc3f 100644
--- a/src/components/util/ErrorBoundary/index.js
+++ b/src/components/util/ErrorBoundary/index.tsx
@@ -1,7 +1,6 @@
-import { Component } from 'react';
-import PropTypes from 'prop-types';
-import injectSheet from 'react-jss';
-import { defineMessages, injectIntl } from 'react-intl';
+import { Component, ReactNode } from 'react';
+import withStyles, { WithStylesProps } from 'react-jss';
+import { defineMessages, injectIntl, IntlShape } from 'react-intl';
 
 import Button from '../../ui/button';
 import { H1 } from '../../ui/headline';
@@ -19,21 +18,20 @@ const messages = defineMessages({
   },
 });
 
-class ErrorBoundary extends Component {
+interface ErrorBoundaryProps extends WithStylesProps<typeof styles> {
+  intl: IntlShape;
+}
+
+class ErrorBoundary extends Component<ErrorBoundaryProps> {
   state = {
     hasError: false,
   };
 
-  static propTypes = {
-    classes: PropTypes.object.isRequired,
-    children: PropTypes.node.isRequired,
-  };
-
-  componentDidCatch() {
+  componentDidCatch(): void {
     this.setState({ hasError: true });
   }
 
-  render() {
+  render(): ReactNode {
     const { classes } = this.props;
     const { intl } = this.props;
 
@@ -56,6 +54,6 @@ class ErrorBoundary extends Component {
   }
 }
 
-export default injectIntl(
-  injectSheet(styles, { injectTheme: true })(ErrorBoundary),
+export default withStyles(styles, { injectTheme: true })(
+  injectIntl<'intl', ErrorBoundaryProps>(ErrorBoundary),
 );
diff --git a/src/components/util/ErrorBoundary/styles.js b/src/components/util/ErrorBoundary/styles.tsx
index 0960546ff..0960546ff 100644
--- a/src/components/util/ErrorBoundary/styles.js
+++ b/src/components/util/ErrorBoundary/styles.tsx