prettier 2

Summary:
Quick notes:

- This looks worse than it is. It adds mandatory parentheses to single argument lambdas. Lots of outrage on Twitter about it, personally I'm {emoji:1f937_200d_2642} about it.
- Space before function, e.g. `a = function ()` is now enforced. I like this because both were fine before.
- I added `eslint-config-prettier` to the config because otherwise a ton of rules conflict with eslint itself.

Close https://github.com/facebook/flipper/pull/915

Reviewed By: jknoxville

Differential Revision: D20594929

fbshipit-source-id: ca1c65376b90e009550dd6d1f4e0831d32cbff03

desktop/.eslintrc.js

@@ -24,7 +24,7 @@ const prettierConfig = {
 module.exports = {
   parser: 'babel-eslint',
   root: true,
-  extends: 'fbjs',
+  extends: ['fbjs', 'prettier'],
   plugins: [
     ...fbjs.plugins,
     'header',
@@ -43,8 +43,6 @@ module.exports = {
     'prefer-const': [2, {destructuring: 'all'}],
     'prefer-spread': 1,
     'prefer-rest-params': 1,
-    'max-len': 0, // lets prettier take care of this
-    indent: 0, // lets prettier take care of this
     'no-console': 0, // we're setting window.console in App.js
     'no-multi-spaces': 2,
     'prefer-promise-reject-errors': 1,

desktop/app/src/Client.tsx

@@ -116,7 +116,7 @@ export default class Client extends EventEmitter {
   store: Store;
   activePlugins: Set<string>;
   device: Promise<BaseDevice>;
-  _deviceResolve: (device: BaseDevice) => void = _ => {};
+  _deviceResolve: (device: BaseDevice) => void = (_) => {};
   _deviceSet: false | BaseDevice = false;
   logger: Logger;
   lastSeenDeviceList: Array<BaseDevice>;
@@ -194,7 +194,7 @@ export default class Client extends EventEmitter {
         const device = this.store
           .getState()
           .connections.devices.find(
-            device => device.serial === this.query.device_id,
+            (device) => device.serial === this.query.device_id,
           );
         if (device) {
           resolve(device);
@@ -214,7 +214,7 @@ export default class Client extends EventEmitter {
           }
           this.lastSeenDeviceList = this.store.getState().connections.devices;
           const matchingDevice = newDeviceList.find(
-            device => device.serial === this.query.device_id,
+            (device) => device.serial === this.query.device_id,
           );
           if (matchingDevice) {
             clearTimeout(timeout);
@@ -224,7 +224,7 @@ export default class Client extends EventEmitter {
         });
       }),
       'client-setMatchingDevice',
-    ).then(device => {
+    ).then((device) => {
       this._deviceSet = device;
       this._deviceResolve(device);
     });
@@ -244,10 +244,10 @@ export default class Client extends EventEmitter {
     const plugins = await this.rawCall<{plugins: Plugins}>(
       'getPlugins',
       false,
-    ).then(data => data.plugins);
+    ).then((data) => data.plugins);
     this.plugins = plugins;
     const nativeplugins = plugins
-      .map(plugin => /_nativeplugin_([^_]+)_([^_]+)/.exec(plugin))
+      .map((plugin) => /_nativeplugin_([^_]+)_([^_]+)/.exec(plugin))
       .filter(notNull)
       .map(([id, type, title]) => {
         // TODO put this in another component, and make the "types" registerable
@@ -318,7 +318,7 @@ export default class Client extends EventEmitter {
           }: ${error.message} + \nDevice Stack Trace: ${error.stacktrace}`,
           'deviceError',
         );
-        this.device.then(device => handleError(this.store, device, error));
+        this.device.then((device) => handleError(this.store, device, error));
       } else if (method === 'refreshPlugins') {
         this.refreshPlugins();
       } else if (method === 'execute') {
@@ -389,7 +389,7 @@ export default class Client extends EventEmitter {
       reject(data.error);
       const {error} = data;
       if (error) {
-        this.device.then(device => handleError(this.store, device, error));
+        this.device.then((device) => handleError(this.store, device, error));
       }
     } else {
       // ???
@@ -466,7 +466,7 @@ export default class Client extends EventEmitter {
           this.connection
             .requestResponse({data: JSON.stringify(data)})
             .subscribe({
-              onComplete: payload => {
+              onComplete: (payload) => {
                 if (!fromPlugin || this.isAcceptingMessagesFromPlugin(plugin)) {
                   const logEventName = this.getLogEventName(data);
                   this.logger.trackTimeSince(mark, logEventName);
@@ -478,7 +478,7 @@ export default class Client extends EventEmitter {
                 }
               },
               // Open fresco then layout and you get errors because responses come back after deinit.
-              onError: e => {
+              onError: (e) => {
                 if (this.isAcceptingMessagesFromPlugin(plugin)) {
                   reject(e);
                 }
@@ -555,8 +555,9 @@ export default class Client extends EventEmitter {
   send(api: string, method: string, params?: Object): void {
     if (!isProduction()) {
       console.warn(
-        `${api}:${method ||
+        `${api}:${
-          ''} client.send() is deprecated. Please use call() instead so you can handle errors.`,
+          method || ''
+        } client.send() is deprecated. Please use call() instead so you can handle errors.`,
       );
     }
     return this.rawSend('execute', {api, method, params});

desktop/app/src/MenuBar.tsx

@@ -81,18 +81,18 @@ export function setupMenuBar(
   // collect all keyboard actions from all plugins
   const registeredActions: Set<KeyboardAction> = new Set(
     plugins
-      .map(plugin => plugin.keyboardActions || [])
+      .map((plugin) => plugin.keyboardActions || [])
       .reduce((acc: KeyboardActions, cv) => acc.concat(cv), [])
       .map((action: DefaultKeyboardAction | KeyboardAction) =>
         typeof action === 'string'
-          ? defaultKeyboardActions.find(a => a.action === action)
+          ? defaultKeyboardActions.find((a) => a.action === action)
           : action,
       )
       .filter(notNull),
   );
 
   // add keyboard actions to
-  registeredActions.forEach(keyboardAction => {
+  registeredActions.forEach((keyboardAction) => {
     if (keyboardAction != null) {
       appendMenuItem(template, actionHandler, keyboardAction);
     }
@@ -102,15 +102,15 @@ export function setupMenuBar(
   const applicationMenu = electron.remote.Menu.buildFromTemplate(template);
 
   // add menu items to map, so we can modify them easily later
-  registeredActions.forEach(keyboardAction => {
+  registeredActions.forEach((keyboardAction) => {
     if (keyboardAction != null) {
       const {topLevelMenu, label, action} = keyboardAction;
       const menu = applicationMenu.items.find(
-        menuItem => menuItem.label === topLevelMenu,
+        (menuItem) => menuItem.label === topLevelMenu,
       );
       if (menu && menu.submenu) {
         const menuItem = menu.submenu.items.find(
-          menuItem => menuItem.label === label,
+          (menuItem) => menuItem.label === label,
         );
         menuItem && menuItems.set(action, menuItem);
       }
@@ -131,7 +131,7 @@ function appendMenuItem(
     return;
   }
   const itemIndex = template.findIndex(
-    menu => menu.label === keyboardAction.topLevelMenu,
+    (menu) => menu.label === keyboardAction.topLevelMenu,
   );
   if (itemIndex > -1 && template[itemIndex].submenu != null) {
     (template[itemIndex].submenu as MenuItemConstructorOptions[]).push({
@@ -160,7 +160,8 @@ export function activateMenuItems(
 
   // enable keyboard actions for the current plugin
   if (activePlugin.constructor.keyboardActions != null) {
-    (activePlugin.constructor.keyboardActions || []).forEach(keyboardAction => {
+    (activePlugin.constructor.keyboardActions || []).forEach(
+      (keyboardAction) => {
         const action =
           typeof keyboardAction === 'string'
             ? keyboardAction
@@ -169,7 +170,8 @@ export function activateMenuItems(
         if (item != null) {
           item.enabled = true;
         }
-    });
+      },
+    );
   }
 
   // set the application menu again to make sure it updates

desktop/app/src/NotificationsHub.tsx

@@ -108,16 +108,18 @@ class NotificationsTable extends Component<Props & SearchableProps, State> {
     if (this.props.filters.length !== prevProps.filters.length) {
       this.props.updatePluginBlacklist(
         this.props.filters
-          .filter(f => f.type === 'exclude' && f.key.toLowerCase() === 'plugin')
+          .filter(
-          .map(f => String(f.value)),
+            (f) => f.type === 'exclude' && f.key.toLowerCase() === 'plugin',
+          )
+          .map((f) => String(f.value)),
       );
 
       this.props.updateCategoryBlacklist(
         this.props.filters
           .filter(
-            f => f.type === 'exclude' && f.key.toLowerCase() === 'category',
+            (f) => f.type === 'exclude' && f.key.toLowerCase() === 'category',
           )
-          .map(f => String(f.value)),
+          .map((f) => String(f.value)),
       );
     }
 
@@ -162,7 +164,7 @@ class NotificationsTable extends Component<Props & SearchableProps, State> {
 
     // filter plugins
     const blacklistedPlugins = new Set(
-      this.props.blacklistedPlugins.map(p => p.toLowerCase()),
+      this.props.blacklistedPlugins.map((p) => p.toLowerCase()),
     );
     if (blacklistedPlugins.has(n.pluginId.toLowerCase())) {
       return false;
@@ -172,7 +174,7 @@ class NotificationsTable extends Component<Props & SearchableProps, State> {
     const {category} = n.notification;
     if (category) {
       const blacklistedCategories = new Set(
-        this.props.blacklistedCategories.map(p => p.toLowerCase()),
+        this.props.blacklistedCategories.map((p) => p.toLowerCase()),
       );
       if (blacklistedCategories.has(category.toLowerCase())) {
         return false;
@@ -320,7 +322,7 @@ type NotificationBoxProps = {
   severity: keyof typeof SEVERITY_COLOR_MAP;
 };
 
-const NotificationBox = styled(FlexRow)<NotificationBoxProps>(props => ({
+const NotificationBox = styled(FlexRow)<NotificationBoxProps>((props) => ({
   backgroundColor: props.inactive ? 'transparent' : colors.white,
   opacity: props.inactive ? 0.5 : 1,
   alignItems: 'flex-start',
@@ -360,7 +362,7 @@ const Title = styled.div({
 });
 
 const NotificationContent = styled(FlexColumn)<{isSelected?: boolean}>(
-  props => ({
+  (props) => ({
     marginLeft: 6,
     marginRight: 10,
     flexGrow: 1,

desktop/app/src/PluginContainer.tsx

@@ -198,11 +198,11 @@ class PluginContainer extends PureComponent<Props, State> {
           activePlugin,
           pluginKey,
           this.store,
-          progress => {
+          (progress) => {
             this.setState({progress});
           },
           this.idler,
-        ).then(completed => {
+        ).then((completed) => {
           const duration = Date.now() - start;
           this.props.logger.track(
             'duration',
@@ -345,7 +345,7 @@ class PluginContainer extends PureComponent<Props, State> {
           }
         : pluginState,
       setStaticView: (payload: StaticView) => this.props.setStaticView(payload),
-      setPersistedState: state => setPluginState({pluginKey, state}),
+      setPersistedState: (state) => setPluginState({pluginKey, state}),
       target,
       deepLinkPayload: this.props.deepLinkPayload,
       selectPlugin: (pluginID: string, deepLinkPayload: string | null) => {
@@ -353,7 +353,7 @@ class PluginContainer extends PureComponent<Props, State> {
         // check if plugin will be available
         if (
           target instanceof Client &&
-          target.plugins.some(p => p === pluginID)
+          target.plugins.some((p) => p === pluginID)
         ) {
           this.props.selectPlugin({selectedPlugin: pluginID, deepLinkPayload});
           return true;
@@ -371,8 +371,9 @@ class PluginContainer extends PureComponent<Props, State> {
       <React.Fragment>
         <Container key="plugin">
           <ErrorBoundary
-            heading={`Plugin "${activePlugin.title ||
+            heading={`Plugin "${
-              'Unknown'}" encountered an error during render`}>
+              activePlugin.title || 'Unknown'
+            }" encountered an error during render`}>
             {React.createElement(activePlugin, props)}
           </ErrorBoundary>
         </Container>

desktop/app/src/chrome/AutoUpdateVersion.tsx

@@ -57,7 +57,7 @@ export default class AutoUpdateVersion extends Component<Props, State> {
         notification.onclick = remote.autoUpdater.quitAndInstall;
       });
 
-      remote.autoUpdater.on('error', error => {
+      remote.autoUpdater.on('error', (error) => {
         this.setState({updater: 'error', error: error.toString()});
       });
 

desktop/app/src/chrome/BugReporterDialog.tsx

@@ -172,7 +172,7 @@ class BugReporterDialog extends Component<Props, State> {
                   success: id,
                 });
               })
-              .catch(err => {
+              .catch((err) => {
                 this.setState({
                   error: err.message,
                   submitting: false,

desktop/app/src/chrome/DevicesButton.tsx

@@ -48,13 +48,13 @@ class DevicesButton extends Component<Props> {
     // On Linux, you must run the emulator from the directory it's in because
     // reasons ...
     which('emulator')
-      .then(emulatorPath => {
+      .then((emulatorPath) => {
         if (emulatorPath) {
           const child = spawn(emulatorPath, [`@${name}`], {
             detached: true,
             cwd: dirname(emulatorPath),
           });
-          child.stderr.on('data', data => {
+          child.stderr.on('data', (data) => {
             console.error(`Android emulator error: ${data}`);
           });
           child.on('error', console.error);
@@ -96,7 +96,7 @@ class DevicesButton extends Component<Props> {
         enabled: false,
       },
       ...devices
-        .filter(device => device.deviceType === 'physical')
+        .filter((device) => device.deviceType === 'physical')
         .map((device: BaseDevice) => ({
           click: () => selectDevice(device),
           checked: device === selectedDevice,
@@ -114,7 +114,7 @@ class DevicesButton extends Component<Props> {
         enabled: false,
       },
       ...devices
-        .filter(device => device.deviceType === 'emulator')
+        .filter((device) => device.deviceType === 'emulator')
         .map((device: BaseDevice) => ({
           click: () => selectDevice(device),
           checked: device === selectedDevice,
@@ -132,7 +132,7 @@ class DevicesButton extends Component<Props> {
         enabled: false,
       },
       ...devices
-        .filter(device => device.isArchived)
+        .filter((device) => device.isArchived)
         .map((device: BaseDevice) => ({
           click: () => selectDevice(device),
           checked: device === selectedDevice,

desktop/app/src/chrome/DoctorBar.tsx

@@ -59,7 +59,7 @@ class DoctorBar extends Component<Props, State> {
   static getDerivedStateFromProps(props: Props, state: State): State | null {
     const failedCategories = Object.values(
       props.healthcheckReport.categories,
-    ).filter(cat => hasProblems(cat.result));
+    ).filter((cat) => hasProblems(cat.result));
     if (failedCategories.length == 1) {
       const failedCat = failedCategories[0];
       if (failedCat.key === 'ios' || failedCat.key === 'android') {
@@ -131,7 +131,7 @@ class DoctorBar extends Component<Props, State> {
     );
   }
   setVisible(visible: boolean) {
-    this.setState(prevState => {
+    this.setState((prevState) => {
       return {
         ...prevState,
         visible,

desktop/app/src/chrome/DoctorSheet.tsx

@@ -286,7 +286,7 @@ class DoctorSheet extends Component<Props, State> {
   }
 
   onAcknowledgeOnCloseChanged(acknowledge: boolean): void {
-    this.setState(prevState => {
+    this.setState((prevState) => {
       return {
         ...prevState,
         acknowledgeOnClose: acknowledge,
@@ -304,7 +304,9 @@ class DoctorSheet extends Component<Props, State> {
 
   getCheckMessage(checkKey: string): string {
     for (const cat of Object.values(this.props.healthcheckReport.categories)) {
-      const check = Object.values(cat.checks).find(chk => chk.key === checkKey);
+      const check = Object.values(cat.checks).find(
+        (chk) => chk.key === checkKey,
+      );
       if (check) {
         return check.result.message || '';
       }
@@ -328,7 +330,7 @@ class DoctorSheet extends Component<Props, State> {
                     />
                     {category.result.status !== 'SKIPPED' && (
                       <CategoryContainer>
-                        {Object.values(category.checks).map(check => (
+                        {Object.values(category.checks).map((check) => (
                           <HealthcheckDisplay
                             key={check.key}
                             selected={check.key === this.state.selectedCheckKey}

desktop/app/src/chrome/ErrorBar.tsx

@@ -37,7 +37,7 @@ const ErrorBar = memo(function ErrorBar(props: Props) {
     0,
   );
 
-  const urgentErrors = props.errors.filter(e => e.urgent);
+  const urgentErrors = props.errors.filter((e) => e.urgent);
 
   return (
     <ErrorBarContainer>
@@ -52,7 +52,7 @@ const ErrorBar = memo(function ErrorBar(props: Props) {
         ))}
       </ErrorRows>
       <DismissAllErrors
-        onClick={() => setCollapsed(c => !c)}
+        onClick={() => setCollapsed((c) => !c)}
         title="Show / hide errors">
         <Glyph
           color={colors.white}
@@ -90,7 +90,7 @@ function ErrorTile({
           <ButtonGroup>
             {(error.details || error.error) && (
               <Button
-                onClick={() => setCollapsed(s => !s)}
+                onClick={() => setCollapsed((s) => !s)}
                 icon={collapsed ? `chevron-down` : 'chevron-up'}
                 iconSize={12}
               />

desktop/app/src/chrome/ExportDataPluginSheet.tsx

@@ -94,7 +94,7 @@ class ExportDataPluginSheet extends Component<Props, {}> {
               }
             }
           }}
-          onChange={selectedArray => {
+          onChange={(selectedArray) => {
             this.props.setSelectedPlugins(selectedArray);
           }}
           elements={this.props.availablePluginsToExport}
@@ -114,7 +114,7 @@ export default connect<StateFromProps, DispatchFromProps, OwnProps, Store>(
     pluginMessageQueue,
     connections: {selectedApp, clients},
   }) => {
-    const selectedClient = clients.find(o => {
+    const selectedClient = clients.find((o) => {
       return o.id === selectedApp;
     });
     const availablePluginsToExport = getActivePersistentPlugins(

desktop/app/src/chrome/ListView.tsx

@@ -136,7 +136,7 @@ class RowComponent extends Component<RowComponentProps> {
                 <Checkbox
                   disabled={disabled}
                   checked={selected}
-                  onChange={selected => {
+                  onChange={(selected) => {
                     onChange(id, selected);
                   }}
                 />
@@ -145,7 +145,7 @@ class RowComponent extends Component<RowComponentProps> {
                 <Radio
                   disabled={disabled}
                   checked={selected}
-                  onChange={selected => {
+                  onChange={(selected) => {
                     onChange(id, selected);
                   }}
                 />

desktop/app/src/chrome/LocationsButton.tsx

@@ -49,12 +49,7 @@ const shortenText = (text: string, MAX_CHARACTERS = 30): string => {
   if (text.length <= MAX_CHARACTERS) {
     return text;
   } else {
-    return (
+    return text.split('').slice(0, MAX_CHARACTERS).join('') + '...';
-      text
-        .split('')
-        .slice(0, MAX_CHARACTERS)
-        .join('') + '...'
-    );
   }
 };
 
@@ -94,7 +89,7 @@ class LocationsButton extends Component<Props, State> {
   };
 
   updateBookmarks = () => {
-    readBookmarksFromDB().then(bookmarksMap => {
+    readBookmarksFromDB().then((bookmarksMap) => {
       const bookmarks: Array<Bookmark> = [];
       bookmarksMap.forEach((bookmark: Bookmark) => {
         bookmarks.push(bookmark);

desktop/app/src/chrome/MetroButton.tsx

@@ -124,6 +124,6 @@ function MetroButton({device}: Props) {
 
 export default connect<Props, {}, {}, State>(({connections: {devices}}) => ({
   device: devices.find(
-    device => device.os === 'Metro' && !device.isArchived,
+    (device) => device.os === 'Metro' && !device.isArchived,
   ) as MetroDevice,
 }))(MetroButton);

desktop/app/src/chrome/NotificationScreen.tsx

@@ -66,12 +66,12 @@ class Notifications extends PureComponent<Props, State> {
             onSelectPlugin={selectPlugin}
             logger={logger}
             defaultFilters={[
-              ...blacklistedPlugins.map(value => ({
+              ...blacklistedPlugins.map((value) => ({
                 value,
                 type: 'exclude',
                 key: 'plugin',
               })),
-              ...blacklistedCategories.map(value => ({
+              ...blacklistedCategories.map((value) => ({
                 value,
                 type: 'exclude',
                 key: 'category',

desktop/app/src/chrome/Popover.tsx

@@ -167,12 +167,12 @@ export default class Popover extends PureComponent<Props> {
       <>
         <Anchor src="./anchor.svg" key="anchor" />
         <PopoverContainer ref={this._setRef} key="popup">
-          {this.props.sections.map(section => {
+          {this.props.sections.map((section) => {
             if (section.items.length > 0) {
               return (
                 <Section key={section.title}>
                   <Heading>{section.title}</Heading>
-                  {section.items.map(item => (
+                  {section.items.map((item) => (
                     <PopoverItem key={item.title}>
                       <ItemImage>{item.icon}</ItemImage>
                       <ItemContent>

desktop/app/src/chrome/RatingButton.tsx

@@ -41,7 +41,7 @@ class PredefinedComment extends Component<{
   selected: boolean;
   onClick: (_: unknown) => unknown;
 }> {
-  static Container = styled.div<{selected: boolean}>(props => {
+  static Container = styled.div<{selected: boolean}>((props) => {
     return {
       border: '1px solid #f2f3f5',
       cursor: 'pointer',
@@ -151,9 +151,9 @@ class FeedbackComponent extends Component<
     const selectedPredefinedComments: Array<string> = Object.entries(
       this.state.predefinedComments,
     )
-      .map(x => ({comment: x[0], enabled: x[1]}))
+      .map((x) => ({comment: x[0], enabled: x[1]}))
-      .filter(x => x.enabled)
+      .filter((x) => x.enabled)
-      .map(x => x.comment);
+      .map((x) => x.comment);
     const currentRating = this.state.rating;
     if (currentRating) {
       this.props.submitComment(
@@ -189,9 +189,11 @@ class FeedbackComponent extends Component<
           }}>
           <Glyph
             name={
-              (this.state.hoveredRating
+              (
+                this.state.hoveredRating
                   ? index < this.state.hoveredRating
-              : index < (this.state.rating || 0))
+                  : index < (this.state.rating || 0)
+              )
                 ? 'star'
                 : 'star-outline'
             }
@@ -236,8 +238,8 @@ class FeedbackComponent extends Component<
               style={{height: 30, width: '100%'}}
               placeholder={this.props.promptData.commentPlaceholder}
               value={this.state.comment}
-              onChange={e => this.setState({comment: e.target.value})}
+              onChange={(e) => this.setState({comment: e.target.value})}
-              onKeyDown={e =>
+              onKeyDown={(e) =>
                 e.key == 'Enter' && this.onCommentSubmitted(this.state.comment)
               }
               autoFocus={true}
@@ -296,7 +298,7 @@ class RatingButton extends Component<PropsFromState, State> {
   constructor(props: PropsFromState) {
     super(props);
     if (GK.get('flipper_rating')) {
-      UserFeedback.getPrompt().then(prompt => {
+      UserFeedback.getPrompt().then((prompt) => {
         this.setState({promptData: prompt});
         setTimeout(this.triggerPopover.bind(this), 30000);
       });

desktop/app/src/chrome/ScreenCaptureButtons.tsx

@@ -91,7 +91,7 @@ class ScreenCaptureButtons extends Component<Props, State> {
     if (!selectedDevice) {
       return;
     }
-    const path = await selectedDevice.stopScreenCapture().catch(e => {
+    const path = await selectedDevice.stopScreenCapture().catch((e) => {
       console.error(e);
     });
     path ? openFile(path) : 0;
@@ -107,7 +107,7 @@ class ScreenCaptureButtons extends Component<Props, State> {
       this.setState({
         recording: true,
       });
-      this.startRecording().catch(e => {
+      this.startRecording().catch((e) => {
         this.setState({
           recording: false,
         });

desktop/app/src/chrome/SettingsSheet.tsx

@@ -95,7 +95,7 @@ class SettingsSheet extends Component<Props, State> {
         <ToggledSection
           label="Android Developer"
           toggled={enableAndroid}
-          onChange={v => {
+          onChange={(v) => {
             this.setState({
               updatedSettings: {
                 ...this.state.updatedSettings,
@@ -107,7 +107,7 @@ class SettingsSheet extends Component<Props, State> {
             label="Android SDK Location"
             resetValue={DEFAULT_ANDROID_SDK_PATH}
             defaultValue={androidHome}
-            onChange={v => {
+            onChange={(v) => {
               this.setState({
                 updatedSettings: {
                   ...this.state.updatedSettings,
@@ -121,7 +121,7 @@ class SettingsSheet extends Component<Props, State> {
           label="iOS Developer"
           toggled={enableIOS && this.props.platform === 'darwin'}
           frozen={this.props.platform !== 'darwin'}
-          onChange={v => {
+          onChange={(v) => {
             this.setState({
               updatedSettings: {...this.state.updatedSettings, enableIOS: v},
             });
@@ -140,7 +140,7 @@ class SettingsSheet extends Component<Props, State> {
         </ToggledSection>
         <LauncherSettingsPanel
           isPrefetchingEnabled={enablePrefetching}
-          onEnablePrefetchingChange={v => {
+          onEnablePrefetchingChange={(v) => {
             this.setState({
               updatedSettings: {
                 ...this.state.updatedSettings,
@@ -149,7 +149,7 @@ class SettingsSheet extends Component<Props, State> {
             });
           }}
           isLocalPinIgnored={this.state.updatedLauncherSettings.ignoreLocalPin}
-          onIgnoreLocalPinChange={v => {
+          onIgnoreLocalPinChange={(v) => {
             this.setState({
               updatedLauncherSettings: {
                 ...this.state.updatedLauncherSettings,
@@ -161,8 +161,8 @@ class SettingsSheet extends Component<Props, State> {
         <ToggledSection
           label="React Native keyboard shortcuts"
           toggled={reactNative.shortcuts.enabled}
-          onChange={enabled => {
+          onChange={(enabled) => {
-            this.setState(prevState => ({
+            this.setState((prevState) => ({
               updatedSettings: {
                 ...prevState.updatedSettings,
                 reactNative: {
@@ -178,8 +178,8 @@ class SettingsSheet extends Component<Props, State> {
           <KeyboardShortcutInput
             label="Reload application"
             value={reactNative.shortcuts.reload}
-            onChange={reload => {
+            onChange={(reload) => {
-              this.setState(prevState => ({
+              this.setState((prevState) => ({
                 updatedSettings: {
                   ...prevState.updatedSettings,
                   reactNative: {
@@ -196,8 +196,8 @@ class SettingsSheet extends Component<Props, State> {
           <KeyboardShortcutInput
             label="Open developer menu"
             value={reactNative.shortcuts.openDevMenu}
-            onChange={openDevMenu => {
+            onChange={(openDevMenu) => {
-              this.setState(prevState => ({
+              this.setState((prevState) => ({
                 updatedSettings: {
                   ...prevState.updatedSettings,
                   reactNative: {

desktop/app/src/chrome/Sheet.tsx

@@ -95,7 +95,7 @@ class Sheet extends Component<Props, State> {
         in={Boolean(this.props.activeSheet) && this.state.isVisible}
         timeout={0}
         onExited={() => this.props.onHideSheet()}>
-        {state => (
+        {(state) => (
           <DialogContainer state={state}>
             <div
               /* This is the target for React.portal, it should not be

desktop/app/src/chrome/SignInSheet.tsx

@@ -101,7 +101,7 @@ class SignInSheet extends Component<Props, State> {
           disabled={this.state.loading}
           placeholder="Nuclide Access Token"
           value={this.state.token}
-          onChange={e => this.setState({token: e.target.value})}
+          onChange={(e) => this.setState({token: e.target.value})}
         />
         <br />
         {this.state.error && (

desktop/app/src/chrome/TitleBar.tsx

@@ -252,7 +252,7 @@ export default connect<StateFromProps, DispatchFromProps, OwnProps, State>(
     );
     const navPluginIsActive = !!pluginStates[navigationPluginKey];
     const isMetroActive = !!devices.find(
-      device => device.os === 'Metro' && !device.isArchived,
+      (device) => device.os === 'Metro' && !device.isArchived,
     );
 
     return {

desktop/app/src/chrome/UpdateIndicator.tsx

@@ -93,7 +93,7 @@ export default class UpdateIndicator extends React.PureComponent<Props, State> {
   componentDidMount() {
     if (isProduction() && config().launcherEnabled) {
       reportPlatformFailures(
-        checkForUpdate(this.props.version).then(res => {
+        checkForUpdate(this.props.version).then((res) => {
           if (res.kind === 'error') {
             console.warn('Version check failure: ', res.msg);
             throw new Error(res.msg);

desktop/app/src/chrome/UserAccount.tsx

@@ -92,7 +92,7 @@ class UserAccount extends PureComponent<Props> {
 
   componentDidMount() {
     if (config.showLogin) {
-      getUser().catch(error => {
+      getUser().catch((error) => {
         if (error === USER_UNAUTHORIZED || error === USER_NOT_SIGNEDIN) {
           this.openLogin();
         }

desktop/app/src/chrome/VideoRecordingButton.tsx

@@ -49,7 +49,7 @@ export default class VideoRecordingButton extends Component<Props, State> {
     this.setState({
       recording: true,
     });
-    selectedDevice.startScreenCapture(videoPath).catch(e => {
+    selectedDevice.startScreenCapture(videoPath).catch((e) => {
       console.error('Screen recording failed:', e);
       this.setState({
         recording: false,

desktop/app/src/chrome/mainsidebar/MainSidebar2.tsx

@@ -136,7 +136,7 @@ const SidebarSection: React.FC<{
   return (
     <>
       <SidebarSectionButton
-        onClick={() => setCollapsed(s => !s)}
+        onClick={() => setCollapsed((s) => !s)}
         level={level}
         color={color}
         collapsed={collapsed}>
@@ -212,7 +212,7 @@ class MainSidebar2 extends PureComponent<Props, State> {
       <Sidebar position="left" width={250} backgroundColor={colors.light02}>
         <Plugins>
           {devices.length ? (
-            devices.map(device => this.renderDevice(device))
+            devices.map((device) => this.renderDevice(device))
           ) : (
             <NoDevices />
           )}
@@ -234,7 +234,7 @@ class MainSidebar2 extends PureComponent<Props, State> {
       selectedDevice,
     } = this.props;
     const clients = getAvailableClients(device, this.props.clients);
-    const devicePluginsItems = device.devicePlugins.map(pluginName => {
+    const devicePluginsItems = device.devicePlugins.map((pluginName) => {
       const plugin = this.props.devicePlugins.get(pluginName)!;
       return (
         <PluginSidebarListItem
@@ -272,7 +272,7 @@ class MainSidebar2 extends PureComponent<Props, State> {
         ) : (
           <div style={{marginTop: 6}}>{devicePluginsItems}</div>
         )}
-        {clients.map(client => (
+        {clients.map((client) => (
           <PluginList
             device={device}
             key={client.id}
@@ -293,7 +293,7 @@ class MainSidebar2 extends PureComponent<Props, State> {
     const {uninitializedClients} = this.props;
     return uninitializedClients.length > 0 ? (
       <SidebarSection title="Connecting..." key="unitializedClients" level={1}>
-        {uninitializedClients.map(entry => (
+        {uninitializedClients.map((entry) => (
           <SidebarSection
             color={getColorByApp(entry.client.appName)}
             key={JSON.stringify(entry.client)}
@@ -387,14 +387,14 @@ function groupPluginsByCategory(plugins: FlipperPlugins): PluginsByCategory {
   const sortedPlugins = plugins.slice().sort(sortPluginsByName);
   const byCategory: {[cat: string]: FlipperPlugins} = {};
   const res: PluginsByCategory = [];
-  sortedPlugins.forEach(plugin => {
+  sortedPlugins.forEach((plugin) => {
     const category = plugin.category || '';
     (byCategory[category] || (byCategory[category] = [])).push(plugin);
   });
   // Sort categories
   Object.keys(byCategory)
     .sort()
-    .forEach(category => {
+    .forEach((category) => {
       res.push([category, byCategory[category]]);
     });
   return res;
@@ -464,7 +464,7 @@ const PluginList = memo(function PluginList({
   // client is a mutable structure, so we need the event emitter to detect the addition of plugins....
   const [_, setPluginsChanged] = useState(0);
   useEffect(() => {
-    const listener = () => setPluginsChanged(v => v + 1);
+    const listener = () => setPluginsChanged((v) => v + 1);
     client.on('plugins-change', listener);
     return () => {
       client.off('plugins-change', listener);
@@ -494,7 +494,7 @@ const PluginList = memo(function PluginList({
   const selectedNonFavoritePlugin =
     selectedApp === client.id &&
     client.plugins.includes(selectedPlugin!) &&
-    !favoritePlugins.find(plugin => plugin.id === selectedPlugin);
+    !favoritePlugins.find((plugin) => plugin.id === selectedPlugin);
   const allPluginsStarred = favoritePlugins.length === allPlugins.length;
 
   return (
@@ -526,7 +526,7 @@ const PluginList = memo(function PluginList({
           defaultCollapsed={
             favoritePlugins.length > 0 && !selectedNonFavoritePlugin
           }
-          title={collapsed => (
+          title={(collapsed) => (
             <ShowMoreButton collapsed={collapsed}>
               <Glyph
                 color={colors.macOSTitleBarIconBlur}
@@ -585,7 +585,7 @@ const PluginsByCategory = memo(function PluginsByCategory({
               <CategoryName>{category}</CategoryName>
             </ListItem>
           )}
-          {plugins.map(plugin => (
+          {plugins.map((plugin) => (
             <PluginSidebarListItem
               key={plugin.id}
               isActive={

desktop/app/src/chrome/mainsidebar/sidebarUtils.tsx

@@ -85,7 +85,7 @@ const PluginShape = styled(FlexBox)<{
 }));
 
 export const PluginName = styled(Text)<{isActive?: boolean; count?: number}>(
-  props => ({
+  (props) => ({
     minWidth: 0,
     textOverflow: 'ellipsis',
     whiteSpace: 'nowrap',
@@ -242,13 +242,13 @@ export function getFavoritePlugins(
     }
     // for archived plugins, all stored plugins are enabled
     return allPlugins.filter(
-      plugin => client.plugins.indexOf(plugin.id) !== -1,
+      (plugin) => client.plugins.indexOf(plugin.id) !== -1,
     );
   }
   if (!starredPlugins || !starredPlugins.length) {
     return returnFavoredPlugins ? [] : allPlugins;
   }
-  return allPlugins.filter(plugin => {
+  return allPlugins.filter((plugin) => {
     const idx = starredPlugins.indexOf(plugin.id);
     return idx === -1 ? !returnFavoredPlugins : returnFavoredPlugins;
   });

desktop/app/src/chrome/plugin-manager/PluginDebugger.tsx

@@ -152,7 +152,7 @@ class PluginDebugger extends Component<Props> {
           : p.entry
         : 'Native Plugin';
 
-    this.props.gatekeepedPlugins.forEach(plugin =>
+    this.props.gatekeepedPlugins.forEach((plugin) =>
       rows.push(
         this.buildRow(
           plugin.name,
@@ -164,7 +164,7 @@ class PluginDebugger extends Component<Props> {
       ),
     );
 
-    this.props.devicePlugins.forEach(plugin =>
+    this.props.devicePlugins.forEach((plugin) =>
       rows.push(
         this.buildRow(
           plugin.id,
@@ -176,7 +176,7 @@ class PluginDebugger extends Component<Props> {
       ),
     );
 
-    this.props.clientPlugins.forEach(plugin =>
+    this.props.clientPlugins.forEach((plugin) =>
       rows.push(
         this.buildRow(
           plugin.id,
@@ -188,7 +188,7 @@ class PluginDebugger extends Component<Props> {
       ),
     );
 
-    this.props.disabledPlugins.forEach(plugin =>
+    this.props.disabledPlugins.forEach((plugin) =>
       rows.push(
         this.buildRow(
           plugin.name,

desktop/app/src/chrome/plugin-manager/PluginInstaller.tsx

@@ -175,7 +175,7 @@ const PluginInstaller = function props(props: Props) {
         <Toolbar>
           <SearchBox>
             <SearchInput
-              onChange={e => setQuery(e.target.value)}
+              onChange={(e) => setQuery(e.target.value)}
               value={query}
               placeholder="Search Flipper plugins..."
             />
@@ -414,7 +414,9 @@ function useNPMSearch(
         return;
       }
       setSearchResults(
-        hits.filter(hit => !installedPlugins.has(hit.name)).map(liftUpdatable),
+        hits
+          .filter((hit) => !installedPlugins.has(hit.name))
+          .map(liftUpdatable),
       );
 
       // Clean up: if query changes while we're searching, abandon results.
@@ -445,7 +447,7 @@ export default connect<PropsFromState, DispatchFromProps, OwnProps, AppState>(
   }),
   (dispatch: Dispatch<Action<any>>) => ({
     refreshInstalledPlugins: () => {
-      readInstalledPlugins().then(plugins =>
+      readInstalledPlugins().then((plugins) =>
         dispatch(registerInstalledPlugins(plugins)),
       );
     },

desktop/app/src/chrome/plugin-manager/PluginPackageInstaller.tsx

@@ -81,7 +81,7 @@ export default function PluginPackageInstaller({
     <Toolbar>
       <FileSelector
         placeholderText="Specify path to a Flipper package or just drag and drop it here..."
-        onPathChanged={e => {
+        onPathChanged={(e) => {
           setPath(e.path);
           setIsPathValid(e.isValid);
           setError(undefined);

desktop/app/src/chrome/settings/KeyboardShortcutInput.tsx

@@ -57,7 +57,7 @@ const ShortcutKeysContainer = styled(FlexRow)<{invalid: boolean}>(
     flexGrow: 1,
     padding: 2,
   },
-  props => ({borderColor: props.invalid ? colors.red : colors.light15}),
+  (props) => ({borderColor: props.invalid ? colors.red : colors.light15}),
 );
 
 const ShortcutKeyContainer = styled.div({
@@ -183,7 +183,7 @@ const KeyboardShortcutInput = (props: {
           ([metaKey, altKey, ctrlKey, shiftKey].includes(true) &&
             character !== '') ||
             [metaKey, altKey, ctrlKey, shiftKey, character].every(
-              value => !value,
+              (value) => !value,
             ),
         ),
       500,

desktop/app/src/chrome/settings/configFields.tsx

@@ -59,13 +59,13 @@ export function FilePathConfigField(props: {
   const [value, setValue] = useState(props.defaultValue);
   const [isValid, setIsValid] = useState(true);
   fs.stat(value)
-    .then(stat => stat.isDirectory())
+    .then((stat) => stat.isDirectory())
-    .then(valid => {
+    .then((valid) => {
       if (valid !== isValid) {
         setIsValid(valid);
       }
     })
-    .catch(_ => setIsValid(false));
+    .catch((_) => setIsValid(false));
 
   return (
     <ConfigFieldContainer>
@@ -74,17 +74,17 @@ export function FilePathConfigField(props: {
         placeholder={props.label}
         value={value}
         isValid={isValid}
-        onChange={e => {
+        onChange={(e) => {
           setValue(e.target.value);
           props.onChange(e.target.value);
           fs.stat(e.target.value)
-            .then(stat => stat.isDirectory())
+            .then((stat) => stat.isDirectory())
-            .then(valid => {
+            .then((valid) => {
               if (valid !== isValid) {
                 setIsValid(valid);
               }
             })
-            .catch(_ => setIsValid(false));
+            .catch((_) => setIsValid(false));
         }}
       />
       <FlexColumn

desktop/app/src/createTablePlugin.tsx

@@ -154,7 +154,7 @@ export function createTablePlugin<T extends RowData>(props: Props<T>) {
       let paste = '';
       const mapFn = (row: TableBodyRow) =>
         Object.keys(props.columns)
-          .map(key => textContent(row.columns[key].value))
+          .map((key) => textContent(row.columns[key].value))
           .join('\t');
 
       if (this.state.selectedIds.length > 0) {

desktop/app/src/devices/AndroidDevice.tsx

@@ -25,8 +25,8 @@ export default class AndroidDevice extends BaseDevice {
     super(serial, deviceType, title, 'Android');
     this.adb = adb;
     this.icon = 'icons/android.svg';
-    this.adb.openLogcat(this.serial).then(reader => {
+    this.adb.openLogcat(this.serial).then((reader) => {
-      reader.on('entry', entry => {
+      reader.on('entry', (entry) => {
         let type: LogLevel = 'unknown';
         if (entry.priority === Priority.VERBOSE) {
           type = 'verbose';
@@ -69,7 +69,7 @@ export default class AndroidDevice extends BaseDevice {
 
   reverse(ports: [number, number]): Promise<void> {
     return Promise.all(
-      ports.map(port =>
+      ports.map((port) =>
         this.adb.reverse(this.serial, `tcp:${port}`, `tcp:${port}`),
       ),
     ).then(() => {
@@ -100,7 +100,7 @@ export default class AndroidDevice extends BaseDevice {
 
   screenshot(): Promise<Buffer> {
     return new Promise((resolve, reject) => {
-      this.adb.screencap(this.serial).then(stream => {
+      this.adb.screencap(this.serial).then((stream) => {
         const chunks: Array<Buffer> = [];
         stream
           .on('data', (chunk: Buffer) => chunks.push(chunk))
@@ -137,13 +137,8 @@ export default class AndroidDevice extends BaseDevice {
     const fileSize = await this.adb
       .shell(this.serial, `du "${filePath}"`)
       .then(adb.util.readAll)
-      .then((output: Buffer) =>
+      .then((output: Buffer) => output.toString().trim().split('\t'))
-        output
+      .then((x) => Number(x[0]));
-          .toString()
-          .trim()
-          .split('\t'),
-      )
-      .then(x => Number(x[0]));
 
     // 4 is what an empty file (touch file) already takes up, so it's
     // definitely not a valid video file.
@@ -158,7 +153,7 @@ export default class AndroidDevice extends BaseDevice {
     this.recordingProcess = this.adb
       .shell(this.serial, `screenrecord --bugreport "${recordingLocation}"`)
       .then(adb.util.readAll)
-      .then(async output => {
+      .then(async (output) => {
         const isValid = await this.isValidFile(recordingLocation);
         if (!isValid) {
           const outputMessage = output.toString().trim();
@@ -168,18 +163,18 @@ export default class AndroidDevice extends BaseDevice {
         }
       })
       .then(
-        _ =>
+        (_) =>
           new Promise((resolve, reject) => {
-            this.adb.pull(this.serial, recordingLocation).then(stream => {
+            this.adb.pull(this.serial, recordingLocation).then((stream) => {
               stream.on('end', resolve);
               stream.on('error', reject);
               stream.pipe(createWriteStream(destination));
             });
           }),
       )
-      .then(_ => destination);
+      .then((_) => destination);
 
-    return this.recordingProcess.then(_ => {});
+    return this.recordingProcess.then((_) => {});
   }
 
   async stopScreenCapture(): Promise<string> {

desktop/app/src/devices/BaseDevice.tsx

@@ -118,7 +118,7 @@ export default class BaseDevice {
 
   _notifyLogListeners(entry: DeviceLogEntry) {
     if (this.logListeners.size > 0) {
-      this.logListeners.forEach(listener => {
+      this.logListeners.forEach((listener) => {
         // prevent breaking other listeners, if one listener doesn't work.
         try {
           listener(entry);
@@ -176,8 +176,8 @@ export default class BaseDevice {
 
   loadDevicePlugins(devicePlugins?: Map<string, typeof FlipperDevicePlugin>) {
     this.devicePlugins = Array.from(devicePlugins ? devicePlugins.values() : [])
-      .filter(plugin => plugin.supportsDevice(this))
+      .filter((plugin) => plugin.supportsDevice(this))
       .sort(sortPluginsByName)
-      .map(plugin => plugin.id);
+      .map((plugin) => plugin.id);
   }
 }

desktop/app/src/devices/IOSDevice.tsx

@@ -59,7 +59,7 @@ export default class IOSDevice extends BaseDevice {
     const command = `xcrun simctl io booted screenshot ${tmpFilePath}`;
     return promisify(exec)(command)
       .then(() => promisify(fs.readFile)(tmpFilePath))
-      .then(buffer => {
+      .then((buffer) => {
         return promisify(fs.unlink)(tmpFilePath).then(() => buffer);
       });
   }
@@ -213,7 +213,7 @@ export default class IOSDevice extends BaseDevice {
           this.recordingLocation = undefined;
           return recordingLocation!;
         })
-        .catch(_e => {
+        .catch((_e) => {
           this.recordingLocation = undefined;
           console.error(_e);
           return null;

desktop/app/src/devices/MetroDevice.tsx

@@ -162,7 +162,7 @@ export default class MetroDevice extends BaseDevice {
         type,
         tag: message.type,
         message: message.data
-          .map(v =>
+          .map((v) =>
             v && typeof v === 'object' ? JSON.stringify(v, null, 2) : v,
           )
           .join(' '),

desktop/app/src/dispatcher/__tests__/plugins.node.js

@@ -33,7 +33,7 @@ beforeEach(() => {
 test('dispatcher dispatches REGISTER_PLUGINS', () => {
   dispatcher(mockStore, logger);
   const actions = mockStore.getActions();
-  expect(actions.map(a => a.type)).toContain('REGISTER_PLUGINS');
+  expect(actions.map((a) => a.type)).toContain('REGISTER_PLUGINS');
 });
 
 test('getDynamicPlugins returns empty array on errors', () => {

desktop/app/src/dispatcher/androidDevice.tsx

@@ -33,14 +33,14 @@ function createDevice(
 
     adbClient
       .getProperties(device.id)
-      .then(async props => {
+      .then(async (props) => {
         try {
           let name = props['ro.product.model'];
           if (type === 'emulator') {
             name = (await getRunningEmulatorName(device.id)) || name;
           }
           const isKaiOSDevice = Object.keys(props).some(
-            name => name.startsWith('kaios') || name.startsWith('ro.kaios'),
+            (name) => name.startsWith('kaios') || name.startsWith('ro.kaios'),
           );
           const androidLikeDevice = new (isKaiOSDevice
             ? KaiOSDevice
@@ -53,7 +53,7 @@ function createDevice(
           reject(e);
         }
       })
-      .catch(e => {
+      .catch((e) => {
         if (
           e &&
           e.message &&
@@ -74,7 +74,7 @@ export async function getActiveAndroidDevices(
   const client = await getAdbClient(store);
   const androidDevices = await client.listDevices();
   const devices = await Promise.all(
-    androidDevices.map(device => createDevice(client, device)),
+    androidDevices.map((device) => createDevice(client, device)),
   );
   return devices.filter(Boolean) as any;
 }
@@ -108,7 +108,7 @@ export default (store: Store, logger: Logger) => {
     // get emulators
     promisify(which)('emulator')
       .catch(() => `${process.env.ANDROID_HOME || ''}/tools/emulator`)
-      .then(emulatorPath => {
+      .then((emulatorPath) => {
         child_process.exec(
           `${emulatorPath} -list-avds`,
           (error: Error | null, data: string | null) => {
@@ -126,11 +126,11 @@ export default (store: Store, logger: Logger) => {
       });
 
     getAdbClient(store)
-      .then(client => {
+      .then((client) => {
         client
           .trackDevices()
-          .then(tracker => {
+          .then((tracker) => {
-            tracker.on('error', err => {
+            tracker.on('error', (err) => {
               if (err.message === 'Connection closed') {
                 // adb server has shutdown, remove all android devices
                 const {connections} = store.getState();
@@ -148,13 +148,13 @@ export default (store: Store, logger: Logger) => {
               }
             });
 
-            tracker.on('add', async device => {
+            tracker.on('add', async (device) => {
               if (device.type !== 'offline') {
                 registerDevice(client, device, store);
               }
             });
 
-            tracker.on('change', async device => {
+            tracker.on('change', async (device) => {
               if (device.type === 'offline') {
                 unregisterDevices([device.id]);
               } else {
@@ -162,7 +162,7 @@ export default (store: Store, logger: Logger) => {
               }
             });
 
-            tracker.on('remove', device => {
+            tracker.on('remove', (device) => {
               unregisterDevices([device.id]);
             });
           })
@@ -174,7 +174,7 @@ export default (store: Store, logger: Logger) => {
             }
           });
       })
-      .catch(e => {
+      .catch((e) => {
         console.error(`Failed to watch for android devices: ${e.message}`);
       });
   };
@@ -201,7 +201,7 @@ export default (store: Store, logger: Logger) => {
         (device: BaseDevice) =>
           device.serial === androidDevice.serial && device.isArchived,
       )
-      .map(device => device.serial);
+      .map((device) => device.serial);
 
     store.dispatch({
       type: 'UNREGISTER_DEVICES',
@@ -223,7 +223,7 @@ export default (store: Store, logger: Logger) => {
   }
 
   async function unregisterDevices(deviceIds: Array<string>) {
-    deviceIds.forEach(id =>
+    deviceIds.forEach((id) =>
       logger.track('usage', 'unregister-device', {
         os: 'Android',
         serial: id,
@@ -231,10 +231,10 @@ export default (store: Store, logger: Logger) => {
     );
 
     const archivedDevices = deviceIds
-      .map(id => {
+      .map((id) => {
         const device = store
           .getState()
-          .connections.devices.find(device => device.serial === id);
+          .connections.devices.find((device) => device.serial === id);
         if (device && !device.isArchived) {
           return device.archive();
         }
@@ -259,7 +259,7 @@ export default (store: Store, logger: Logger) => {
 
   // cleanup method
   return () =>
-    getAdbClient(store).then(client => {
+    getAdbClient(store).then((client) => {
       client.kill();
     });
 };

desktop/app/src/dispatcher/application.tsx

@@ -35,10 +35,7 @@ export const uriComponents = (url: string): Array<string> => {
     /^flipper:\/\/([^\/]*)\/([^\/]*)\/?(.*)$/,
   );
   if (match) {
-    return match
+    return match.map(decodeURIComponent).slice(1).filter(Boolean);
-      .map(decodeURIComponent)
-      .slice(1)
-      .filter(Boolean);
   }
   return [];
 };
@@ -79,8 +76,8 @@ export default (store: Store, _logger: Logger) => {
         return (
           typeof url === 'string' &&
           fetch(url)
-            .then(res => res.text())
+            .then((res) => res.text())
-            .then(data => importDataToStore(url, data, store))
+            .then((data) => importDataToStore(url, data, store))
             .then(() => {
               store.dispatch(toggleAction('downloadingImportData', false));
             })

desktop/app/src/dispatcher/iOSDevice.tsx

@@ -62,7 +62,7 @@ const portForwarders: Array<ChildProcess> = GK.get('flipper_ios_device_support')
 
 if (typeof window !== 'undefined') {
   window.addEventListener('beforeunload', () => {
-    portForwarders.forEach(process => process.kill());
+    portForwarders.forEach((process) => process.kill());
   });
 }
 
@@ -74,12 +74,12 @@ async function queryDevices(store: Store, logger: Logger): Promise<void> {
   const {connections} = store.getState();
   const currentDeviceIDs: Set<string> = new Set(
     connections.devices
-      .filter(device => device instanceof IOSDevice)
+      .filter((device) => device instanceof IOSDevice)
-      .map(device => device.serial),
+      .map((device) => device.serial),
   );
   return Promise.all([getActiveSimulators(), getActiveDevices()])
     .then(([a, b]) => a.concat(b))
-    .then(activeDevices => {
+    .then((activeDevices) => {
       for (const {udid, type, name} of activeDevices) {
         if (currentDeviceIDs.has(udid)) {
           currentDeviceIDs.delete(udid);
@@ -106,7 +106,7 @@ async function queryDevices(store: Store, logger: Logger): Promise<void> {
       }
 
       if (currentDeviceIDs.size > 0) {
-        currentDeviceIDs.forEach(id =>
+        currentDeviceIDs.forEach((id) =>
           logger.track('usage', 'unregister-device', {os: 'iOS', serial: id}),
         );
         store.dispatch({
@@ -136,9 +136,9 @@ function getActiveSimulators(): Promise<Array<IOSDeviceParams>> {
 
       return simulators
         .filter(
-          simulator => simulator.state === 'Booted' && isAvailable(simulator),
+          (simulator) => simulator.state === 'Booted' && isAvailable(simulator),
         )
-        .map(simulator => {
+        .map((simulator) => {
           return {
             udid: simulator.udid,
             type: 'emulator',
@@ -146,11 +146,11 @@ function getActiveSimulators(): Promise<Array<IOSDeviceParams>> {
           } as IOSDeviceParams;
         });
     })
-    .catch(_ => []);
+    .catch((_) => []);
 }
 
 function getActiveDevices(): Promise<Array<IOSDeviceParams>> {
-  return iosUtil.targets().catch(e => {
+  return iosUtil.targets().catch((e) => {
     console.error(e.message);
     return [];
   });
@@ -163,7 +163,7 @@ function queryDevicesForever(store: Store, logger: Logger) {
       // to avoid simultaneous queries which can cause multiple user input prompts.
       setTimeout(() => queryDevicesForever(store, logger), 3000);
     })
-    .catch(err => {
+    .catch((err) => {
       console.error(err);
     });
 }
@@ -233,8 +233,8 @@ async function checkIfDevicesCanBeQueryied(store: Store): Promise<boolean> {
 
 async function isXcodeDetected(): Promise<boolean> {
   return promisify(child_process.exec)('xcode-select -p')
-    .then(_ => true)
+    .then((_) => true)
-    .catch(_ => false);
+    .catch((_) => false);
 }
 
 export async function getActiveDevicesAndSimulators(): Promise<
@@ -245,7 +245,7 @@ export async function getActiveDevicesAndSimulators(): Promise<
     getActiveDevices(),
   ]);
   const allDevices = activeDevices[0].concat(activeDevices[1]);
-  return allDevices.map(device => {
+  return allDevices.map((device) => {
     const {udid, type, name} = device;
     return new IOSDevice(udid, type, name);
   });
@@ -260,11 +260,11 @@ export default (store: Store, logger: Logger) => {
     return;
   }
   isXcodeDetected()
-    .then(isDetected => {
+    .then((isDetected) => {
       store.dispatch(setXcodeDetected(isDetected));
       return isDetected;
     })
-    .then(isDetected =>
+    .then((isDetected) =>
       isDetected ? queryDevicesForever(store, logger) : Promise.resolve(),
     );
 };

desktop/app/src/dispatcher/index.tsx

@@ -48,7 +48,7 @@ export default function(store: Store, logger: Logger): () => Promise<void> {
     reactNative,
   ].filter(notNull);
   const globalCleanup = dispatchers
-    .map(dispatcher => dispatcher(store, logger))
+    .map((dispatcher) => dispatcher(store, logger))
     .filter(Boolean);
   return () => {
     return Promise.all(globalCleanup).then(() => {});

desktop/app/src/dispatcher/metroDevice.tsx

@@ -22,22 +22,22 @@ const METRO_MESSAGE = ['React Native packager is running', 'Metro is running'];
 const QUERY_INTERVAL = 5000;
 
 async function isMetroRunning(): Promise<boolean> {
-  return new Promise(resolve => {
+  return new Promise((resolve) => {
     // We use Node's http library, rather than fetch api, as the latter cannot supress network errors being shown in the devtools console
     // which generates a lot of noise
     http
-      .get(METRO_URL, resp => {
+      .get(METRO_URL, (resp) => {
         let data = '';
         resp
-          .on('data', chunk => {
+          .on('data', (chunk) => {
             data += chunk;
           })
           .on('end', () => {
-            const isMetro = METRO_MESSAGE.some(msg => data.includes(msg));
+            const isMetro = METRO_MESSAGE.some((msg) => data.includes(msg));
             resolve(isMetro);
           });
       })
-      .on('error', err => {
+      .on('error', (err) => {
         console.debug('Could not connect to METRO ' + err);
         resolve(false);
       });
@@ -79,7 +79,7 @@ async function unregisterDevices(store: Store, logger: Logger) {
   let archivedDevice: ArchivedDevice | undefined = undefined;
   const device = store
     .getState()
-    .connections.devices.find(device => device.serial === METRO_URL);
+    .connections.devices.find((device) => device.serial === METRO_URL);
   if (device && !device.isArchived) {
     archivedDevice = device.archive();
   }

desktop/app/src/dispatcher/notifications.tsx

@@ -103,7 +103,7 @@ export default (store: Store, logger: Logger) => {
       ...devicePlugins,
     ]);
 
-    Object.keys(pluginStates).forEach(key => {
+    Object.keys(pluginStates).forEach((key) => {
       if (knownPluginStates.get(key) !== pluginStates[key]) {
         knownPluginStates.set(key, pluginStates[key]);
         const plugin = deconstructPluginKey(key);

desktop/app/src/dispatcher/pluginManager.tsx

@@ -13,7 +13,7 @@ import {registerInstalledPlugins} from '../reducers/pluginManager';
 import {readInstalledPlugins} from '../utils/pluginManager';
 
 function refreshInstalledPlugins(store: Store) {
-  readInstalledPlugins().then(plugins =>
+  readInstalledPlugins().then((plugins) =>
     store.dispatch(registerInstalledPlugins(plugins)),
   );
 }

desktop/app/src/dispatcher/plugins.tsx

@@ -100,8 +100,8 @@ function getBundledPlugins(): Array<PluginDefinition> {
   }
 
   return bundledPlugins
-    .filter(plugin => notNull(plugin.out))
+    .filter((plugin) => notNull(plugin.out))
-    .map(plugin => ({
+    .map((plugin) => ({
       ...plugin,
       out: path.join(pluginPath, plugin.out!),
     }));
@@ -164,7 +164,7 @@ export const requirePlugin = (
       }
 
       // set values from package.json as static variables on class
-      Object.keys(pluginDefinition).forEach(key => {
+      Object.keys(pluginDefinition).forEach((key) => {
         if (key === 'name') {
           plugin.id = plugin.id || pluginDefinition.name;
         } else if (key === 'id') {

desktop/app/src/dispatcher/reactNative.tsx

@@ -44,10 +44,10 @@ export default (store: Store) => {
         const devices = store
           .getState()
           .connections.devices.filter(
-            device => device.os === 'Metro' && !device.isArchived,
+            (device) => device.os === 'Metro' && !device.isArchived,
           ) as MetroDevice[];
 
-        devices.forEach(device => device.sendCommand(shortcut.command));
+        devices.forEach((device) => device.sendCommand(shortcut.command));
       }),
   );
 };

desktop/app/src/dispatcher/server.tsx

@@ -41,7 +41,7 @@ export default (store: Store, logger: Logger) => {
     });
   });
 
-  server.addListener('error', err => {
+  server.addListener('error', (err) => {
     const message: string =
       err.code === 'EADDRINUSE'
         ? "Couldn't start websocket server. Looks like you have multiple copies of Flipper running."

desktop/app/src/dispatcher/tracking.tsx

@@ -194,7 +194,7 @@ export function computeUsageSummary(
 
   return intervals.reduce<UsageSummary>(
     (acc: UsageSummary, x: UsageInterval) =>
-      produce(acc, draft => {
+      produce(acc, (draft) => {
         draft.total.focusedTime += x.focused ? x.length : 0;
         draft.total.unfocusedTime += x.focused ? 0 : x.length;
         const pluginName = x.plugin ?? 'none';

desktop/app/src/dispatcher/user.tsx

@@ -14,10 +14,10 @@ import {getUser, logoutUser} from '../fb-stubs/user';
 
 export default (store: Store, _logger: Logger) => {
   getUser()
-    .then(user => {
+    .then((user) => {
       store.dispatch(login(user));
     })
-    .catch(e => {
+    .catch((e) => {
       store.dispatch(logout());
       console.error(e);
     });

desktop/app/src/fb-stubs/__mocks__/Logger.tsx

@@ -24,7 +24,7 @@ export function extractError(
   ...data: Array<any>
 ): {message: string; error: Error} {
   const message = data.map(getStringFromErrorLike).join(' ');
-  const error = data.find(e => e instanceof Error) || new Error(message);
+  const error = data.find((e) => e instanceof Error) || new Error(message);
   return {
     message,
     error,

desktop/app/src/fb-stubs/iOSContainerUtility.tsx

@@ -33,8 +33,8 @@ async function targets(): Promise<Array<DeviceTarget>> {
   return stdout
     .toString()
     .split('\n')
-    .map(line => line.trim())
+    .map((line) => line.trim())
-    .map(line => /(.+) \([^(]+\) \[(.*)\]( \(Simulator\))?/.exec(line))
+    .map((line) => /(.+) \([^(]+\) \[(.*)\]( \(Simulator\))?/.exec(line))
     .filter(notNull)
     .filter(
       ([_match, name, _udid, isSim]) =>

desktop/app/src/init.tsx

@@ -46,7 +46,7 @@ const AppFrame = () => {
   const [warnEmployee, setWarnEmployee] = useState(false);
   useEffect(() => {
     if (fbConfig.warnFBEmployees) {
-      isFBEmployee().then(isEmployee => {
+      isFBEmployee().then((isEmployee) => {
         setWarnEmployee(isEmployee);
       });
     }
@@ -85,7 +85,7 @@ function setProcessState(store: Store) {
   // it exists
   process.env.PATH =
     ['emulator', 'tools', 'platform-tools']
-      .map(directory => path.resolve(androidHome, directory))
+      .map((directory) => path.resolve(androidHome, directory))
       .join(':') + `:${process.env.PATH}`;
 
   window.requestIdleCallback(() => {

desktop/app/src/plugin.tsx

@@ -241,7 +241,7 @@ export class FlipperPlugin<
         });
         this.realClient.subscribe(id, method, callback);
       },
-      supportsMethod: method => this.realClient.supportsMethod(id, method),
+      supportsMethod: (method) => this.realClient.supportsMethod(id, method),
     };
   }
 

desktop/app/src/plugins/TableNativePlugin.tsx

@@ -98,7 +98,7 @@ const NonWrappingText = styled(Text)({
   userSelect: 'none',
 });
 
-const BooleanValue = styled(NonWrappingText)<{active?: boolean}>(props => ({
+const BooleanValue = styled(NonWrappingText)<{active?: boolean}>((props) => ({
   '&::before': {
     content: '""',
     display: 'inline-block',
@@ -339,7 +339,7 @@ export default function createTableNativePlugin(id: string, title: string) {
       if (!this.props.persistedState.tableMetadata) {
         this.client
           .call('getMetadata')
-          .then(metadata => {
+          .then((metadata) => {
             this.props.setPersistedState({
               tableMetadata: {
                 ...metadata,
@@ -347,7 +347,7 @@ export default function createTableNativePlugin(id: string, title: string) {
               },
             });
           })
-          .catch(e => this.setState({error: e}));
+          .catch((e) => this.setState({error: e}));
       }
     };
 
@@ -380,13 +380,13 @@ export default function createTableNativePlugin(id: string, title: string) {
             Object.keys(this.props.persistedState.tableMetadata.columns)) ||
           []
         )
-          .map(key => textContent(row.columns[key].value))
+          .map((key) => textContent(row.columns[key].value))
           .join('\t');
 
       if (this.state.selectedIds.length > 0) {
         // create paste from selection
         paste = this.props.persistedState.rows
-          .filter(row => this.state.selectedIds.indexOf(row.key) > -1)
+          .filter((row) => this.state.selectedIds.indexOf(row.key) > -1)
           .map(mapFn)
           .join('\n');
       } else {
@@ -413,7 +413,7 @@ export default function createTableNativePlugin(id: string, title: string) {
         );
         return rows;
       }
-      return rows.map(r => {
+      return rows.map((r) => {
         return {
           ...r,
           columns: Object.keys(r.columns).reduce((map, columnName) => {

desktop/app/src/reducers/connections.tsx

@@ -210,7 +210,7 @@ const reducer = (state: State = INITAL_STATE, action: Actions): State => {
 
       const newDevices = state.devices.slice();
       const existing = state.devices.findIndex(
-        device => device.serial === payload.serial,
+        (device) => device.serial === payload.serial,
       );
       if (existing !== -1) {
         console.debug(
@@ -231,9 +231,9 @@ const reducer = (state: State = INITAL_STATE, action: Actions): State => {
       const deviceSerials = action.payload;
 
       return updateSelection(
-        produce(state, draft => {
+        produce(state, (draft) => {
           draft.devices = draft.devices.filter(
-            device => !deviceSerials.has(device.serial),
+            (device) => !deviceSerials.has(device.serial),
           );
         }),
       );
@@ -265,7 +265,7 @@ const reducer = (state: State = INITAL_STATE, action: Actions): State => {
 
     case 'STAR_PLUGIN': {
       const {selectedPlugin, selectedApp} = action.payload;
-      return produce(state, draft => {
+      return produce(state, (draft) => {
         if (!draft.userStarredPlugins[selectedApp]) {
           draft.userStarredPlugins[selectedApp] = [selectedPlugin];
         } else {
@@ -291,7 +291,7 @@ const reducer = (state: State = INITAL_STATE, action: Actions): State => {
       return updateSelection({
         ...state,
         clients: state.clients.concat(payload),
-        uninitializedClients: state.uninitializedClients.filter(c => {
+        uninitializedClients: state.uninitializedClients.filter((c) => {
           return (
             c.deviceId !== payload.query.device_id ||
             c.client.appName !== payload.query.app
@@ -335,7 +335,7 @@ const reducer = (state: State = INITAL_STATE, action: Actions): State => {
       return {
         ...state,
         uninitializedClients: state.uninitializedClients
-          .filter(entry => !isEqual(entry.client, payload))
+          .filter((entry) => !isEqual(entry.client, payload))
           .concat([{client: payload}])
           .sort((a, b) => a.client.appName.localeCompare(b.client.appName)),
       };
@@ -345,7 +345,7 @@ const reducer = (state: State = INITAL_STATE, action: Actions): State => {
       return {
         ...state,
         uninitializedClients: state.uninitializedClients
-          .map(c =>
+          .map((c) =>
             isEqual(c.client, payload.client)
               ? {...c, deviceId: payload.deviceId}
               : c,
@@ -365,7 +365,7 @@ const reducer = (state: State = INITAL_STATE, action: Actions): State => {
       return {
         ...state,
         uninitializedClients: state.uninitializedClients
-          .map(c =>
+          .map((c) =>
             isEqual(c.client, payload.client)
               ? {...c, errorMessage: errorMessage}
               : c,
@@ -392,10 +392,10 @@ const reducer = (state: State = INITAL_STATE, action: Actions): State => {
     case 'REGISTER_PLUGINS': {
       // plugins are registered after creating the base devices, so update them
       const plugins = action.payload;
-      plugins.forEach(plugin => {
+      plugins.forEach((plugin) => {
         if (plugin.prototype instanceof FlipperDevicePlugin) {
           // smell: devices are mutable
-          state.devices.forEach(device => {
+          state.devices.forEach((device) => {
             // @ts-ignore
             if (plugin.supportsDevice(device)) {
               device.devicePlugins = [
@@ -429,7 +429,7 @@ export default (state: State = INITAL_STATE, action: Actions): State => {
 
     if (error) {
       const deviceNotSupportedError = nextState.errors.find(
-        error => error.message === deviceNotSupportedErrorMessage,
+        (error) => error.message === deviceNotSupportedErrorMessage,
       );
       if (deviceNotSupportedError) {
         deviceNotSupportedError.message = error;
@@ -445,7 +445,7 @@ function mergeError(
   errors: FlipperError[],
   newError: FlipperError,
 ): FlipperError[] {
-  const idx = errors.findIndex(error => error.message === newError.message);
+  const idx = errors.findIndex((error) => error.message === newError.message);
   const results = errors.slice();
   if (idx !== -1) {
     results[idx] = {
@@ -555,12 +555,12 @@ export function getClientById(
   clients: Client[],
   clientId: string | null | undefined,
 ): Client | undefined {
-  return clients.find(client => client.id === clientId);
+  return clients.find((client) => client.id === clientId);
 }
 
 export function canBeDefaultDevice(device: BaseDevice) {
   return !DEFAULT_DEVICE_BLACKLIST.some(
-    blacklistedDevice => device instanceof blacklistedDevice,
+    (blacklistedDevice) => device instanceof blacklistedDevice,
   );
 }
 
@@ -585,9 +585,9 @@ function updateSelection(state: Readonly<State>): State {
   if (!device) {
     device =
       state.devices.find(
-        device => device.title === state.userPreferredDevice,
+        (device) => device.title === state.userPreferredDevice,
       ) ||
-      state.devices.find(device => canBeDefaultDevice(device)) ||
+      state.devices.find((device) => canBeDefaultDevice(device)) ||
       null;
   }
   updates.selectedDevice = device;

desktop/app/src/reducers/healthchecks.tsx

@@ -82,24 +82,24 @@ export type HealthcheckReport = {
 
 function recomputeHealthcheckStatus(draft: State): void {
   draft.healthcheckReport.result = computeAggregatedResult(
-    Object.values(draft.healthcheckReport.categories).map(c => c.result),
+    Object.values(draft.healthcheckReport.categories).map((c) => c.result),
   );
 }
 
 function computeAggregatedResult(
   results: HealthcheckResult[],
 ): HealthcheckResult {
-  return results.some(r => r.status === 'IN_PROGRESS')
+  return results.some((r) => r.status === 'IN_PROGRESS')
     ? {status: 'IN_PROGRESS'}
-    : results.every(r => r.status === 'SUCCESS')
+    : results.every((r) => r.status === 'SUCCESS')
     ? {status: 'SUCCESS'}
-    : results.some(r => r.status === 'FAILED' && !r.isAcknowledged)
+    : results.some((r) => r.status === 'FAILED' && !r.isAcknowledged)
     ? {status: 'FAILED', isAcknowledged: false}
-    : results.some(r => r.status === 'FAILED')
+    : results.some((r) => r.status === 'FAILED')
     ? {status: 'FAILED', isAcknowledged: true}
-    : results.some(r => r.status === 'WARNING' && !r.isAcknowledged)
+    : results.some((r) => r.status === 'WARNING' && !r.isAcknowledged)
     ? {status: 'WARNING', isAcknowledged: false}
-    : results.some(r => r.status === 'WARNING')
+    : results.some((r) => r.status === 'WARNING')
     ? {status: 'WARNING', isAcknowledged: true}
     : {status: 'SKIPPED'};
 }
@@ -158,7 +158,7 @@ const start = produce((draft: State, healthchecks: Healthchecks) => {
             result: {status: 'IN_PROGRESS'},
             label: category.label,
             checks: createDict<HealthcheckReportItem>(
-              category.healthchecks.map(check => [
+              category.healthchecks.map((check) => [
                 check.key,
                 {
                   key: check.key,
@@ -176,11 +176,11 @@ const start = produce((draft: State, healthchecks: Healthchecks) => {
 
 const finish = produce((draft: State) => {
   Object.values(draft.healthcheckReport.categories)
-    .filter(cat => cat.result.status !== 'SKIPPED')
+    .filter((cat) => cat.result.status !== 'SKIPPED')
-    .forEach(cat => {
+    .forEach((cat) => {
       cat.result.message = undefined;
       cat.result = computeAggregatedResult(
-        Object.values(cat.checks).map(c => c.result),
+        Object.values(cat.checks).map((c) => c.result),
       );
     });
   recomputeHealthcheckStatus(draft);
@@ -191,18 +191,18 @@ const finish = produce((draft: State) => {
 
 const acknowledge = produce((draft: State) => {
   draft.acknowledgedProblems = ([] as string[]).concat(
-    ...Object.values(draft.healthcheckReport.categories).map(cat =>
+    ...Object.values(draft.healthcheckReport.categories).map((cat) =>
       Object.values(cat.checks)
         .filter(
-          chk =>
+          (chk) =>
             chk.result.status === 'FAILED' || chk.result.status === 'WARNING',
         )
-        .map(chk => chk.key),
+        .map((chk) => chk.key),
     ),
   );
-  Object.values(draft.healthcheckReport.categories).forEach(cat => {
+  Object.values(draft.healthcheckReport.categories).forEach((cat) => {
     cat.result.isAcknowledged = true;
-    Object.values(cat.checks).forEach(chk => {
+    Object.values(cat.checks).forEach((chk) => {
       chk.result.isAcknowledged = true;
     });
   });
@@ -211,9 +211,9 @@ const acknowledge = produce((draft: State) => {
 
 function setAcknowledgedProblemsToEmpty(draft: State) {
   draft.acknowledgedProblems = [];
-  Object.values(draft.healthcheckReport.categories).forEach(cat => {
+  Object.values(draft.healthcheckReport.categories).forEach((cat) => {
     cat.result.isAcknowledged = false;
-    Object.values(cat.checks).forEach(chk => {
+    Object.values(cat.checks).forEach((chk) => {
       chk.result.isAcknowledged = false;
     });
   });

desktop/app/src/reducers/pluginMessageQueue.tsx

@@ -67,7 +67,7 @@ export default function reducer(
 
     case 'CLEAR_MESSAGE_QUEUE': {
       const {pluginKey, amount} = action.payload;
-      return produce(state, draft => {
+      return produce(state, (draft) => {
         const messages = draft[pluginKey];
         if (messages) {
           messages.splice(0, amount);

desktop/app/src/reducers/plugins.tsx

@@ -61,7 +61,7 @@ export default function reducer(
   action: Actions,
 ): State {
   if (action.type === 'REGISTER_PLUGINS') {
-    return produce(state, draft => {
+    return produce(state, (draft) => {
       const {devicePlugins, clientPlugins} = draft;
       action.payload.forEach((p: PluginClass) => {
         if (devicePlugins.has(p.id) || clientPlugins.has(p.id)) {

desktop/app/src/reducers/supportForm.tsx

@@ -117,7 +117,7 @@ export class Group {
       setStaticView(require('../fb-stubs/SupportRequestFormV2').default),
     );
     const selectedApp = store.getState().connections.selectedApp;
-    const selectedClient = store.getState().connections.clients.find(o => {
+    const selectedClient = store.getState().connections.clients.find((o) => {
       return o.id === store.getState().connections.selectedApp;
     });
     let errorMessage: string | undefined = undefined;
@@ -160,10 +160,10 @@ export class Group {
           errorMessage,
           'Deeplink',
           10000,
-          payload => {
+          (payload) => {
             store.dispatch(addStatusMessage(payload));
           },
-          payload => {
+          (payload) => {
             store.dispatch(removeStatusMessage(payload));
           },
         );
@@ -175,10 +175,10 @@ export class Group {
         'Please select an app and the device from the dropdown.',
         'Deeplink',
         10000,
-        payload => {
+        (payload) => {
           store.dispatch(addStatusMessage(payload));
         },
-        payload => {
+        (payload) => {
           store.dispatch(removeStatusMessage(payload));
         },
       );
@@ -199,8 +199,8 @@ export class Group {
 
     store.dispatch(
       setSelectedPlugins(
-        this.getPluginsToSelect().filter(s => {
+        this.getPluginsToSelect().filter((s) => {
-          return pluginsList.map(s => s.id).includes(s);
+          return pluginsList.map((s) => s.id).includes(s);
         }),
       ),
     );
@@ -231,7 +231,7 @@ export class Group {
     const emptyPlugins: Array<string> = [];
     for (const plugin of this.requiredPlugins) {
       if (
-        !activePersistentPlugins.find(o => {
+        !activePersistentPlugins.find((o) => {
           return o.id === plugin;
         })
       ) {

desktop/app/src/reducers/usageTracking.tsx

@@ -56,7 +56,7 @@ export default function reducer(
       ],
     };
   } else if (action.type === 'windowIsFocused') {
-    return produce(state, draft => {
+    return produce(state, (draft) => {
       draft.timeline.push({
         type: 'WINDOW_FOCUS_CHANGE',
         time: action.payload.time,
@@ -64,7 +64,7 @@ export default function reducer(
       });
     });
   } else if (action.type === 'SELECT_PLUGIN') {
-    return produce(state, draft => {
+    return produce(state, (draft) => {
       draft.timeline.push({
         type: 'PLUGIN_SELECTED',
         time: action.payload.time,

desktop/app/src/server.tsx

@@ -90,7 +90,9 @@ class Server extends EventEmitter {
     const {insecure, secure} = this.store.getState().application.serverPorts;
     this.initialisePromise = this.certificateProvider
       .loadSecureServerConfig()
-      .then(options => (this.secureServer = this.startServer(secure, options)))
+      .then(
+        (options) => (this.secureServer = this.startServer(secure, options)),
+      )
       .then(() => {
         this.insecureServer = this.startServer(insecure);
         return;
@@ -116,12 +118,12 @@ class Server extends EventEmitter {
       let rsServer: RSocketServer<any, any> | undefined; // eslint-disable-line prefer-const
       const serverFactory = (onConnect: (socket: Socket) => void) => {
         const transportServer = sslConfig
-          ? tls.createServer(sslConfig, socket => {
+          ? tls.createServer(sslConfig, (socket) => {
               onConnect(socket);
             })
           : net.createServer(onConnect);
         transportServer
-          .on('error', err => {
+          .on('error', (err) => {
             server.emit('error', err);
             console.error(`Error opening server on port ${port}`, 'server');
             reject(err);
@@ -174,8 +176,8 @@ class Server extends EventEmitter {
       });
 
       const cleanup = () => {
-        Object.values(clients).map(p =>
+        Object.values(clients).map((p) =>
-          p.then(c => this.removeConnection(c.id)),
+          p.then((c) => this.removeConnection(c.id)),
         );
         this.store.dispatch({
           type: 'UNREGISTER_DEVICES',
@@ -201,7 +203,7 @@ class Server extends EventEmitter {
               {},
             );
             clients[app] = client;
-            client.then(c => {
+            client.then((c) => {
               ws.on('message', (m: any) => {
                 const parsed = JSON.parse(m.toString());
                 if (parsed.app === app) {
@@ -213,7 +215,7 @@ class Server extends EventEmitter {
           }
           case 'disconnect': {
             const app = message.app;
-            (clients[app] || Promise.resolve()).then(c => {
+            (clients[app] || Promise.resolve()).then((c) => {
               this.removeConnection(c.id);
               delete clients[app];
             });
@@ -252,7 +254,7 @@ class Server extends EventEmitter {
       socket,
       {app, os, device, device_id, sdk_version},
       {csr, csr_path},
-    ).then(client => {
+    ).then((client) => {
       return (resolvedClient = client);
     });
     let resolvedClient: Client | undefined;
@@ -260,7 +262,7 @@ class Server extends EventEmitter {
     socket.connectionStatus().subscribe({
       onNext(payload) {
         if (payload.kind == 'ERROR' || payload.kind == 'CLOSED') {
-          client.then(client => {
+          client.then((client) => {
             console.debug(`Device disconnected ${client.id}`, 'server');
             server.removeConnection(client.id);
           });
@@ -276,7 +278,7 @@ class Server extends EventEmitter {
         if (resolvedClient) {
           resolvedClient.onMessage(payload.data);
         } else {
-          client.then(client => {
+          client.then((client) => {
             client.onMessage(payload.data);
           });
         }
@@ -306,7 +308,7 @@ class Server extends EventEmitter {
         payload: Payload<string, any>,
       ): Single<Payload<string, any>> => {
         if (typeof payload.data !== 'string') {
-          return new Single(_ => {});
+          return new Single((_) => {});
         }
 
         let rawData;
@@ -318,7 +320,7 @@ class Server extends EventEmitter {
             'clientMessage',
             'server',
           );
-          return new Single(_ => {});
+          return new Single((_) => {});
         }
 
         const json: {
@@ -330,7 +332,7 @@ class Server extends EventEmitter {
           console.debug('CSR received from device', 'server');
 
           const {csr, destination} = json;
-          return new Single(subscriber => {
+          return new Single((subscriber) => {
             subscriber.onSubscribe(undefined);
             reportPlatformFailures(
               this.certificateProvider.processCertificateSigningRequest(
@@ -340,7 +342,7 @@ class Server extends EventEmitter {
               ),
               'processCertificateSigningRequest',
             )
-              .then(result => {
+              .then((result) => {
                 subscriber.onComplete({
                   data: JSON.stringify({
                     deviceId: result.deviceId,
@@ -352,13 +354,13 @@ class Server extends EventEmitter {
                   deviceId: result.deviceId,
                 });
               })
-              .catch(e => {
+              .catch((e) => {
                 subscriber.onError(e);
                 this.emit('client-setup-error', {client, error: e});
               });
           });
         }
-        return new Single(_ => {});
+        return new Single((_) => {});
       },
 
       // Leaving this here for a while for backwards compatibility,
@@ -388,7 +390,7 @@ class Server extends EventEmitter {
           const {csr, destination} = json;
           this.certificateProvider
             .processCertificateSigningRequest(csr, clientData.os, destination)
-            .catch(e => {
+            .catch((e) => {
               console.error(e);
             });
         }
@@ -398,11 +400,12 @@ class Server extends EventEmitter {
 
   close(): Promise<void> {
     if (this.initialisePromise) {
-      return this.initialisePromise.then(_ => {
+      return this.initialisePromise.then((_) => {
         return Promise.all([
-          this.secureServer && this.secureServer.then(server => server.stop()),
+          this.secureServer &&
+            this.secureServer.then((server) => server.stop()),
           this.insecureServer &&
-            this.insecureServer.then(server => server.stop()),
+            this.insecureServer.then((server) => server.stop()),
         ]).then(() => undefined);
       });
     }
@@ -424,7 +427,7 @@ class Server extends EventEmitter {
     // otherwise, use given device_id
     const {csr_path, csr} = csrQuery;
     return (csr_path && csr
-      ? this.certificateProvider.extractAppNameFromCSR(csr).then(appName => {
+      ? this.certificateProvider.extractAppNameFromCSR(csr).then((appName) => {
           return this.certificateProvider.getTargetDeviceId(
             query.os,
             appName,
@@ -433,7 +436,7 @@ class Server extends EventEmitter {
           );
         })
       : Promise.resolve(query.device_id)
-    ).then(csrId => {
+    ).then((csrId) => {
       query.device_id = csrId;
       query.app = appNameWithUpdateHint(query);
 
@@ -517,7 +520,7 @@ class ConnectionTracker {
     const time = Date.now();
     let entry = this.connectionAttempts.get(key) || [];
     entry.push(time);
-    entry = entry.filter(t => t >= time - this.timeWindowMillis);
+    entry = entry.filter((t) => t >= time - this.timeWindowMillis);
 
     this.connectionAttempts.set(key, entry);
     if (entry.length >= this.connectionProblemThreshold) {

desktop/app/src/ui/components/Button.tsx

@@ -114,7 +114,7 @@ const StyledButton = styled.div<{
   pulse?: boolean;
   disabled?: boolean;
   dropdown?: Array<MenuItemConstructorOptions>;
-}>(props => ({
+}>((props) => ({
   backgroundColor:
     props.windowIsFocused && !props.disabled
       ? colors.white

desktop/app/src/ui/components/ButtonGroupChain.tsx

@@ -21,7 +21,7 @@ const IconContainer = styled.div({
 });
 IconContainer.displayName = 'ButtonGroupChain:IconContainer';
 
-const ButtonGroupChainContainer = styled.div<{iconSize: number}>(props => ({
+const ButtonGroupChainContainer = styled.div<{iconSize: number}>((props) => ({
   display: 'inline-flex',
   marginLeft: 10,
   '&:first-child>*:not(:first-child):nth-child(odd)': {

desktop/app/src/ui/components/FileList.tsx

@@ -116,11 +116,11 @@ export default class FileList extends Component<FileListProps, FileListState> {
         const name = files.shift();
         if (name) {
           this.fetchFile(name)
-            .then(data => {
+            .then((data) => {
               filesSet.set(name, data);
               next();
             })
-            .catch(err => {
+            .catch((err) => {
               setState({error: err, files: EMPTY_MAP});
             });
         }
@@ -147,7 +147,7 @@ export default class FileList extends Component<FileListProps, FileListState> {
   initialFetch(props: FileListProps) {
     this.removeWatcher();
 
-    fs.access(props.src, fs.constants.R_OK, err => {
+    fs.access(props.src, fs.constants.R_OK, (err) => {
       if (err) {
         this.setState({error: err, files: EMPTY_MAP});
         return;
@@ -159,7 +159,7 @@ export default class FileList extends Component<FileListProps, FileListState> {
         this.fetchFiles();
       });
 
-      this.watcher.on('error', err => {
+      this.watcher.on('error', (err) => {
         this.setState({error: err, files: EMPTY_MAP});
         this.removeWatcher();
       });

desktop/app/src/ui/components/FileSelector.tsx

@@ -53,7 +53,7 @@ export interface Props {
 }
 
 const defaultProps: Props = {
-  onPathChanged: _ => {},
+  onPathChanged: (_) => {},
   placeholderText: '',
   defaultPath: '/',
   showHiddenFiles: false,
@@ -92,12 +92,12 @@ export default function FileSelector({
         placeholder={placeholderText}
         value={value}
         isValid={true}
-        onDrop={e => {
+        onDrop={(e) => {
           if (e.dataTransfer.files.length) {
             onChange(e.dataTransfer.files[0].path);
           }
         }}
-        onChange={e => {
+        onChange={(e) => {
           onChange(e.target.value);
         }}
       />

desktop/app/src/ui/components/Glyph.tsx

@@ -26,7 +26,7 @@ const ColoredIconCustom = styled.div<{
   size: number;
   color?: string;
   src: string;
-}>(props => ({
+}>((props) => ({
   height: props.size,
   verticalAlign: 'middle',
   width: props.size,

desktop/app/src/ui/components/LoadingIndicator.tsx

@@ -19,7 +19,7 @@ const animation = keyframes({
   },
 });
 
-const LoadingIndicator = styled.div<{size: number}>(props => ({
+const LoadingIndicator = styled.div<{size: number}>((props) => ({
   animation: `${animation} 1s infinite linear`,
   width: props.size,
   height: props.size,

desktop/app/src/ui/components/Markdown.tsx

@@ -21,7 +21,7 @@ const Row = styled.div({
   marginBottom: 5,
   lineHeight: 1.34,
 });
-const Heading = styled.div<{level: number}>(props => ({
+const Heading = styled.div<{level: number}>((props) => ({
   fontSize: props.level === 1 ? 18 : 12,
   textTransform: props.level > 1 ? 'uppercase' : undefined,
   color: props.level > 1 ? '#90949c' : undefined,

desktop/app/src/ui/components/MarkerTimeline.tsx

@@ -33,7 +33,7 @@ type MouseEventHandler = (
   event: React.MouseEvent<HTMLDivElement, MouseEvent>,
 ) => void;
 
-const Markers = styled.div<{totalTime: number}>(props => ({
+const Markers = styled.div<{totalTime: number}>((props) => ({
   position: 'relative',
   margin: 10,
   height: props.totalTime,
@@ -56,7 +56,7 @@ const Point = styled(FlexRow)<{
   threadColor: string;
   selected: boolean;
   cut: boolean;
-}>(props => ({
+}>((props) => ({
   position: 'absolute',
   top: props.positionY,
   left: 0,
@@ -187,8 +187,8 @@ export default class MarkerTimeline extends Component<Props, State> {
 
       timePoints.push({
         timestamp,
-        markerNames: points.map(p => p.label),
+        markerNames: points.map((p) => p.label),
-        markerKeys: points.map(p => p.key),
+        markerKeys: points.map((p) => p.key),
         positionY,
         isCut,
         color,

desktop/app/src/ui/components/MultiLineInput.tsx

@@ -26,7 +26,7 @@ export const multilineStyle = (props: {valid: boolean}) => ({
   },
 });
 
-const MultiLineInput = styled.textarea<{valid?: boolean}>(props => ({
+const MultiLineInput = styled.textarea<{valid?: boolean}>((props) => ({
   ...multilineStyle({valid: props.valid === undefined || props.valid}),
   padding: '0 10px',
 }));

desktop/app/src/ui/components/Orderable.tsx

@@ -45,7 +45,7 @@ OrderableContainer.displayName = 'Orderable:OrderableContainer';
 
 const OrderableItemContainer = styled.div<{
   orientation: 'vertical' | 'horizontal';
-}>(props => ({
+}>((props) => ({
   display: props.orientation === 'vertical' ? 'block' : 'inline-block',
 }));
 OrderableItemContainer.displayName = 'Orderable:OrderableItemContainer';
@@ -407,7 +407,7 @@ export default class Orderable extends React.Component<
       <OrderableContainer
         className={this.props.className}
         ref={this.setContainerRef}>
-        {order.map(key => {
+        {order.map((key) => {
           const item = items[key];
           if (item) {
             return (

desktop/app/src/ui/components/Panel.tsx

@@ -88,14 +88,14 @@ export default class Panel extends React.Component<
   static PanelContainer = styled(FlexColumn)<{
     floating?: boolean;
     collapsed?: boolean;
-  }>(props => ({
+  }>((props) => ({
     flexShrink: 0,
     padding: props.floating ? 10 : 0,
     borderBottom: props.collapsed ? 'none' : BORDER,
   }));
 
   static PanelHeader = styled(FlexBox)<{floating?: boolean; padded?: boolean}>(
-    props => ({
+    (props) => ({
       backgroundColor: '#f6f7f9',
       border: props.floating ? BORDER : 'none',
       borderBottom: BORDER,
@@ -113,7 +113,7 @@ export default class Panel extends React.Component<
   );
 
   static PanelBody = styled(FlexColumn)<{floating?: boolean; padded?: boolean}>(
-    props => ({
+    (props) => ({
       backgroundColor: '#fff',
       border: props.floating ? BORDER : 'none',
       borderBottomLeftRadius: 2,

desktop/app/src/ui/components/Popover.tsx

@@ -26,7 +26,7 @@ type Opts = {
   skewLeft?: boolean;
 };
 
-const PopoverContainer = styled(FlexColumn)<{opts?: Opts}>(props => ({
+const PopoverContainer = styled(FlexColumn)<{opts?: Opts}>((props) => ({
   backgroundColor: colors.white,
   borderRadius: 7,
   border: '1px solid rgba(0,0,0,0.3)',

desktop/app/src/ui/components/Select.tsx

@@ -24,7 +24,7 @@ const LabelText = styled(Text)({
 });
 LabelText.displayName = 'Select:LabelText';
 
-const SelectMenu = styled.select<{grow?: boolean}>(props => ({
+const SelectMenu = styled.select<{grow?: boolean}>((props) => ({
   flexGrow: props.grow ? 1 : 0,
 }));
 SelectMenu.displayName = 'Select:SelectMenu';

desktop/app/src/ui/components/Sidebar.tsx

@@ -31,7 +31,7 @@ const SidebarContainer = styled(FlexColumn)<{
   position: 'right' | 'top' | 'left' | 'bottom';
   backgroundColor?: BackgroundClipProperty;
   overflow?: boolean;
-}>(props => ({
+}>((props) => ({
   backgroundColor: props.backgroundColor || colors.macOSTitleBarBackgroundBlur,
   borderLeft: props.position === 'right' ? '1px solid #b3b3b3' : 'none',
   borderTop: props.position === 'bottom' ? '1px solid #b3b3b3' : 'none',

desktop/app/src/ui/components/SmallText.tsx

@@ -14,7 +14,7 @@ import Text from './Text';
 /**
  * Subtle text that should not draw attention
  */
-const SmallText = styled(Text)<{center?: boolean}>(props => ({
+const SmallText = styled(Text)<{center?: boolean}>((props) => ({
   color: colors.light20,
   size: 10,
   fontStyle: 'italic',

desktop/app/src/ui/components/StackTrace.tsx

@@ -126,7 +126,7 @@ export default class StackTrace extends Component<{
       return acc;
     }, {});
 
-    const columnOrder = Object.keys(COLUMNS).map(key => ({
+    const columnOrder = Object.keys(COLUMNS).map((key) => ({
       key,
       visible: Boolean(columns[key]),
     }));

desktop/app/src/ui/components/Tabs.tsx

@@ -27,7 +27,7 @@ const TabListItem = styled.div<{
   active?: boolean;
   width?: WidthProperty<number>;
   container?: boolean;
-}>(props => ({
+}>((props) => ({
   background: props.container
     ? props.active
       ? 'linear-gradient(to bottom, #67a6f7 0%, #0072FA 100%)'
@@ -251,7 +251,7 @@ export default function Tabs(props: {
           {comp.props.label}
           {closable && (
             <CloseButton // eslint-disable-next-line react/jsx-no-bind
-              ref={ref => (closeButton = ref)} // eslint-disable-next-line react/jsx-no-bind
+              ref={(ref) => (closeButton = ref)} // eslint-disable-next-line react/jsx-no-bind
               onMouseDown={() => {
                 if (isActive && onActive) {
                   const index = keys.indexOf(key);

desktop/app/src/ui/components/Text.tsx

@@ -34,7 +34,7 @@ const Text = styled.span<{
   wordWrap?: WordWrapProperty;
   whiteSpace?: WhiteSpaceProperty;
   cursor?: CursorProperty;
-}>(props => ({
+}>((props) => ({
   color: props.color ? props.color : 'inherit',
   cursor: props.cursor ? props.cursor : 'auto',
   display: 'inline',

desktop/app/src/ui/components/ToggleSwitch.tsx

@@ -88,7 +88,7 @@ export default function ToggleButton(props: Props) {
   );
   return (
     <Container
-      onClick={e => {
+      onClick={(e) => {
         setSwitching(true);
         setTimeout(() => {
           props?.onClick?.(e);

desktop/app/src/ui/components/Toolbar.tsx

@@ -18,7 +18,7 @@ import styled from '@emotion/styled';
 const Toolbar = styled(FlexRow)<{
   position?: 'bottom' | 'top';
   compact?: boolean;
-}>(props => ({
+}>((props) => ({
   backgroundColor: colors.light02,
   borderBottom:
     props.position === 'bottom'

desktop/app/src/ui/components/TooltipProvider.tsx

@@ -65,7 +65,7 @@ const TooltipBubble = styled.div<{
     maxWidth: MaxWidthProperty<number>;
     color: ColorProperty;
   };
-}>(props => ({
+}>((props) => ({
   position: 'absolute',
   zIndex: 99999999999,
   backgroundColor: props.options.backgroundColor,
@@ -101,7 +101,7 @@ const TooltipTail = styled.div<{
   options: {
     backgroundColor: BackgroundColorProperty;
   };
-}>(props => ({
+}>((props) => ({
   position: 'absolute',
   display: 'block',
   whiteSpace: 'pre',

desktop/app/src/ui/components/View.tsx

@@ -15,7 +15,7 @@ type Props = {
   maxHeight?: number;
 };
 
-const View = styled.div<Props>(props => ({
+const View = styled.div<Props>((props) => ({
   height: props.grow ? '100%' : 'auto',
   overflow: props.scrollable ? 'auto' : 'visible',
   position: 'relative',

desktop/app/src/ui/components/data-inspector/DataDescription.tsx

@@ -50,7 +50,7 @@ const NumberValue = styled.span({
 });
 NumberValue.displayName = 'DataDescription:NumberValue';
 
-const ColorBox = styled.span<{color: string}>(props => ({
+const ColorBox = styled.span<{color: string}>((props) => ({
   backgroundColor: props.color,
   boxShadow: 'inset 0 0 1px rgba(0, 0, 0, 1)',
   display: 'inline-block',
@@ -375,9 +375,9 @@ class ColorEditor extends Component<{
             <CompactPicker
               color={colorInfo}
               colors={this.props.colorSet
-                .filter(x => x != 0)
+                .filter((x) => x != 0)
                 .map(parseColor)
-                .map(rgba => {
+                .map((rgba) => {
                   if (!rgba) {
                     return '';
                   }
@@ -527,7 +527,7 @@ function parseColor(
   }
 
   const size = val.length;
-  const [r, g, b] = parts.map(num => {
+  const [r, g, b] = parts.map((num) => {
     if (size === 3) {
       return parseInt(num + num, 16);
     } else {

desktop/app/src/ui/components/data-inspector/DataInspector.tsx

@@ -26,7 +26,7 @@ import {TooltipOptions} from '../TooltipProvider';
 export {DataValueExtractor} from './DataPreview';
 
 const BaseContainer = styled.div<{depth?: number; disabled?: boolean}>(
-  props => ({
+  (props) => ({
     fontFamily: 'Menlo, monospace',
     fontSize: 11,
     lineHeight: '17px',
@@ -277,10 +277,10 @@ function isComponentExpanded(
   if (diffType === 'object') {
     const sortedDataValues = Object.keys(data)
       .sort()
-      .map(key => data[key]);
+      .map((key) => data[key]);
     const sortedDiffValues = Object.keys(diffValue)
       .sort()
-      .map(key => diffValue[key]);
+      .map((key) => diffValue[key]);
     if (JSON.stringify(sortedDataValues) !== JSON.stringify(sortedDiffValues)) {
       return true;
     }

desktop/app/src/ui/components/desktop-toolbar.tsx

@@ -36,7 +36,7 @@ export function DesktopDropdown(props: {
 }) {
   return (
     <DesktopDropdownContainer>
-      {React.Children.map(props.children, child => {
+      {React.Children.map(props.children, (child) => {
         return (
           child &&
           React.cloneElement(child, {

desktop/app/src/ui/components/elements-inspector/elements.tsx

@@ -51,7 +51,7 @@ const backgroundColorHover = (props: {selected: boolean; focused: boolean}) => {
   }
 };
 
-const ElementsRowContainer = styled(ContextMenu)<any>(props => ({
+const ElementsRowContainer = styled(ContextMenu)<any>((props) => ({
   flexDirection: 'row',
   alignItems: 'center',
   backgroundColor: backgroundColor(props),
@@ -85,7 +85,7 @@ const ElementsRowDecoration = styled(FlexRow)({
 });
 ElementsRowDecoration.displayName = 'Elements:ElementsRowDecoration';
 
-const ElementsLine = styled.div<{childrenCount: number}>(props => ({
+const ElementsLine = styled.div<{childrenCount: number}>((props) => ({
   backgroundColor: colors.light20,
   height: props.childrenCount * ROW_HEIGHT - 4,
   position: 'absolute',
@@ -136,7 +136,7 @@ class PartialHighlight extends PureComponent<{
   highlighted: string | undefined | null;
   content: string;
 }> {
-  static HighlightedText = styled.span<{selected: boolean}>(props => ({
+  static HighlightedText = styled.span<{selected: boolean}>((props) => ({
     backgroundColor: colors.lemon,
     color: props.selected ? `${colors.grapeDark3} !important` : 'auto',
   }));
@@ -270,7 +270,7 @@ class ElementsRow extends PureComponent<ElementsRowProps, ElementsRowState> {
       },
     ];
     items = items.concat(
-      props.element.attributes.map(o => {
+      props.element.attributes.map((o) => {
         return {
           label: `Copy ${o.name}`,
           click: () => {
@@ -341,7 +341,7 @@ class ElementsRow extends PureComponent<ElementsRowProps, ElementsRowState> {
     }
 
     const attributes = element.attributes
-      ? element.attributes.map(attr => (
+      ? element.attributes.map((attr) => (
           <ElementsRowAttribute
             key={attr.name}
             name={attr.name}

desktop/app/src/ui/components/elements-inspector/sidebar.tsx

@@ -123,7 +123,7 @@ export class InspectorSidebar extends Component<Props, State> {
 
     const sections: Array<any> =
       (extensions &&
-        extensions.map(ext =>
+        extensions.map((ext) =>
           ext(
             this.props.client,
             this.props.realClient,

desktop/app/src/ui/components/searchable/FilterToken.tsx

@@ -17,7 +17,7 @@ import React from 'react';
 import {ColorProperty} from 'csstype';
 
 const Token = styled(Text)<{focused?: boolean; color?: ColorProperty}>(
-  props => ({
+  (props) => ({
     display: 'inline-flex',
     alignItems: 'center',
     backgroundColor: props.focused
@@ -43,7 +43,7 @@ Token.displayName = 'FilterToken:Token';
 const Key = styled(Text)<{
   type: 'exclude' | 'include' | 'enum';
   focused?: boolean;
-}>(props => ({
+}>((props) => ({
   position: 'relative',
   fontWeight: 500,
   paddingRight: 12,
@@ -73,7 +73,7 @@ const Value = styled(Text)({
 });
 Value.displayName = 'FilterToken:Value';
 
-const Chevron = styled.div<{focused?: boolean}>(props => ({
+const Chevron = styled.div<{focused?: boolean}>((props) => ({
   border: 0,
   paddingLeft: 3,
   paddingRight: 1,
@@ -187,7 +187,7 @@ export default class FilterToken extends PureComponent<Props> {
     if (filter.type === 'enum') {
       let {value} = filter;
       if (value.indexOf(newValue) > -1) {
-        value = value.filter(v => v !== newValue);
+        value = value.filter((v) => v !== newValue);
       } else {
         value = value.concat([newValue]);
       }
@@ -214,7 +214,7 @@ export default class FilterToken extends PureComponent<Props> {
 
     if (filter.type === 'enum') {
       const getEnum = (value: string) =>
-        filter.enum.find(e => e.value === value);
+        filter.enum.find((e) => e.value === value);
       const firstValue = getEnum(filter.value[0]);
       const secondValue = getEnum(filter.value[1]);
       if (filter.value.length === 0) {

desktop/app/src/ui/components/searchable/Searchable.tsx

@@ -44,7 +44,7 @@ export const SearchInput = styled(Input)<{
   focus?: boolean;
   regex?: boolean;
   isValidInput?: boolean;
-}>(props => ({
+}>((props) => ({
   border: props.focus ? '1px solid black' : 0,
   ...(props.regex ? {fontFamily: 'monospace'} : {}),
   padding: 0,
@@ -186,9 +186,9 @@ const Searchable = (
         if (defaultFilters != null) {
           // merge default filter with persisted filters
           const savedStateFilters = savedState.filters;
-          defaultFilters.forEach(defaultFilter => {
+          defaultFilters.forEach((defaultFilter) => {
             const filterIndex = savedStateFilters.findIndex(
-              f => f.key === defaultFilter.key,
+              (f) => f.key === defaultFilter.key,
             );
             const savedDefaultFilter = savedStateFilters[filterIndex];
             if (filterIndex > -1 && savedDefaultFilter.type === 'enum') {
@@ -196,11 +196,11 @@ const Searchable = (
                 savedDefaultFilter.enum = defaultFilter.enum;
               }
               const filters = new Set(
-                savedDefaultFilter.enum.map(filter => filter.value),
+                savedDefaultFilter.enum.map((filter) => filter.value),
               );
               savedStateFilters[
                 filterIndex
-              ].value = savedDefaultFilter.value.filter(value =>
+              ].value = savedDefaultFilter.value.filter((value) =>
                 filters.has(value),
               );
             }
@@ -281,9 +281,7 @@ const Searchable = (
         // the table (in case there is more than one table rendered at a time)
         return (
           'TABLE_COLUMNS_' +
-          Object.keys(this.props.columns)
+          Object.keys(this.props.columns).join('_').toUpperCase()
-            .join('_')
-            .toUpperCase()
         );
       }
     };
@@ -374,7 +372,7 @@ const Searchable = (
 
     addFilter = (filter: Filter) => {
       const filterIndex = this.state.filters.findIndex(
-        f => f.key === filter.key,
+        (f) => f.key === filter.key,
       );
       if (filterIndex > -1) {
         const filters = [...this.state.filters];
@@ -457,7 +455,7 @@ const Searchable = (
     clear = () =>
       this.setState({
         filters: this.state.filters.filter(
-          f => f.type === 'enum' && f.persistent === true,
+          (f) => f.type === 'enum' && f.persistent === true,
         ),
         searchTerm: '',
       });

desktop/app/src/ui/components/searchable/SearchableTable.tsx

@@ -54,12 +54,12 @@ const rowMatchesFilters = (filters: Array<Filter>, row: TableBodyRow) =>
         return true;
       }
     })
-    .every(x => x === true);
+    .every((x) => x === true);
 
 function rowMatchesRegex(values: Array<string>, regex: string): boolean {
   try {
     const re = new RegExp(regex);
-    return values.some(x => re.test(x));
+    return values.some((x) => re.test(x));
   } catch (e) {
     return false;
   }
@@ -74,7 +74,7 @@ function rowMatchesSearchTerm(
   if (searchTerm == null || searchTerm.length === 0) {
     return true;
   }
-  const rowValues = Object.keys(row.columns).map(key =>
+  const rowValues = Object.keys(row.columns).map((key) =>
     textContent(row.columns[key].value),
   );
   if (isBodySearchEnabled) {
@@ -91,7 +91,7 @@ function rowMatchesSearchTerm(
   if (isRegex) {
     return rowMatchesRegex(rowValues, searchTerm);
   }
-  return rowValues.some(x =>
+  return rowValues.some((x) =>
     x.toLowerCase().includes(searchTerm.toLowerCase()),
   );
 }

desktop/app/src/ui/components/searchable/SearchableTable_immutable.tsx

@@ -48,12 +48,12 @@ const rowMatchesFilters = (filters: Array<Filter>, row: TableBodyRow) =>
         return true;
       }
     })
-    .every(x => x === true);
+    .every((x) => x === true);
 
 function rowMatchesRegex(values: Array<string>, regex: string): boolean {
   try {
     const re = new RegExp(regex);
-    return values.some(x => re.test(x));
+    return values.some((x) => re.test(x));
   } catch (e) {
     return false;
   }
@@ -67,7 +67,7 @@ function rowMatchesSearchTerm(
   if (searchTerm == null || searchTerm.length === 0) {
     return true;
   }
-  const rowValues = Object.keys(row.columns).map(key =>
+  const rowValues = Object.keys(row.columns).map((key) =>
     textContent(row.columns[key].value),
   );
   if (row.filterValue != null) {
@@ -76,7 +76,7 @@ function rowMatchesSearchTerm(
   if (isRegex) {
     return rowMatchesRegex(rowValues, searchTerm);
   }
-  return rowValues.some(x =>
+  return rowValues.some((x) =>
     x.toLowerCase().includes(searchTerm.toLowerCase()),
   );
 }

desktop/app/src/ui/components/table/ManagedTable.tsx

@@ -148,7 +148,7 @@ type ManagedTableState = {
   shouldScrollToBottom: boolean;
 };
 
-const Container = styled(FlexColumn)<{canOverflow?: boolean}>(props => ({
+const Container = styled(FlexColumn)<{canOverflow?: boolean}>((props) => ({
   overflow: props.canOverflow ? 'scroll' : 'visible',
   flexGrow: 1,
 }));
@@ -169,10 +169,7 @@ export class ManagedTable extends React.Component<
 
   getTableKey = (): string => {
     return (
-      'TABLE_COLUMNS_' +
+      'TABLE_COLUMNS_' + Object.keys(this.props.columns).join('_').toUpperCase()
-      Object.keys(this.props.columns)
-        .join('_')
-        .toUpperCase()
     );
   };
 
@@ -195,7 +192,7 @@ export class ManagedTable extends React.Component<
     const columnOrder =
       JSON.parse(window.localStorage.getItem(this.getTableKey()) || 'null') ||
       this.props.columnOrder ||
-      Object.keys(this.props.columns).map(key => ({key, visible: true}));
+      Object.keys(this.props.columns).map((key) => ({key, visible: true}));
     this.state = {
       columnOrder,
       columnKeys: this.computeColumnKeys(columnOrder),
@@ -288,7 +285,7 @@ export class ManagedTable extends React.Component<
   }
 
   computeColumnKeys(columnOrder: TableColumnOrder) {
-    return columnOrder.map(k => (k.visible ? k.key : null)).filter(notNull);
+    return columnOrder.map((k) => (k.visible ? k.key : null)).filter(notNull);
   }
 
   scrollToHighlightedRows = () => {
@@ -335,7 +332,7 @@ export class ManagedTable extends React.Component<
       const {highlightedRows} = this.state;
       const lastItemKey = Array.from(this.state.highlightedRows).pop();
       const lastItemIndex = this.props.rows.findIndex(
-        row => row.key === lastItemKey,
+        (row) => row.key === lastItemKey,
       );
       const newIndex = Math.min(
         rows.length - 1,
@@ -516,8 +513,8 @@ export class ManagedTable extends React.Component<
             {
               label: 'Copy cell',
               submenu: this.state.columnOrder
-                .filter(c => c.visible)
+                .filter((c) => c.visible)
-                .map(c => c.key)
+                .map((c) => c.key)
                 .map((column, index) => ({
                   label: this.props.columns[column].value,
                   click: () => {
@@ -559,9 +556,9 @@ export class ManagedTable extends React.Component<
 
   getHeaderText = (): string => {
     return this.state.columnOrder
-      .filter(c => c.visible)
+      .filter((c) => c.visible)
-      .map(c => c.key)
+      .map((c) => c.key)
-      .map(key => this.props.columns[key].value)
+      .map((key) => this.props.columns[key].value)
       .join('\t');
   };
 
@@ -572,7 +569,7 @@ export class ManagedTable extends React.Component<
       return '';
     }
     return this.props.rows
-      .filter(row => highlightedRows.has(row.key))
+      .filter((row) => highlightedRows.has(row.key))
       .map(
         (row: TableBodyRow) =>
           row.copyText || this.getTextContentOfRow(row.key).join('\t'),
@@ -581,7 +578,7 @@ export class ManagedTable extends React.Component<
   };
 
   getTextContentOfRow = (key: string): Array<string> => {
-    const row = this.props.rows.find(row => row.key === key);
+    const row = this.props.rows.find((row) => row.key === key);
     if (!row) {
       return [];
     }
@@ -708,7 +705,7 @@ export class ManagedTable extends React.Component<
                   }>
                   <List
                     itemCount={rows.length}
-                    itemSize={index =>
+                    itemSize={(index) =>
                       (rows[index] && rows[index].height) ||
                       rowLineHeight ||
                       DEFAULT_ROW_HEIGHT

desktop/app/src/ui/components/table/ManagedTable_immutable.tsx

@@ -141,7 +141,7 @@ type ManagedTableState = {
   shouldScrollToBottom: boolean;
 };
 
-const Container = styled(FlexColumn)<{canOverflow?: boolean}>(props => ({
+const Container = styled(FlexColumn)<{canOverflow?: boolean}>((props) => ({
   overflow: props.canOverflow ? 'scroll' : 'visible',
   flexGrow: 1,
 }));
@@ -161,10 +161,7 @@ class ManagedTable extends React.Component<
 
   getTableKey = (): string => {
     return (
-      'TABLE_COLUMNS_' +
+      'TABLE_COLUMNS_' + Object.keys(this.props.columns).join('_').toUpperCase()
-      Object.keys(this.props.columns)
-        .join('_')
-        .toUpperCase()
     );
   };
 
@@ -172,7 +169,7 @@ class ManagedTable extends React.Component<
     columnOrder:
       JSON.parse(window.localStorage.getItem(this.getTableKey()) || 'null') ||
       this.props.columnOrder ||
-      Object.keys(this.props.columns).map(key => ({key, visible: true})),
+      Object.keys(this.props.columns).map((key) => ({key, visible: true})),
     columnSizes:
       this.props.tableKey && globalTableState[this.props.tableKey]
         ? globalTableState[this.props.tableKey]
@@ -316,7 +313,7 @@ class ManagedTable extends React.Component<
       const {highlightedRows} = this.state;
       const lastItemKey = Array.from(this.state.highlightedRows).pop();
       const lastItemIndex = this.props.rows.findIndex(
-        row => row.key === lastItemKey,
+        (row) => row.key === lastItemKey,
       );
       const newIndex = Math.min(
         rows.size - 1,
@@ -497,8 +494,8 @@ class ManagedTable extends React.Component<
             {
               label: 'Copy cell',
               submenu: this.state.columnOrder
-                .filter(c => c.visible)
+                .filter((c) => c.visible)
-                .map(c => c.key)
+                .map((c) => c.key)
                 .map((column, index) => ({
                   label: this.props.columns[column].value,
                   click: () => {
@@ -540,9 +537,9 @@ class ManagedTable extends React.Component<
 
   getHeaderText = (): string => {
     return this.state.columnOrder
-      .filter(c => c.visible)
+      .filter((c) => c.visible)
-      .map(c => c.key)
+      .map((c) => c.key)
-      .map(key => this.props.columns[key].value)
+      .map((key) => this.props.columns[key].value)
       .join('\t');
   };
 
@@ -553,7 +550,7 @@ class ManagedTable extends React.Component<
       return '';
     }
     return this.props.rows
-      .filter(row => highlightedRows.has(row.key))
+      .filter((row) => highlightedRows.has(row.key))
       .map(
         (row: TableBodyRow) =>
           row.copyText || this.getTextContentOfRow(row.key).join('\t'),
@@ -562,7 +559,7 @@ class ManagedTable extends React.Component<
   };
 
   getTextContentOfRow = (key: string): Array<string> => {
-    const row = this.props.rows.find(row => row.key === key);
+    const row = this.props.rows.find((row) => row.key === key);
     if (!row) {
       return [];
     }
@@ -606,7 +603,7 @@ class ManagedTable extends React.Component<
     const {onAddFilter, multiline, zebra, rows} = this.props;
     const {columnOrder, columnSizes, highlightedRows} = this.state;
     const columnKeys = columnOrder
-      .map(k => (k.visible ? k.key : null))
+      .map((k) => (k.visible ? k.key : null))
       .filter(notNull);
 
     const row = rows.get(index);
@@ -619,8 +616,8 @@ class ManagedTable extends React.Component<
         key={row.key}
         columnSizes={columnSizes}
         columnKeys={columnKeys}
-        onMouseDown={e => this.onHighlight(e, row, index)}
+        onMouseDown={(e) => this.onHighlight(e, row, index)}
-        onMouseEnter={e => this.onMouseEnterRow(e, row, index)}
+        onMouseEnter={(e) => this.onMouseEnterRow(e, row, index)}
         multiline={multiline}
         rowLineHeight={24}
         highlighted={highlightedRows.has(row.key)}
@@ -690,7 +687,7 @@ class ManagedTable extends React.Component<
                   }>
                   <List
                     itemCount={rows.size}
-                    itemSize={index =>
+                    itemSize={(index) =>
                       (rows.get(index) && rows.get(index)!.height) ||
                       rowLineHeight ||
                       DEFAULT_ROW_HEIGHT

desktop/app/src/ui/components/table/TableHead.tsx

@@ -47,7 +47,7 @@ const TableHeaderColumnContainer = styled.div({
 TableHeaderColumnContainer.displayName = 'TableHead:TableHeaderColumnContainer';
 
 const TableHeadContainer = styled(FlexRow)<{horizontallyScrollable?: boolean}>(
-  props => ({
+  (props) => ({
     borderBottom: `1px solid ${colors.sectionHeaderBorder}`,
     color: colors.light50,
     flexShrink: 0,
@@ -63,7 +63,7 @@ const TableHeadContainer = styled(FlexRow)<{horizontallyScrollable?: boolean}>(
 TableHeadContainer.displayName = 'TableHead:TableHeadContainer';
 
 const TableHeadColumnContainer = styled.div<{width: string | number}>(
-  props => ({
+  (props) => ({
     position: 'relative',
     backgroundColor: colors.white,
     flexShrink: props.width === 'flex' ? 1 : 0,
@@ -211,13 +211,13 @@ export default class TableHead extends PureComponent<{
 }> {
   buildContextMenu = (): MenuItemConstructorOptions[] => {
     const visibles = this.props.columnOrder
-      .map(c => (c.visible ? c.key : null))
+      .map((c) => (c.visible ? c.key : null))
       .filter(Boolean)
       .reduce((acc, cv) => {
         acc.add(cv);
         return acc;
       }, new Set());
-    return Object.keys(this.props.columns).map(key => {
+    return Object.keys(this.props.columns).map((key) => {
       const visible = visibles.has(key);
       return {
         label: this.props.columns[key].value,

desktop/app/src/ui/components/table/TableRow.tsx

@@ -59,7 +59,7 @@ const backgroundColor = (props: TableBodyRowContainerProps) => {
 };
 
 const TableBodyRowContainer = styled(FlexRow)<TableBodyRowContainerProps>(
-  props => ({
+  (props) => ({
     backgroundColor: backgroundColor(props),
     boxShadow: props.zebra ? 'none' : 'inset 0 -1px #E9EBEE',
     color: props.highlighted ? colors.white : props.color || undefined,
@@ -173,7 +173,7 @@ export default class TableRow extends React.PureComponent<Props> {
         highlightOnHover={row.highlightOnHover}
         data-key={row.key}
         {...row.style}>
-        {columnKeys.map(key => {
+        {columnKeys.map((key) => {
           const col = row.columns[key];
 
           const isFilterable = Boolean(col && col.isFilterable);

desktop/app/src/ui/components/table/TypeBasedValueRenderer.tsx

@@ -37,7 +37,7 @@ const NonWrappingText = styled(Text)({
 });
 NonWrappingText.displayName = 'TypeBasedValueRenderer:NonWrappingText';
 
-const BooleanValue = styled(NonWrappingText)<{active?: boolean}>(props => ({
+const BooleanValue = styled(NonWrappingText)<{active?: boolean}>((props) => ({
   '&::before': {
     content: '""',
     display: 'inline-block',

desktop/app/src/utils/CertificateProvider.tsx

@@ -101,8 +101,8 @@ export default class CertificateProvider {
     }
     this.ensureOpenSSLIsAvailable();
     return this.certificateSetup
-      .then(_ => this.getCACertificate())
+      .then((_) => this.getCACertificate())
-      .then(caCert =>
+      .then((caCert) =>
         this.deployFileToMobileApp(
           appDirectory,
           deviceCAcertFile,
@@ -111,8 +111,8 @@ export default class CertificateProvider {
           os,
         ),
       )
-      .then(_ => this.generateClientCertificate(csr))
+      .then((_) => this.generateClientCertificate(csr))
-      .then(clientCert =>
+      .then((clientCert) =>
         this.deployFileToMobileApp(
           appDirectory,
           deviceClientCertFile,
@@ -121,9 +121,9 @@ export default class CertificateProvider {
           os,
         ),
       )
-      .then(_ => this.extractAppNameFromCSR(csr))
+      .then((_) => this.extractAppNameFromCSR(csr))
-      .then(appName => this.getTargetDeviceId(os, appName, appDirectory, csr))
+      .then((appName) => this.getTargetDeviceId(os, appName, appDirectory, csr))
-      .then(deviceId => {
+      .then((deviceId) => {
         return {
           deviceId,
         };
@@ -170,7 +170,7 @@ export default class CertificateProvider {
   generateClientCertificate(csr: string): Promise<string> {
     console.debug('Creating new client cert', logTag);
 
-    return this.writeToTempFile(csr).then(path => {
+    return this.writeToTempFile(csr).then((path) => {
       return openssl('x509', {
         req: true,
         in: path,
@@ -200,7 +200,7 @@ export default class CertificateProvider {
     const appNamePromise = this.extractAppNameFromCSR(csr);
 
     if (os === 'Android') {
-      const deviceIdPromise = appNamePromise.then(app =>
+      const deviceIdPromise = appNamePromise.then((app) =>
         this.getTargetAndroidDeviceId(app, destination, csr),
       );
       return Promise.all([
@@ -219,18 +219,18 @@ export default class CertificateProvider {
     }
     if (os === 'iOS' || os === 'windows' || os == 'MacOS') {
       return promisify(fs.writeFile)(destination + filename, contents).catch(
-        err => {
+        (err) => {
           if (os === 'iOS') {
             // Writing directly to FS failed. It's probably a physical device.
             const relativePathInsideApp = this.getRelativePathInAppContainer(
               destination,
             );
             return appNamePromise
-              .then(appName =>
+              .then((appName) =>
                 this.getTargetiOSDeviceId(appName, destination, csr),
               )
-              .then(udid => {
+              .then((udid) => {
-                return appNamePromise.then(appName =>
+                return appNamePromise.then((appName) =>
                   this.pushFileToiOSDevice(
                     udid,
                     appName,
@@ -258,7 +258,7 @@ export default class CertificateProvider {
     filename: string,
     contents: string,
   ): Promise<void> {
-    return tmpDir({unsafeCleanup: true}).then(dir => {
+    return tmpDir({unsafeCleanup: true}).then((dir) => {
       const filePath = path.resolve(dir, filename);
       promisify(fs.writeFile)(filePath, contents).then(() =>
         iosUtil.push(udid, filePath, bundleId, destination),
@@ -272,22 +272,22 @@ export default class CertificateProvider {
     csr: string,
   ): Promise<string> {
     return this.adb
-      .then(client => client.listDevices())
+      .then((client) => client.listDevices())
-      .then(devices => {
+      .then((devices) => {
         if (devices.length === 0) {
           throw new Error('No Android devices found');
         }
-        const deviceMatchList = devices.map(device =>
+        const deviceMatchList = devices.map((device) =>
           this.androidDeviceHasMatchingCSR(
             deviceCsrFilePath,
             device.id,
             appName,
             csr,
           )
-            .then(isMatch => {
+            .then((isMatch) => {
               return {id: device.id, isMatch, error: null};
             })
-            .catch(e => {
+            .catch((e) => {
               console.error(
                 `Unable to check for matching CSR in ${device.id}:${appName}`,
                 logTag,
@@ -295,10 +295,10 @@ export default class CertificateProvider {
               return {id: device.id, isMatch: false, error: e};
             }),
         );
-        return Promise.all(deviceMatchList).then(devices => {
+        return Promise.all(deviceMatchList).then((devices) => {
-          const matchingIds = devices.filter(m => m.isMatch).map(m => m.id);
+          const matchingIds = devices.filter((m) => m.isMatch).map((m) => m.id);
           if (matchingIds.length == 0) {
-            const erroredDevice = devices.find(d => d.error);
+            const erroredDevice = devices.find((d) => d.error);
             if (erroredDevice) {
               throw erroredDevice.error;
             }
@@ -325,22 +325,22 @@ export default class CertificateProvider {
       // It's a simulator, the deviceId is in the filepath.
       return Promise.resolve(matches[1]);
     }
-    return iosUtil.targets().then(targets => {
+    return iosUtil.targets().then((targets) => {
       if (targets.length === 0) {
         throw new Error('No iOS devices found');
       }
-      const deviceMatchList = targets.map(target =>
+      const deviceMatchList = targets.map((target) =>
         this.iOSDeviceHasMatchingCSR(
           deviceCsrFilePath,
           target.udid,
           appName,
           csr,
-        ).then(isMatch => {
+        ).then((isMatch) => {
           return {id: target.udid, isMatch};
         }),
       );
-      return Promise.all(deviceMatchList).then(devices => {
+      return Promise.all(deviceMatchList).then((devices) => {
-        const matchingIds = devices.filter(m => m.isMatch).map(m => m.id);
+        const matchingIds = devices.filter((m) => m.isMatch).map((m) => m.id);
         if (matchingIds.length == 0) {
           throw new Error(`No matching device found for app: ${appName}`);
         }
@@ -356,7 +356,7 @@ export default class CertificateProvider {
     csr: string,
   ): Promise<boolean> {
     return this.adb
-      .then(adbClient =>
+      .then((adbClient) =>
         androidUtil.pull(
           adbClient,
           deviceId,
@@ -364,7 +364,7 @@ export default class CertificateProvider {
           directory + csrFileName,
         ),
       )
-      .then(deviceCsr => {
+      .then((deviceCsr) => {
         // Santitize both of the string before comparation
         // The csr string extraction on client side return string in both way
         return (
@@ -384,14 +384,14 @@ export default class CertificateProvider {
       path.resolve(directory, csrFileName),
     );
     return tmpDir({unsafeCleanup: true})
-      .then(dir => {
+      .then((dir) => {
         return iosUtil
           .pull(deviceId, originalFile, bundleId, path.join(dir, csrFileName))
           .then(() => dir);
       })
-      .then(dir => {
+      .then((dir) => {
         return promisify(fs.readdir)(dir)
-          .then(items => {
+          .then((items) => {
             if (items.length > 1) {
               throw new Error('Conflict in temp dir');
             }
@@ -400,14 +400,14 @@ export default class CertificateProvider {
             }
             return items[0];
           })
-          .then(fileName => {
+          .then((fileName) => {
             const copiedFile = path.resolve(dir, fileName);
-            return promisify(fs.readFile)(copiedFile).then(data =>
+            return promisify(fs.readFile)(copiedFile).then((data) =>
               this.santitizeString(data.toString()),
             );
           });
       })
-      .then(csrFromDevice => csrFromDevice === this.santitizeString(csr));
+      .then((csrFromDevice) => csrFromDevice === this.santitizeString(csr));
   }
 
   santitizeString(csrString: string): string {
@@ -416,20 +416,20 @@ export default class CertificateProvider {
 
   extractAppNameFromCSR(csr: string): Promise<string> {
     return this.writeToTempFile(csr)
-      .then(path =>
+      .then((path) =>
         openssl('req', {
           in: path,
           noout: true,
           subject: true,
           nameopt: true,
           RFC2253: false,
-        }).then(subject => {
+        }).then((subject) => {
           return [path, subject];
         }),
       )
       .then(([path, subject]) => {
         return new Promise<string>(function (resolve, reject) {
-          fs.unlink(path, err => {
+          fs.unlink(path, (err) => {
             if (err) {
               reject(err);
             } else {
@@ -438,14 +438,14 @@ export default class CertificateProvider {
           });
         });
       })
-      .then(subject => {
+      .then((subject) => {
         const matches = subject.trim().match(x509SubjectCNRegex);
         if (!matches || matches.length < 2) {
           throw new Error(`Cannot extract CN from ${subject}`);
         }
         return matches[1];
       })
-      .then(appName => {
+      .then((appName) => {
         if (!appName.match(allowedAppNameRegex)) {
           throw new Error(
             `Disallowed app name in CSR: ${appName}. Only alphanumeric characters and '.' allowed.`,
@@ -490,22 +490,19 @@ export default class CertificateProvider {
       in: filename,
     })
       .then(() => undefined)
-      .catch(e => {
+      .catch((e) => {
         console.warn(`Certificate will expire soon: ${filename}`, logTag);
         throw e;
       })
-      .then(_ =>
+      .then((_) =>
         openssl('x509', {
           enddate: true,
           in: filename,
           noout: true,
         }),
       )
-      .then(endDateOutput => {
+      .then((endDateOutput) => {
-        const dateString = endDateOutput
+        const dateString = endDateOutput.trim().split('=')[1].trim();
-          .trim()
-          .split('=')[1]
-          .trim();
         const expiryDate = Date.parse(dateString);
         if (isNaN(expiryDate)) {
           console.error(
@@ -526,7 +523,7 @@ export default class CertificateProvider {
       [key: string]: any;
     } = {CAfile: caCert};
     options[serverCert] = false;
-    return openssl('verify', options).then(output => {
+    return openssl('verify', options).then((output) => {
       const verified = output.match(/[^:]+: OK/);
       if (!verified) {
         // This should never happen, but if it does, we need to notice so we can
@@ -542,7 +539,7 @@ export default class CertificateProvider {
     }
     console.log('Generating new CA', logTag);
     return openssl('genrsa', {out: caKey, '2048': false})
-      .then(_ =>
+      .then((_) =>
         openssl('req', {
           new: true,
           x509: true,
@@ -551,7 +548,7 @@ export default class CertificateProvider {
           out: caCert,
         }),
       )
-      .then(_ => undefined);
+      .then((_) => undefined);
   }
 
   ensureServerCertExists(): Promise<void> {
@@ -572,11 +569,11 @@ export default class CertificateProvider {
 
   generateServerCertificate(): Promise<void> {
     return this.ensureCertificateAuthorityExists()
-      .then(_ => {
+      .then((_) => {
         console.warn('Creating new server cert', logTag);
       })
-      .then(_ => openssl('genrsa', {out: serverKey, '2048': false}))
+      .then((_) => openssl('genrsa', {out: serverKey, '2048': false}))
-      .then(_ =>
+      .then((_) =>
         openssl('req', {
           new: true,
           key: serverKey,
@@ -584,7 +581,7 @@ export default class CertificateProvider {
           subj: serverSubject,
         }),
       )
-      .then(_ =>
+      .then((_) =>
         openssl('x509', {
           req: true,
           in: serverCsr,
@@ -595,12 +592,12 @@ export default class CertificateProvider {
           out: serverCert,
         }),
       )
-      .then(_ => undefined);
+      .then((_) => undefined);
   }
 
   writeToTempFile(content: string): Promise<string> {
-    return tmpFile().then(path =>
+    return tmpFile().then((path) =>
-      promisify(fs.writeFile)(path, content).then(_ => path),
+      promisify(fs.writeFile)(path, content).then((_) => path),
     );
   }
 }