From dffc0d5491e00a2a3266a7176ede31b1725daba3 Mon Sep 17 00:00:00 2001
From: Eric Rosenbaum <eric.rosenbaum@gmail.com>
Date: Thu, 9 Aug 2018 12:06:16 -0400
Subject: [PATCH] Use useAutoScan prop instead of useDeviceList

---
 src/components/connection-modal/connection-modal.jsx | 6 +++---
 src/containers/blocks.jsx                            | 2 +-
 src/containers/connection-modal.jsx                  | 4 ++--
 src/lib/libraries/extensions/index.jsx               | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/components/connection-modal/connection-modal.jsx b/src/components/connection-modal/connection-modal.jsx
index f26e3f5ad..577bcd2f7 100644
--- a/src/components/connection-modal/connection-modal.jsx
+++ b/src/components/connection-modal/connection-modal.jsx
@@ -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 {
diff --git a/src/containers/blocks.jsx b/src/containers/blocks.jsx
index 0868e5eb3..d5dcc5400 100644
--- a/src/containers/blocks.jsx
+++ b/src/containers/blocks.jsx
@@ -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,
diff --git a/src/containers/connection-modal.jsx b/src/containers/connection-modal.jsx
index 4d472e10b..90017c047 100644
--- a/src/containers/connection-modal.jsx
+++ b/src/containers/connection-modal.jsx
@@ -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
 };
 
diff --git a/src/lib/libraries/extensions/index.jsx b/src/lib/libraries/extensions/index.jsx
index a152d7110..0bd3b36ee 100644
--- a/src/lib/libraries/extensions/index.jsx
+++ b/src/lib/libraries/extensions/index.jsx
@@ -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,