diff --git a/src/containers/gui.jsx b/src/containers/gui.jsx index 59e5b94268a5286b4a0ba94422819ed05a556a51..79a85c9dc786d9775863679a7395d7564b09a478 100644 --- a/src/containers/gui.jsx +++ b/src/containers/gui.jsx @@ -5,7 +5,7 @@ import VM from 'scratch-vm'; import {connect} from 'react-redux'; import ReactModal from 'react-modal'; -import ErrorBoundary from './error-boundary.jsx'; +import ErrorBoundaryHOC from '../lib/error-boundary-hoc.jsx'; import {openExtensionLibrary} from '../reducers/modals'; import { activateTab, @@ -75,15 +75,13 @@ class GUI extends React.Component { ...componentProps } = this.props; return ( - <ErrorBoundary action="Top Level App"> - <GUIComponent - loading={fetchingProject || this.state.loading || loadingStateVisible} - vm={vm} - {...componentProps} - > - {children} - </GUIComponent> - </ErrorBoundary> + <GUIComponent + loading={fetchingProject || this.state.loading || loadingStateVisible} + vm={vm} + {...componentProps} + > + {children} + </GUIComponent> ); } } @@ -129,7 +127,9 @@ const ConnectedGUI = connect( mapDispatchToProps, )(GUI); -const WrappedGui = ProjectLoaderHOC(vmListenerHOC(ConnectedGUI)); +const WrappedGui = ErrorBoundaryHOC('Top Level App')( + ProjectLoaderHOC(vmListenerHOC(ConnectedGUI)) +); WrappedGui.setAppElement = ReactModal.setAppElement; export default WrappedGui;