Prevent crash on load hardware ext without assets

This commit is contained in:
Eric Rosenbaum committed 2019-03-26 15:59:03 -04:00
1 parent c9a989bfab
commit 4fab686aea
2 files changed
+11 -7

No files matched your search

@@ -44,7 +44,7 @@ const ConnectionModalComponent = props => (
);
ConnectionModalComponent.propTypes = {
connectingMessage: PropTypes.node,
connectingMessage: PropTypes.node.isRequired,
connectionSmallIconURL: PropTypes.string,
connectionTipIconURL: PropTypes.string,
name: PropTypes.node,
@@ -55,6 +55,10 @@ ConnectionModalComponent.propTypes = {
useAutoScan: PropTypes.bool.isRequired
};
ConnectionModalComponent.defaultProps = {
connectingMessage: 'Connecting'
};
export {
ConnectionModalComponent as default,
PHASES
+6 -6
View File
@@ -107,15 +107,15 @@ class ConnectionModal extends React.Component {
render () {
return (
<ConnectionModalComponent
connectingMessage={this.state.extension.connectingMessage}
connectionIconURL={this.state.extension.connectionIconURL}
connectionSmallIconURL={this.state.extension.connectionSmallIconURL}
connectionTipIconURL={this.state.extension.connectionTipIconURL}
connectingMessage={this.state.extension && this.state.extension.connectingMessage}
connectionIconURL={this.state.extension && this.state.extension.connectionIconURL}
connectionSmallIconURL={this.state.extension && this.state.extension.connectionSmallIconURL}
connectionTipIconURL={this.state.extension && this.state.extension.connectionTipIconURL}
extensionId={this.props.extensionId}
name={this.state.extension.name}
name={this.state.extension && this.state.extension.name}
phase={this.state.phase}
title={this.props.extensionId}
useAutoScan={this.state.extension.useAutoScan}
useAutoScan={this.state.extension && this.state.extension.useAutoScan}
vm={this.props.vm}
onCancel={this.handleCancel}
onConnected={this.handleConnected}