diff --git a/headless/index.js b/headless/index.js
index ffcfaadd7..ae10e7fed 100644
--- a/headless/index.js
+++ b/headless/index.js
@@ -23,7 +23,7 @@ import setup from '../static/setup.js';
 import type {Store} from '../src/reducers';
 import {getPersistentPlugins} from '../src/utils/pluginUtils.js';
 import {serialize} from '../src/utils/serialization';
-import type BaseDevice from '../src/devices/BaseDevice';
+import type BaseDevice from '../src/devices/BaseDevice.tsx';
 
 import {getStringFromErrorLike} from '../src/utils/index';
 
diff --git a/src/App.js b/src/App.js
index 3a3d194e7..c5877d70e 100644
--- a/src/App.js
+++ b/src/App.js
@@ -34,7 +34,7 @@ import {
 import type {ShareType} from './reducers/application.js';
 import type {Logger} from './fb-interfaces/Logger.js';
 import type BugReporter from './fb-stubs/BugReporter.js';
-import type BaseDevice from './devices/BaseDevice.js';
+import type BaseDevice from './devices/BaseDevice.tsx';
 import type {ActiveSheet} from './reducers/application.js';
 const version = remote.app.getVersion();
 
diff --git a/src/Client.js b/src/Client.js
index db0120b23..d28d17274 100644
--- a/src/Client.js
+++ b/src/Client.js
@@ -6,11 +6,11 @@
  */
 
 import type {FlipperPlugin, FlipperBasePlugin} from './plugin.js';
-import type BaseDevice from './devices/BaseDevice.js';
+import type BaseDevice from './devices/BaseDevice.tsx';
 import type {App} from './App.js';
 import type {Logger} from './fb-interfaces/Logger.js';
 import type {Store} from './reducers/index.js';
-import type {OS} from './devices/BaseDevice.js';
+import type {OS} from './devices/BaseDevice.tsx';
 import {FlipperDevicePlugin} from './plugin.js';
 import {setPluginState} from './reducers/pluginStates.js';
 import {ReactiveSocket, PartialResponder} from 'rsocket-core';
diff --git a/src/PluginContainer.js b/src/PluginContainer.js
index b47ba23b9..2eefc9e66 100644
--- a/src/PluginContainer.js
+++ b/src/PluginContainer.js
@@ -6,7 +6,7 @@
  */
 import type {FlipperPlugin, FlipperDevicePlugin} from './plugin.js';
 import type {Logger} from './fb-interfaces/Logger';
-import BaseDevice from './devices/BaseDevice.js';
+import BaseDevice from './devices/BaseDevice.tsx';
 import type {Props as PluginProps} from './plugin';
 import {pluginKey as getPluginKey} from './reducers/pluginStates';
 import Client from './Client.js';
diff --git a/src/chrome/DevicesButton.js b/src/chrome/DevicesButton.js
index 0a4e0b62d..0e36996be 100644
--- a/src/chrome/DevicesButton.js
+++ b/src/chrome/DevicesButton.js
@@ -14,7 +14,7 @@ import {default as which} from 'which';
 import {promisify} from 'util';
 import {showOpenDialog} from '../utils/exportData';
 import PropTypes from 'prop-types';
-import type BaseDevice from '../devices/BaseDevice.js';
+import type BaseDevice from '../devices/BaseDevice.tsx';
 
 const whichPromise = promisify(which);
 
diff --git a/src/chrome/LocationsButton.js b/src/chrome/LocationsButton.js
index 4834091df..3ce18a2b7 100644
--- a/src/chrome/LocationsButton.js
+++ b/src/chrome/LocationsButton.js
@@ -8,7 +8,7 @@
 import {Button, Component, styled} from 'flipper';
 import {connect} from 'react-redux';
 
-import type BaseDevice from '../devices/BaseDevice';
+import type BaseDevice from '../devices/BaseDevice.tsx';
 import AndroidDevice from '../devices/AndroidDevice';
 
 type OwnProps = {|
diff --git a/src/chrome/MainSidebar.js b/src/chrome/MainSidebar.js
index 33014e432..223198459 100644
--- a/src/chrome/MainSidebar.js
+++ b/src/chrome/MainSidebar.js
@@ -7,7 +7,7 @@
 
 import {FlipperBasePlugin} from '../plugin.js';
 import config from '../fb-stubs/config';
-import type BaseDevice from '../devices/BaseDevice.js';
+import type BaseDevice from '../devices/BaseDevice.tsx';
 import type Client from '../Client.js';
 import type {UninitializedClient} from '../UninitializedClient.js';
 import type {PluginNotification} from '../reducers/notifications';
diff --git a/src/chrome/ScreenCaptureButtons.js b/src/chrome/ScreenCaptureButtons.js
index 68f5cd8d9..f1adc2c19 100644
--- a/src/chrome/ScreenCaptureButtons.js
+++ b/src/chrome/ScreenCaptureButtons.js
@@ -18,7 +18,7 @@ import {remote} from 'electron';
 import path from 'path';
 import {reportPlatformFailures} from '../utils/metrics';
 import config from '../utils/processConfig';
-import type BaseDevice from '../devices/BaseDevice';
+import type BaseDevice from '../devices/BaseDevice.tsx';
 
 const CAPTURE_LOCATION = expandTilde(
   config().screenCapturePath || remote.app.getPath('desktop'),
diff --git a/src/devices/AndroidDevice.js b/src/devices/AndroidDevice.js
index 9db48fedc..174854784 100644
--- a/src/devices/AndroidDevice.js
+++ b/src/devices/AndroidDevice.js
@@ -5,12 +5,12 @@
  * @format
  */
 
-import type {DeviceType, DeviceShell} from './BaseDevice.js';
+import type {DeviceType, DeviceShell} from './BaseDevice.tsx';
 
 import {Priority} from 'adbkit-logcat-fb';
 import child_process from 'child_process';
 import child_process_promise from 'child-process-es6-promise';
-import BaseDevice from './BaseDevice.js';
+import BaseDevice from './BaseDevice.tsx';
 import ArchivedDevice from './ArchivedDevice.js';
 
 type ADBClient = any;
diff --git a/src/devices/ArchivedDevice.js b/src/devices/ArchivedDevice.js
index 0c82316c4..44d6798a9 100644
--- a/src/devices/ArchivedDevice.js
+++ b/src/devices/ArchivedDevice.js
@@ -4,13 +4,13 @@
  * LICENSE file in the root directory of this source tree.
  * @format
  */
-import BaseDevice from './BaseDevice.js';
+import BaseDevice from './BaseDevice.tsx';
 import type {
   DeviceType,
   OS,
   DeviceShell,
   DeviceLogEntry,
-} from './BaseDevice.js';
+} from './BaseDevice.tsx';
 
 export default class ArchivedDevice extends BaseDevice {
   constructor(
diff --git a/src/devices/BaseDevice.js b/src/devices/BaseDevice.tsx
similarity index 92%
rename from src/devices/BaseDevice.js
rename to src/devices/BaseDevice.tsx
index 928270611..68826d5df 100644
--- a/src/devices/BaseDevice.js
+++ b/src/devices/BaseDevice.tsx
@@ -5,8 +5,7 @@
  * @format
  */
 
-import type stream from 'stream';
-import type ArchivedDevice from './ArchivedDevice';
+import stream from 'stream';
 
 export type LogLevel =
   | 'unknown'
@@ -17,7 +16,7 @@ export type LogLevel =
   | 'error'
   | 'fatal';
 
-export type DeviceLogEntry = {|
+export type DeviceLogEntry = {
   date: Date,
   pid: number,
   tid: number,
@@ -25,7 +24,7 @@ export type DeviceLogEntry = {|
   type: LogLevel,
   tag: string,
   message: string,
-|};
+};
 
 export type DeviceShell = {
   stdout: stream.Readable,
@@ -41,13 +40,13 @@ export type DeviceType =
   | 'archivedEmulator'
   | 'archivedPhysical';
 
-export type DeviceExport = {|
+export type DeviceExport = {
   os: string,
   title: string,
   deviceType: DeviceType,
   serial: string,
   logs: Array<DeviceLogEntry>,
-|};
+};
 
 export type OS = 'iOS' | 'Android' | 'Windows' | 'MacOS';
 
@@ -71,7 +70,7 @@ export default class BaseDevice {
   serial: string;
 
   // possible src of icon to display next to the device title
-  icon: ?string;
+  icon: string | null | undefined;
 
   logListeners: Map<Symbol, DeviceLogListener> = new Map();
   logEntries: Array<DeviceLogEntry> = [];
@@ -135,7 +134,7 @@ export default class BaseDevice {
     this.logListeners.delete(id);
   }
 
-  spawnShell(): ?DeviceShell {
+  spawnShell(): DeviceShell | null | undefined {
     throw new Error('unimplemented');
   }
 
@@ -143,7 +142,7 @@ export default class BaseDevice {
     throw new Error('unimplemented');
   }
 
-  archive(): ?ArchivedDevice {
+  archive(): any | null | undefined {
     return null;
   }
 }
diff --git a/src/devices/IOSDevice.js b/src/devices/IOSDevice.js
index c1fd86efb..34f21379c 100644
--- a/src/devices/IOSDevice.js
+++ b/src/devices/IOSDevice.js
@@ -5,9 +5,9 @@
  * @format
  */
 
-import type {DeviceType, LogLevel, DeviceLogEntry} from './BaseDevice.js';
+import type {DeviceType, LogLevel, DeviceLogEntry} from './BaseDevice.tsx';
 import child_process from 'child_process';
-import BaseDevice from './BaseDevice.js';
+import BaseDevice from './BaseDevice.tsx';
 import JSONStream from 'JSONStream';
 import {Transform} from 'stream';
 
diff --git a/src/devices/MacDevice.js b/src/devices/MacDevice.js
index ba7e55200..dc8d4a8b4 100644
--- a/src/devices/MacDevice.js
+++ b/src/devices/MacDevice.js
@@ -5,7 +5,7 @@
  * @format
  */
 
-import BaseDevice from './BaseDevice.js';
+import BaseDevice from './BaseDevice.tsx';
 
 export default class MacDevice extends BaseDevice {
   os = 'MacOS';
diff --git a/src/devices/WindowsDevice.js b/src/devices/WindowsDevice.js
index 1d9e20507..b909899da 100644
--- a/src/devices/WindowsDevice.js
+++ b/src/devices/WindowsDevice.js
@@ -5,7 +5,7 @@
  * @format
  */
 
-import BaseDevice from './BaseDevice.js';
+import BaseDevice from './BaseDevice.tsx';
 
 export default class WindowsDevice extends BaseDevice {
   os = 'Windows';
diff --git a/src/dispatcher/androidDevice.js b/src/dispatcher/androidDevice.js
index 64b3c65d2..14ebc9b74 100644
--- a/src/dispatcher/androidDevice.js
+++ b/src/dispatcher/androidDevice.js
@@ -8,7 +8,7 @@
 import AndroidDevice from '../devices/AndroidDevice';
 import child_process from 'child_process';
 import type {Store} from '../reducers/index.js';
-import type BaseDevice from '../devices/BaseDevice';
+import type BaseDevice from '../devices/BaseDevice.tsx';
 import type {Logger} from '../fb-interfaces/Logger.js';
 import {registerDeviceCallbackOnPlugins} from '../utils/onRegisterDevice.js';
 import {getAdbClient} from '../utils/adbClient';
diff --git a/src/dispatcher/iOSDevice.js b/src/dispatcher/iOSDevice.js
index 2c7fd7b95..f82b7c6a5 100644
--- a/src/dispatcher/iOSDevice.js
+++ b/src/dispatcher/iOSDevice.js
@@ -8,7 +8,7 @@
 import type {ChildProcess} from 'child_process';
 import type {Store} from '../reducers/index.js';
 import type {Logger} from '../fb-interfaces/Logger.js';
-import type {DeviceType} from '../devices/BaseDevice';
+import type {DeviceType} from '../devices/BaseDevice.tsx';
 import {promisify} from 'util';
 import path from 'path';
 import child_process from 'child_process';
diff --git a/src/fb-stubs/iOSContainerUtility.js b/src/fb-stubs/iOSContainerUtility.js
index 82b334f2d..58e81020e 100644
--- a/src/fb-stubs/iOSContainerUtility.js
+++ b/src/fb-stubs/iOSContainerUtility.js
@@ -5,7 +5,7 @@
  * @format
  */
 import {promisify} from 'util';
-import type {DeviceType} from '../devices/BaseDevice';
+import type {DeviceType} from '../devices/BaseDevice.tsx';
 const exec = promisify(require('child_process').exec);
 
 const errorMessage = 'Physical iOS devices not yet supported';
diff --git a/src/index.js b/src/index.js
index 82558c6bf..3ed4a19ff 100644
--- a/src/index.js
+++ b/src/index.js
@@ -26,7 +26,7 @@ export * from './fb-stubs/createPaste.js';
 export {connect} from 'react-redux';
 export {selectPlugin} from './reducers/connections';
 export {getPluginKey, getPersistedState} from './utils/pluginUtils.js';
-export {default as BaseDevice} from './devices/BaseDevice.js';
+export {default as BaseDevice} from './devices/BaseDevice.tsx';
 export type {Store, MiddlewareAPI} from './reducers/index.js';
 
 export {
@@ -36,7 +36,7 @@ export {
   DeviceLogListener,
   DeviceLogEntry,
   LogLevel,
-} from './devices/BaseDevice.js';
+} from './devices/BaseDevice.tsx';
 export {shouldParseAndroidLog} from './utils/crashReporterUtility.js';
 export {default as isProduction} from './utils/isProduction.js';
 export {createTablePlugin} from './createTablePlugin.js';
@@ -44,6 +44,6 @@ export {default as DetailSidebar} from './chrome/DetailSidebar.js';
 
 export {default as AndroidDevice} from './devices/AndroidDevice.js';
 export {default as ArchivedDevice} from './devices/ArchivedDevice.js';
-export {default as Device} from './devices/BaseDevice.js';
+export {default as Device} from './devices/BaseDevice.tsx';
 export {default as IOSDevice} from './devices/IOSDevice.js';
-export type {OS} from './devices/BaseDevice.js';
+export type {OS} from './devices/BaseDevice.tsx';
diff --git a/src/plugin.js b/src/plugin.js
index f2ce72eff..abd07c687 100644
--- a/src/plugin.js
+++ b/src/plugin.js
@@ -13,7 +13,7 @@ import type {Store, MiddlewareAPI} from './reducers/index.js';
 import type {MetricType} from './utils/exportMetrics.js';
 import React from 'react';
 import type {Node} from 'react';
-import BaseDevice from './devices/BaseDevice.js';
+import BaseDevice from './devices/BaseDevice.tsx';
 import AndroidDevice from './devices/AndroidDevice';
 import IOSDevice from './devices/IOSDevice';
 
diff --git a/src/plugins/crash_reporter/__tests__/testCrashReporterPlugin.electron.js b/src/plugins/crash_reporter/__tests__/testCrashReporterPlugin.electron.js
index bb1c6a9d2..2dc1016ef 100644
--- a/src/plugins/crash_reporter/__tests__/testCrashReporterPlugin.electron.js
+++ b/src/plugins/crash_reporter/__tests__/testCrashReporterPlugin.electron.js
@@ -4,7 +4,7 @@
  * LICENSE file in the root directory of this source tree.
  * @format
  */
-import BaseDevice from '../../../devices/BaseDevice';
+import BaseDevice from '../../../devices/BaseDevice.tsx';
 import CrashReporterPlugin from '../../crash_reporter';
 import type {PersistedState, Crash} from '../../crash_reporter';
 import {
diff --git a/src/plugins/logs/index.js b/src/plugins/logs/index.js
index 430e07fcc..1f583f7c9 100644
--- a/src/plugins/logs/index.js
+++ b/src/plugins/logs/index.js
@@ -12,7 +12,7 @@ import type {
   TableColumns,
 } from 'flipper';
 import type {Counter} from './LogWatcher.js';
-import type {DeviceLogEntry} from '../../devices/BaseDevice.js';
+import type {DeviceLogEntry} from '../../devices/BaseDevice.tsx';
 import type {Props as PluginProps} from '../../plugin';
 
 import {
diff --git a/src/reducers/__tests__/connections.node.js b/src/reducers/__tests__/connections.node.js
index e2d47f05c..e3afb413e 100644
--- a/src/reducers/__tests__/connections.node.js
+++ b/src/reducers/__tests__/connections.node.js
@@ -6,7 +6,7 @@
  */
 
 import reducer from '../connections';
-import BaseDevice from '../../devices/BaseDevice';
+import BaseDevice from '../../devices/BaseDevice.tsx';
 import type {State} from '../connections';
 
 test('REGISTER_DEVICE doesnt remove error', () => {
diff --git a/src/reducers/connections.js b/src/reducers/connections.js
index 66fd8b9a0..089751ce3 100644
--- a/src/reducers/connections.js
+++ b/src/reducers/connections.js
@@ -5,7 +5,7 @@
  * @format
  */
 
-import type BaseDevice from '../devices/BaseDevice';
+import type BaseDevice from '../devices/BaseDevice.tsx';
 import MacDevice from '../devices/MacDevice';
 import type Client from '../Client';
 import type {UninitializedClient} from '../UninitializedClient';
diff --git a/src/utils/__tests__/exportData.electron.js b/src/utils/__tests__/exportData.electron.js
index 309141eff..5c170ca10 100644
--- a/src/utils/__tests__/exportData.electron.js
+++ b/src/utils/__tests__/exportData.electron.js
@@ -5,7 +5,7 @@
  * @format
  */
 
-import {default as BaseDevice} from '../../devices/BaseDevice';
+import {default as BaseDevice} from '../../devices/BaseDevice.tsx';
 import {default as ArchivedDevice} from '../../devices/ArchivedDevice';
 import {processStore} from '../exportData';
 import {FlipperDevicePlugin} from '../../plugin.js';
diff --git a/src/utils/crashReporterUtility.js b/src/utils/crashReporterUtility.js
index 91ffb6de2..391449815 100644
--- a/src/utils/crashReporterUtility.js
+++ b/src/utils/crashReporterUtility.js
@@ -5,7 +5,7 @@
  * @format
  * @flow
  */
-import type {DeviceLogEntry} from '../devices/BaseDevice.js';
+import type {DeviceLogEntry} from '../devices/BaseDevice.tsx';
 
 export function shouldParseAndroidLog(
   entry: DeviceLogEntry,
diff --git a/src/utils/exportData.js b/src/utils/exportData.js
index 305d5f066..5001bd3e3 100644
--- a/src/utils/exportData.js
+++ b/src/utils/exportData.js
@@ -6,14 +6,14 @@
  */
 import {getInstance as getLogger} from '../fb-stubs/Logger';
 import type {Store, MiddlewareAPI} from '../reducers';
-import type {DeviceExport} from '../devices/BaseDevice';
+import type {DeviceExport} from '../devices/BaseDevice.tsx';
 import type {State as PluginStates} from '../reducers/pluginStates';
 import type {PluginNotification} from '../reducers/notifications.js';
 import type {ClientExport} from '../Client.js';
 import type {State as PluginStatesState} from '../reducers/pluginStates';
 import {pluginKey} from '../reducers/pluginStates';
 import {FlipperDevicePlugin, FlipperPlugin, callClient} from '../plugin.js';
-import {default as BaseDevice} from '../devices/BaseDevice';
+import {default as BaseDevice} from '../devices/BaseDevice.tsx';
 import {default as ArchivedDevice} from '../devices/ArchivedDevice';
 import {default as Client} from '../Client';
 import fs from 'fs';
diff --git a/src/utils/listDevices.js b/src/utils/listDevices.js
index 0f3733138..5904436f9 100644
--- a/src/utils/listDevices.js
+++ b/src/utils/listDevices.js
@@ -6,7 +6,7 @@
  */
 import {getActiveAndroidDevices} from '../dispatcher/androidDevice';
 import {getActiveDevicesAndSimulators} from '../dispatcher/iOSDevice';
-import type BaseDevice from '../devices/BaseDevice';
+import type BaseDevice from '../devices/BaseDevice.tsx';
 
 export async function listDevices(): Promise<Array<BaseDevice>> {
   const androidDevices = await getActiveAndroidDevices();
diff --git a/src/utils/onRegisterDevice.js b/src/utils/onRegisterDevice.js
index 971605f9d..0865365a2 100644
--- a/src/utils/onRegisterDevice.js
+++ b/src/utils/onRegisterDevice.js
@@ -6,7 +6,7 @@
  */
 import type {Store} from '../reducers/index.js';
 import {FlipperPlugin, FlipperDevicePlugin} from '../plugin.js';
-import type BaseDevice from '../devices/BaseDevice.js';
+import type BaseDevice from '../devices/BaseDevice.tsx';
 import {setPluginState} from '../reducers/pluginStates.js';
 import {getPersistedState} from '../utils/pluginUtils.js';
 
diff --git a/src/utils/pluginUtils.js b/src/utils/pluginUtils.js
index 774356d22..066f93bba 100644
--- a/src/utils/pluginUtils.js
+++ b/src/utils/pluginUtils.js
@@ -4,7 +4,7 @@
  * LICENSE file in the root directory of this source tree.
  * @format
  */
-import type BaseDevice from '../devices/BaseDevice.js';
+import type BaseDevice from '../devices/BaseDevice.tsx';
 import {FlipperDevicePlugin, FlipperPlugin} from '../plugin.js';
 import type {State as PluginStatesState} from '../reducers/pluginStates.js';
 import {pluginsClassMap} from './exportData.js';
diff --git a/src/utils/reduxDevToolsConfig.js b/src/utils/reduxDevToolsConfig.js
index 7e6d5d054..949d42839 100644
--- a/src/utils/reduxDevToolsConfig.js
+++ b/src/utils/reduxDevToolsConfig.js
@@ -5,7 +5,7 @@
  * @format
  */
 import type {State} from '../reducers/index';
-import type {DeviceExport} from '../devices/BaseDevice';
+import type {DeviceExport} from '../devices/BaseDevice.tsx';
 
 export const stateSanitizer = (state: State) => {
   if (state.connections && state.connections.devices) {