From 996ed089082b9817b6d60edeac7c5138ab5596ec Mon Sep 17 00:00:00 2001 From: Evelyn Eastmond Date: Sat, 16 Mar 2019 11:50:16 -0400 Subject: [PATCH 1/8] Adding asset folders, moving files, and renaming some extension library variables. --- .../extensions/{ => boost}/boost-small.svg | 0 .../extensions/{ => boost}/boost.png | Bin .../ev3/ev3-hub-illustration.svg | 0 .../ev3/ev3-small.svg | 0 .../libraries/extensions/{ => ev3}/ev3.png | Bin src/lib/libraries/extensions/index.jsx | 106 ++++++++++-------- .../{ => makeymakey}/makeymakey-small.svg | 0 .../{ => makeymakey}/makeymakey.png | Bin .../microbit/microbit-illustration.svg | 0 .../microbit/microbit-small.svg | 0 .../extensions/{ => microbit}/microbit.png | Bin .../extensions/{ => music}/music-small.svg | 0 .../extensions/{ => music}/music.png | Bin .../extensions/{ => pen}/pen-small.svg | 0 .../libraries/extensions/{ => pen}/pen.png | Bin .../{ => text2speech}/text2speech-small.svg | 0 .../{ => text2speech}/text2speech.png | Bin .../{ => translate}/translate-small.png | Bin .../extensions/{ => translate}/translate.png | Bin .../video-sensing-small.svg | 0 .../{ => videoSensing}/video-sensing.png | Bin .../wedo-button-illustration.svg | 0 .../wedo => wedo2}/wedo-illustration.svg | 0 .../wedo => wedo2}/wedo-small.svg | 0 .../libraries/extensions/{ => wedo2}/wedo.png | Bin 25 files changed, 57 insertions(+), 49 deletions(-) rename src/lib/libraries/extensions/{ => boost}/boost-small.svg (100%) rename src/lib/libraries/extensions/{ => boost}/boost.png (100%) rename src/lib/libraries/extensions/{peripheral-connection => }/ev3/ev3-hub-illustration.svg (100%) rename src/lib/libraries/extensions/{peripheral-connection => }/ev3/ev3-small.svg (100%) rename src/lib/libraries/extensions/{ => ev3}/ev3.png (100%) rename src/lib/libraries/extensions/{ => makeymakey}/makeymakey-small.svg (100%) rename src/lib/libraries/extensions/{ => makeymakey}/makeymakey.png (100%) rename src/lib/libraries/extensions/{peripheral-connection => }/microbit/microbit-illustration.svg (100%) rename src/lib/libraries/extensions/{peripheral-connection => }/microbit/microbit-small.svg (100%) rename src/lib/libraries/extensions/{ => microbit}/microbit.png (100%) rename src/lib/libraries/extensions/{ => music}/music-small.svg (100%) rename src/lib/libraries/extensions/{ => music}/music.png (100%) rename src/lib/libraries/extensions/{ => pen}/pen-small.svg (100%) rename src/lib/libraries/extensions/{ => pen}/pen.png (100%) rename src/lib/libraries/extensions/{ => text2speech}/text2speech-small.svg (100%) rename src/lib/libraries/extensions/{ => text2speech}/text2speech.png (100%) rename src/lib/libraries/extensions/{ => translate}/translate-small.png (100%) rename src/lib/libraries/extensions/{ => translate}/translate.png (100%) rename src/lib/libraries/extensions/{ => videoSensing}/video-sensing-small.svg (100%) rename src/lib/libraries/extensions/{ => videoSensing}/video-sensing.png (100%) rename src/lib/libraries/extensions/{peripheral-connection/wedo => wedo2}/wedo-button-illustration.svg (100%) rename src/lib/libraries/extensions/{peripheral-connection/wedo => wedo2}/wedo-illustration.svg (100%) rename src/lib/libraries/extensions/{peripheral-connection/wedo => wedo2}/wedo-small.svg (100%) rename src/lib/libraries/extensions/{ => wedo2}/wedo.png (100%) diff --git a/src/lib/libraries/extensions/boost-small.svg b/src/lib/libraries/extensions/boost/boost-small.svg similarity index 100% rename from src/lib/libraries/extensions/boost-small.svg rename to src/lib/libraries/extensions/boost/boost-small.svg diff --git a/src/lib/libraries/extensions/boost.png b/src/lib/libraries/extensions/boost/boost.png similarity index 100% rename from src/lib/libraries/extensions/boost.png rename to src/lib/libraries/extensions/boost/boost.png diff --git a/src/lib/libraries/extensions/peripheral-connection/ev3/ev3-hub-illustration.svg b/src/lib/libraries/extensions/ev3/ev3-hub-illustration.svg similarity index 100% rename from src/lib/libraries/extensions/peripheral-connection/ev3/ev3-hub-illustration.svg rename to src/lib/libraries/extensions/ev3/ev3-hub-illustration.svg diff --git a/src/lib/libraries/extensions/peripheral-connection/ev3/ev3-small.svg b/src/lib/libraries/extensions/ev3/ev3-small.svg similarity index 100% rename from src/lib/libraries/extensions/peripheral-connection/ev3/ev3-small.svg rename to src/lib/libraries/extensions/ev3/ev3-small.svg diff --git a/src/lib/libraries/extensions/ev3.png b/src/lib/libraries/extensions/ev3/ev3.png similarity index 100% rename from src/lib/libraries/extensions/ev3.png rename to src/lib/libraries/extensions/ev3/ev3.png diff --git a/src/lib/libraries/extensions/index.jsx b/src/lib/libraries/extensions/index.jsx index 3d1dd6658..406452785 100644 --- a/src/lib/libraries/extensions/index.jsx +++ b/src/lib/libraries/extensions/index.jsx @@ -1,31 +1,39 @@ import React from 'react'; import {FormattedMessage} from 'react-intl'; -import musicImage from './music.png'; -import musicInsetImage from './music-small.svg'; -import penImage from './pen.png'; -import penInsetImage from './pen-small.svg'; -import videoImage from './video-sensing.png'; -import videoInsetImage from './video-sensing-small.svg'; -import translateImage from './translate.png'; -import translateInsetImage from './translate-small.png'; -import microbitImage from './microbit.png'; -import ev3Image from './ev3.png'; -import wedoImage from './wedo.png'; -import text2speechImage from './text2speech.png'; -import text2speechInsetImage from './text2speech-small.svg'; -import makeymakeyImage from './makeymakey.png'; -import makeymakeyInsetImage from './makeymakey-small.svg'; -import boostImage from './boost.png'; -import boostInsetImage from './boost-small.svg'; +import musicIconURL from './music/music.png'; +import musicInsetIconURL from './music/music-small.svg'; -import microbitPeripheralImage from './peripheral-connection/microbit/microbit-illustration.svg'; -import microbitMenuImage from './peripheral-connection/microbit/microbit-small.svg'; -import ev3PeripheralImage from './peripheral-connection/ev3/ev3-hub-illustration.svg'; -import ev3MenuImage from './peripheral-connection/ev3/ev3-small.svg'; -import wedoPeripheralImage from './peripheral-connection/wedo/wedo-illustration.svg'; -import wedoMenuImage from './peripheral-connection/wedo/wedo-small.svg'; -import wedoButtonImage from './peripheral-connection/wedo/wedo-button-illustration.svg'; +import penIconURL from './pen/pen.png'; +import penInsetIconURL from './pen/pen-small.svg'; + +import videoSensingIconURL from './videoSensing/video-sensing.png'; +import videoSensingInsetIconURL from './videoSensing/video-sensing-small.svg'; + +import text2speechIconURL from './text2speech/text2speech.png'; +import text2speechInsetIconURL from './text2speech/text2speech-small.svg'; + +import translateIconURL from './translate/translate.png'; +import translateInsetIconURL from './translate/translate-small.png'; + +import makeymakeyIconURL from './makeymakey/makeymakey.png'; +import makeymakeyInsetIconURL from './makeymakey/makeymakey-small.svg'; + +import microbitIconURL from './microbit/microbit.png'; +import microbitInsetIconURL from './microbit/microbit-small.svg'; +import microbitPeripheralImage from './microbit/microbit-illustration.svg'; + +import ev3IconURL from './ev3/ev3.png'; +import ev3InsetIconURL from './ev3/ev3-small.svg'; +import ev3PeripheralImage from './ev3/ev3-hub-illustration.svg'; + +import wedo2IconURL from './wedo2/wedo.png'; +import wedo2InsetIconURL from './wedo2/wedo-small.svg'; +import wedo2PeripheralImage from './wedo2/wedo-illustration.svg'; +import wedo2ButtonImage from './wedo2/wedo-button-illustration.svg'; + +import boostIconURL from './boost/boost.png'; +import boostInsetIconURL from './boost/boost-small.svg'; export default [ { @@ -37,8 +45,8 @@ export default [ /> ), extensionId: 'music', - iconURL: musicImage, - insetIconURL: musicInsetImage, + iconURL: musicIconURL, + insetIconURL: musicInsetIconURL, description: ( ), extensionId: 'pen', - iconURL: penImage, - insetIconURL: penInsetImage, + iconURL: penIconURL, + insetIconURL: penInsetIconURL, description: ( ), extensionId: 'videoSensing', - iconURL: videoImage, - insetIconURL: videoInsetImage, + iconURL: videoSensingIconURL, + insetIconURL: videoSensingInsetIconURL, description: ( Date: Sat, 16 Mar 2019 11:55:11 -0400 Subject: [PATCH 2/8] Renaming some more variables in the extensions library index file. --- src/lib/libraries/extensions/index.jsx | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/lib/libraries/extensions/index.jsx b/src/lib/libraries/extensions/index.jsx index 406452785..2789d0641 100644 --- a/src/lib/libraries/extensions/index.jsx +++ b/src/lib/libraries/extensions/index.jsx @@ -22,15 +22,18 @@ import makeymakeyInsetIconURL from './makeymakey/makeymakey-small.svg'; import microbitIconURL from './microbit/microbit.png'; import microbitInsetIconURL from './microbit/microbit-small.svg'; import microbitPeripheralImage from './microbit/microbit-illustration.svg'; +import microbitSmallPeripheralImage from './microbit/microbit-small.svg'; import ev3IconURL from './ev3/ev3.png'; import ev3InsetIconURL from './ev3/ev3-small.svg'; import ev3PeripheralImage from './ev3/ev3-hub-illustration.svg'; +import ev3SmallPeripheralImage from './ev3/ev3-small.svg'; import wedo2IconURL from './wedo2/wedo.png'; import wedo2InsetIconURL from './wedo2/wedo-small.svg'; import wedo2PeripheralImage from './wedo2/wedo-illustration.svg'; -import wedo2ButtonImage from './wedo2/wedo-button-illustration.svg'; +import wedo2SmallPeripheralImage from './wedo2/wedo-small.svg'; +import wedo2PeripheralButtonImage from './wedo2/wedo-button-illustration.svg'; import boostIconURL from './boost/boost.png'; import boostInsetIconURL from './boost/boost-small.svg'; @@ -175,7 +178,7 @@ export default [ launchPeripheralConnectionFlow: true, useAutoScan: false, peripheralImage: microbitPeripheralImage, - smallPeripheralImage: microbitInsetIconURL, + smallPeripheralImage: microbitSmallPeripheralImage, connectingMessage: ( Date: Sat, 16 Mar 2019 12:05:50 -0400 Subject: [PATCH 3/8] Adding some comments for possible variable name changes. --- src/lib/libraries/extensions/index.jsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/libraries/extensions/index.jsx b/src/lib/libraries/extensions/index.jsx index 2789d0641..244b9256e 100644 --- a/src/lib/libraries/extensions/index.jsx +++ b/src/lib/libraries/extensions/index.jsx @@ -237,9 +237,9 @@ export default [ internetConnectionRequired: true, launchPeripheralConnectionFlow: true, useAutoScan: true, - peripheralImage: wedo2PeripheralImage, - smallPeripheralImage: wedo2SmallPeripheralImage, - peripheralButtonImage: wedo2PeripheralButtonImage, + peripheralImage: wedo2PeripheralImage, // TODO: Rename connectionIconURL ?? + smallPeripheralImage: wedo2SmallPeripheralImage, // TODO: Rename connectionSmallIconURL ?? + peripheralButtonImage: wedo2PeripheralButtonImage, // TODO: Rename connectionInstructionIconURL ?? connectingMessage: ( Date: Sat, 16 Mar 2019 12:11:28 -0400 Subject: [PATCH 4/8] Adding TODO comments for some file renaming suggestions. --- src/lib/libraries/extensions/index.jsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib/libraries/extensions/index.jsx b/src/lib/libraries/extensions/index.jsx index 244b9256e..f980bdf77 100644 --- a/src/lib/libraries/extensions/index.jsx +++ b/src/lib/libraries/extensions/index.jsx @@ -29,11 +29,11 @@ import ev3InsetIconURL from './ev3/ev3-small.svg'; import ev3PeripheralImage from './ev3/ev3-hub-illustration.svg'; import ev3SmallPeripheralImage from './ev3/ev3-small.svg'; -import wedo2IconURL from './wedo2/wedo.png'; -import wedo2InsetIconURL from './wedo2/wedo-small.svg'; -import wedo2PeripheralImage from './wedo2/wedo-illustration.svg'; -import wedo2SmallPeripheralImage from './wedo2/wedo-small.svg'; -import wedo2PeripheralButtonImage from './wedo2/wedo-button-illustration.svg'; +import wedo2IconURL from './wedo2/wedo.png'; // TODO: Rename wedo2Icon.png ?? +import wedo2InsetIconURL from './wedo2/wedo-small.svg'; // TODO: Rename wedo2InsetIcon.png ?? +import wedo2PeripheralImage from './wedo2/wedo-illustration.svg'; // TODO: Rename wedo2ConnectionIcon.png ?? +import wedo2SmallPeripheralImage from './wedo2/wedo-small.svg'; // TODO: Rename wedo2ConnectionSmallIcon.png ?? +import wedo2PeripheralButtonImage from './wedo2/wedo-button-illustration.svg'; // TODO: Rename wedo2ConnectionInstructionIcon.png ?? import boostIconURL from './boost/boost.png'; import boostInsetIconURL from './boost/boost-small.svg'; From a082d8329e4c27019178ba1e8718304db9349cbc Mon Sep 17 00:00:00 2001 From: Evelyn Eastmond Date: Mon, 18 Mar 2019 14:44:26 -0400 Subject: [PATCH 5/8] Adding speech2text folder for extension library. --- .../extensions/{ => speech2text}/speech.png | Bin 1 file changed, 0 insertions(+), 0 deletions(-) rename src/lib/libraries/extensions/{ => speech2text}/speech.png (100%) diff --git a/src/lib/libraries/extensions/speech.png b/src/lib/libraries/extensions/speech2text/speech.png similarity index 100% rename from src/lib/libraries/extensions/speech.png rename to src/lib/libraries/extensions/speech2text/speech.png From a74bb9afc7966dbc75b97e26f803e386f37ec1fb Mon Sep 17 00:00:00 2001 From: Evelyn Eastmond Date: Mon, 18 Mar 2019 14:50:49 -0400 Subject: [PATCH 6/8] Renaming more variable names related to connection modal properties. --- src/lib/libraries/extensions/index.jsx | 32 +++++++++++++------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/lib/libraries/extensions/index.jsx b/src/lib/libraries/extensions/index.jsx index f980bdf77..7dc1256c2 100644 --- a/src/lib/libraries/extensions/index.jsx +++ b/src/lib/libraries/extensions/index.jsx @@ -21,19 +21,19 @@ import makeymakeyInsetIconURL from './makeymakey/makeymakey-small.svg'; import microbitIconURL from './microbit/microbit.png'; import microbitInsetIconURL from './microbit/microbit-small.svg'; -import microbitPeripheralImage from './microbit/microbit-illustration.svg'; -import microbitSmallPeripheralImage from './microbit/microbit-small.svg'; +import microbitConnectionIconURL from './microbit/microbit-illustration.svg'; +import microbitConnectionSmallIconURL from './microbit/microbit-small.svg'; import ev3IconURL from './ev3/ev3.png'; import ev3InsetIconURL from './ev3/ev3-small.svg'; -import ev3PeripheralImage from './ev3/ev3-hub-illustration.svg'; -import ev3SmallPeripheralImage from './ev3/ev3-small.svg'; +import ev3ConnectionIconURL from './ev3/ev3-hub-illustration.svg'; +import ev3ConnectionSmallIconURL from './ev3/ev3-small.svg'; -import wedo2IconURL from './wedo2/wedo.png'; // TODO: Rename wedo2Icon.png ?? -import wedo2InsetIconURL from './wedo2/wedo-small.svg'; // TODO: Rename wedo2InsetIcon.png ?? -import wedo2PeripheralImage from './wedo2/wedo-illustration.svg'; // TODO: Rename wedo2ConnectionIcon.png ?? -import wedo2SmallPeripheralImage from './wedo2/wedo-small.svg'; // TODO: Rename wedo2ConnectionSmallIcon.png ?? -import wedo2PeripheralButtonImage from './wedo2/wedo-button-illustration.svg'; // TODO: Rename wedo2ConnectionInstructionIcon.png ?? +import wedo2IconURL from './wedo2/wedo.png'; // TODO: Rename file names to match variable/prop names? +import wedo2InsetIconURL from './wedo2/wedo-small.svg'; +import wedo2ConnectionIconURL from './wedo2/wedo-illustration.svg'; +import wedo2ConnectionSmallIconURL from './wedo2/wedo-small.svg'; +import wedo2ConnectionTipIconURL from './wedo2/wedo-button-illustration.svg'; import boostIconURL from './boost/boost.png'; import boostInsetIconURL from './boost/boost-small.svg'; @@ -177,8 +177,8 @@ export default [ internetConnectionRequired: true, launchPeripheralConnectionFlow: true, useAutoScan: false, - peripheralImage: microbitPeripheralImage, - smallPeripheralImage: microbitSmallPeripheralImage, + peripheralImage: microbitConnectionIconURL, + smallPeripheralImage: microbitConnectionSmallIconURL, connectingMessage: ( Date: Mon, 18 Mar 2019 14:58:32 -0400 Subject: [PATCH 7/8] Changing prop names throughout React chain to reflect new extension library property names. --- src/components/connection-modal/connected-step.jsx | 6 +++--- .../connection-modal/connecting-step.jsx | 6 +++--- .../connection-modal/connection-modal.jsx | 4 ++-- src/components/connection-modal/error-step.jsx | 6 +++--- .../connection-modal/peripheral-tile.jsx | 6 +++--- src/components/connection-modal/scanning-step.jsx | 6 +++--- src/containers/connection-modal.jsx | 4 ++-- src/containers/scanning-step.jsx | 4 ++-- src/lib/libraries/extensions/index.jsx | 14 +++++++------- src/reducers/alerts.js | 2 +- 10 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/components/connection-modal/connected-step.jsx b/src/components/connection-modal/connected-step.jsx index f71b3556e..c54dc2a0d 100644 --- a/src/components/connection-modal/connected-step.jsx +++ b/src/components/connection-modal/connected-step.jsx @@ -15,7 +15,7 @@ const ConnectedStep = props => (
( ); ConnectedStep.propTypes = { + connectionIconURL: PropTypes.string.isRequired, onCancel: PropTypes.func, - onDisconnect: PropTypes.func, - peripheralImage: PropTypes.string.isRequired + onDisconnect: PropTypes.func }; export default ConnectedStep; diff --git a/src/components/connection-modal/connecting-step.jsx b/src/components/connection-modal/connecting-step.jsx index e4821d001..30ad53532 100644 --- a/src/components/connection-modal/connecting-step.jsx +++ b/src/components/connection-modal/connecting-step.jsx @@ -18,7 +18,7 @@ const ConnectingStep = props => (
( ConnectingStep.propTypes = { connectingMessage: PropTypes.node.isRequired, - onDisconnect: PropTypes.func, - peripheralImage: PropTypes.string.isRequired + connectionIconURL: PropTypes.string.isRequired, + onDisconnect: PropTypes.func }; export default ConnectingStep; diff --git a/src/components/connection-modal/connection-modal.jsx b/src/components/connection-modal/connection-modal.jsx index 8631ab2ac..cd16d129b 100644 --- a/src/components/connection-modal/connection-modal.jsx +++ b/src/components/connection-modal/connection-modal.jsx @@ -27,7 +27,7 @@ const ConnectionModalComponent = props => ( className={styles.modalContent} contentLabel={props.name} headerClassName={styles.header} - headerImage={props.smallPeripheralImage} + headerImage={props.connectionSmallIconURL} id="connectionModal" onHelp={props.onHelp} onRequestClose={props.onCancel} @@ -45,12 +45,12 @@ const ConnectionModalComponent = props => ( ConnectionModalComponent.propTypes = { connectingMessage: PropTypes.node, + connectionSmallIconURL: PropTypes.string, name: PropTypes.node, onCancel: PropTypes.func.isRequired, onHelp: PropTypes.func.isRequired, peripheralButtonImage: PropTypes.string, phase: PropTypes.oneOf(Object.keys(PHASES)).isRequired, - smallPeripheralImage: PropTypes.string, title: PropTypes.string.isRequired, useAutoScan: PropTypes.bool.isRequired }; diff --git a/src/components/connection-modal/error-step.jsx b/src/components/connection-modal/error-step.jsx index e0344c876..f91cb537e 100644 --- a/src/components/connection-modal/error-step.jsx +++ b/src/components/connection-modal/error-step.jsx @@ -17,7 +17,7 @@ const ErrorStep = props => (
@@ -70,9 +70,9 @@ const ErrorStep = props => ( ); ErrorStep.propTypes = { + connectionIconURL: PropTypes.string.isRequired, onHelp: PropTypes.func, - onScanning: PropTypes.func, - peripheralImage: PropTypes.string.isRequired + onScanning: PropTypes.func }; export default ErrorStep; diff --git a/src/components/connection-modal/peripheral-tile.jsx b/src/components/connection-modal/peripheral-tile.jsx index 6b7e0388d..cd4a36635 100644 --- a/src/components/connection-modal/peripheral-tile.jsx +++ b/src/components/connection-modal/peripheral-tile.jsx @@ -23,7 +23,7 @@ class PeripheralTile extends React.Component { @@ -77,11 +77,11 @@ class PeripheralTile extends React.Component { } PeripheralTile.propTypes = { + connectionSmallIconURL: PropTypes.string, name: PropTypes.string, onConnecting: PropTypes.func, peripheralId: PropTypes.string, - rssi: PropTypes.number, - smallPeripheralImage: PropTypes.string + rssi: PropTypes.number }; export default PeripheralTile; diff --git a/src/components/connection-modal/scanning-step.jsx b/src/components/connection-modal/scanning-step.jsx index 88ba67271..cf637ec22 100644 --- a/src/components/connection-modal/scanning-step.jsx +++ b/src/components/connection-modal/scanning-step.jsx @@ -34,11 +34,11 @@ const ScanningStep = props => (
{props.peripheralList.map(peripheral => () )} @@ -86,6 +86,7 @@ const ScanningStep = props => ( ); ScanningStep.propTypes = { + connectionSmallIconURL: PropTypes.string, onConnecting: PropTypes.func, onRefresh: PropTypes.func, peripheralList: PropTypes.arrayOf(PropTypes.shape({ @@ -93,8 +94,7 @@ ScanningStep.propTypes = { rssi: PropTypes.number, peripheralId: PropTypes.string })), - scanning: PropTypes.bool.isRequired, - smallPeripheralImage: PropTypes.string + scanning: PropTypes.bool.isRequired }; ScanningStep.defaultProps = { diff --git a/src/containers/connection-modal.jsx b/src/containers/connection-modal.jsx index c0eb38b77..e604dc877 100644 --- a/src/containers/connection-modal.jsx +++ b/src/containers/connection-modal.jsx @@ -108,12 +108,12 @@ class ConnectionModal extends React.Component { return ( Date: Mon, 18 Mar 2019 15:04:12 -0400 Subject: [PATCH 8/8] Changing React property name for connection tip icon throughout. --- src/components/connection-modal/auto-scanning-step.jsx | 6 +++--- src/components/connection-modal/connection-modal.css | 2 +- src/components/connection-modal/connection-modal.jsx | 2 +- src/containers/auto-scanning-step.jsx | 4 ++-- src/containers/connection-modal.jsx | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/components/connection-modal/auto-scanning-step.jsx b/src/components/connection-modal/auto-scanning-step.jsx index b6f0dd813..272b267a8 100644 --- a/src/components/connection-modal/auto-scanning-step.jsx +++ b/src/components/connection-modal/auto-scanning-step.jsx @@ -45,8 +45,8 @@ const AutoScanningStep = props => ( src={radarIcon} /> )} @@ -142,9 +142,9 @@ const AutoScanningStep = props => ( ); AutoScanningStep.propTypes = { + connectionTipIconURL: PropTypes.string, onRefresh: PropTypes.func, onStartScan: PropTypes.func, - peripheralButtonImage: PropTypes.string, phase: PropTypes.oneOf(Object.keys(PHASES)) }; diff --git a/src/components/connection-modal/connection-modal.css b/src/components/connection-modal/connection-modal.css index 27c970b93..fde45e015 100644 --- a/src/components/connection-modal/connection-modal.css +++ b/src/components/connection-modal/connection-modal.css @@ -162,7 +162,7 @@ height: 80px; */ } -.peripheral-button-image { +.connection-tip-icon { position: absolute; } diff --git a/src/components/connection-modal/connection-modal.jsx b/src/components/connection-modal/connection-modal.jsx index cd16d129b..1d982402b 100644 --- a/src/components/connection-modal/connection-modal.jsx +++ b/src/components/connection-modal/connection-modal.jsx @@ -46,10 +46,10 @@ const ConnectionModalComponent = props => ( ConnectionModalComponent.propTypes = { connectingMessage: PropTypes.node, connectionSmallIconURL: PropTypes.string, + connectionTipIconURL: PropTypes.string, name: PropTypes.node, onCancel: PropTypes.func.isRequired, onHelp: PropTypes.func.isRequired, - peripheralButtonImage: PropTypes.string, phase: PropTypes.oneOf(Object.keys(PHASES)).isRequired, title: PropTypes.string.isRequired, useAutoScan: PropTypes.bool.isRequired diff --git a/src/containers/auto-scanning-step.jsx b/src/containers/auto-scanning-step.jsx index f67473841..fc067abae 100644 --- a/src/containers/auto-scanning-step.jsx +++ b/src/containers/auto-scanning-step.jsx @@ -67,7 +67,7 @@ class AutoScanningStep extends React.Component { render () { return (