From 221bf1cc7588d65befccec12c168849ed041f7c9 Mon Sep 17 00:00:00 2001 From: Benny Wong Date: Fri, 26 Apr 2019 03:37:28 -0700 Subject: [PATCH] Fix error message when switching between device and simulator Summary: Currently, you get an error when you don't have device utils installed. However, when you switch your flipper to a supported device, the error may not be cleared. This handles that case. Reviewed By: jknoxville Differential Revision: D15087620 fbshipit-source-id: 6060752b54161c7610656531d053ecbcdd9e978a --- src/reducers/connections.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/reducers/connections.js b/src/reducers/connections.js index 55076ed25..d035b09be 100644 --- a/src/reducers/connections.js +++ b/src/reducers/connections.js @@ -341,14 +341,19 @@ export default (state: State = INITAL_STATE, action: Action): State => { if (nextState.selectedDevice) { const {selectedDevice} = nextState; + const deviceNotSupportedError = 'iOS Devices are not yet supported'; const error = selectedDevice.os === 'iOS' && selectedDevice.deviceType === 'physical' && !iosUtil.isAvailable() - ? 'iOS Devices are not yet supported' + ? deviceNotSupportedError : null; - nextState.error = error || nextState.error; + if (nextState.error === deviceNotSupportedError) { + nextState.error = error; + } else { + nextState.error = error || nextState.error; + } } return nextState; };