Skip to content
Snippets Groups Projects
Commit dffc0d54 authored by Eric Rosenbaum's avatar Eric Rosenbaum
Browse files

Use useAutoScan prop instead of useDeviceList

parent 6e5cb755
Branches
Tags
No related merge requests found
......@@ -32,8 +32,8 @@ const ConnectionModalComponent = props => (
onRequestClose={props.onCancel}
>
<Box className={styles.body}>
{props.phase === PHASES.scanning && props.useDeviceList && <ScanningStep {...props} />}
{props.phase === PHASES.scanning && !props.useDeviceList && <AutoScanningStep {...props} />}
{props.phase === PHASES.scanning && !props.useAutoScan && <ScanningStep {...props} />}
{props.phase === PHASES.scanning && props.useAutoScan && <AutoScanningStep {...props} />}
{props.phase === PHASES.connecting && <ConnectingStep {...props} />}
{props.phase === PHASES.connected && <ConnectedStep {...props} />}
{props.phase === PHASES.error && <ErrorStep {...props} />}
......@@ -51,7 +51,7 @@ ConnectionModalComponent.propTypes = {
phase: PropTypes.oneOf(Object.keys(PHASES)).isRequired,
smallDeviceImage: PropTypes.string,
title: PropTypes.string.isRequired,
useDeviceList: PropTypes.bool.isRequired
useAutoScan: PropTypes.bool.isRequired
};
export {
......
......@@ -364,7 +364,7 @@ class Blocks extends React.Component {
if (extension) {
this.setState({connectionModal: {
extensionId: extensionId,
useDeviceList: extension.useDeviceList,
useAutoScan: extension.useAutoScan,
deviceImage: extension.deviceImage,
smallDeviceImage: extension.smallDeviceImage,
deviceButtonImage: extension.deviceButtonImage,
......
......@@ -90,7 +90,7 @@ class ConnectionModal extends React.Component {
phase={this.state.phase}
smallDeviceImage={this.props.smallDeviceImage}
title={this.props.extensionId}
useDeviceList={this.props.useDeviceList}
useAutoScan={this.props.useAutoScan}
vm={this.props.vm}
onCancel={this.props.onCancel}
onConnected={this.handleConnected}
......@@ -113,7 +113,7 @@ ConnectionModal.propTypes = {
onCancel: PropTypes.func.isRequired,
onStatusButtonUpdate: PropTypes.func.isRequired,
smallDeviceImage: PropTypes.string.isRequired,
useDeviceList: PropTypes.bool.isRequired,
useAutoScan: PropTypes.bool.isRequired,
vm: PropTypes.instanceOf(VM).isRequired
};
......
......@@ -108,7 +108,7 @@ export default [
featured: true,
disabled: false,
launchDeviceConnectionFlow: true,
useDeviceList: true,
useAutoScan: false,
deviceImage: microbitDeviceImage,
smallDeviceImage: microbitMenuImage,
connectingMessage: (
......@@ -134,7 +134,7 @@ export default [
featured: true,
disabled: false,
launchDeviceConnectionFlow: true,
useDeviceList: true,
useAutoScan: false,
deviceImage: ev3DeviceImage,
smallDeviceImage: ev3MenuImage,
connectingMessage: (
......@@ -160,7 +160,7 @@ export default [
featured: true,
disabled: true,
launchDeviceConnectionFlow: true,
useDeviceList: false,
useAutoScan: true,
deviceImage: wedoDeviceImage,
smallDeviceImage: wedoMenuImage,
deviceButtonImage: wedoButtonImage,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment