diff --git a/.eslintrc.js b/.eslintrc.js
index b00107a516e..b787fa8e9a6 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -23,6 +23,7 @@ module.exports = {
     '@typescript-eslint/promise-function-async': 'off',
 
     // TODO(mc, 2021-01-29): fix these and remove warning overrides
+    '@typescript-eslint/default-param-last': 'warn',
     'dot-notation': 'warn',
     'lines-between-class-members': 'warn',
     'array-callback-return': 'warn',
@@ -67,6 +68,10 @@ module.exports = {
         '@typescript-eslint/prefer-optional-chain': 'warn',
         '@typescript-eslint/restrict-plus-operands': 'warn',
         '@typescript-eslint/restrict-template-expressions': 'warn',
+        '@typescript-eslint/naming-convention': 'warn',
+        '@typescript-eslint/no-floating-promises': 'warn',
+        '@typescript-eslint/no-unnecessary-type-assertion': 'warn',
+        '@typescript-eslint/no-unnecessary-boolean-literal-compare': 'warn',
       },
     },
     {
@@ -89,6 +94,7 @@ module.exports = {
         'jest/consistent-test-it': 'error',
         '@typescript-eslint/consistent-type-assertions': 'off',
         '@typescript-eslint/no-var-requires': 'off',
+        '@typescript-eslint/explicit-function-return-type': 'off',
 
         // TODO(mc, 2021-01-29): fix these and remove warning overrides
         'jest/no-deprecated-functions': 'warn',
diff --git a/Makefile b/Makefile
index 2b462b7e369..37af547380b 100755
--- a/Makefile
+++ b/Makefile
@@ -226,7 +226,7 @@ circular-dependencies-js:
 	madge $(and $(CI),--no-spinner --no-color) --circular protocol-designer/src/index.js
 	madge $(and $(CI),--no-spinner --no-color) --circular step-generation/src/index.js
 	madge $(and $(CI),--no-spinner --no-color) --circular labware-library/src/index.tsx
-	madge $(and $(CI),--no-spinner --no-color) --circular app/src/index.js
+	madge $(and $(CI),--no-spinner --no-color) --circular app/src/index.tsx
 
 .PHONY: bump
 bump:
diff --git a/app/.gitignore b/app/.gitignore
new file mode 100644
index 00000000000..34100bf1852
--- /dev/null
+++ b/app/.gitignore
@@ -0,0 +1,2 @@
+# type caches
+lib/
\ No newline at end of file
diff --git a/app/package.json b/app/package.json
index 7a7cad52a48..41939bdcc33 100644
--- a/app/package.json
+++ b/app/package.json
@@ -2,7 +2,8 @@
   "name": "@opentrons/app",
   "version": "4.3.1",
   "description": "Opentrons desktop application UI",
-  "main": "src/index.js",
+  "source": "src/index.tsx",
+  "types": "lib/index.d.ts",
   "repository": {
     "type": "git",
     "url": "https://github.com/Opentrons/opentrons.git"
diff --git a/app/src/App/Navbar.tsx b/app/src/App/Navbar.tsx
index 52078c19dca..2fc944c6c19 100644
--- a/app/src/App/Navbar.tsx
+++ b/app/src/App/Navbar.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { useSelector } from 'react-redux'
 import {
@@ -15,7 +14,7 @@ import {
 import { getNavbarLocations } from '../redux/nav'
 import { NavbarLink } from '../molecules/NavbarLink'
 
-export function Navbar(): React.Node {
+export function Navbar(): JSX.Element {
   const locations = useSelector(getNavbarLocations)
 
   return (
diff --git a/app/src/App/__mocks__/portal.tsx b/app/src/App/__mocks__/portal.tsx
index 52028bc4c3c..67fd57af2de 100644
--- a/app/src/App/__mocks__/portal.tsx
+++ b/app/src/App/__mocks__/portal.tsx
@@ -1,11 +1,12 @@
-// @flow
 // mock portal for enzyme tests
 import * as React from 'react'
 
-type Props = {| children: React.Node |}
+interface Props {
+  children: React.ReactNode
+}
 
 // replace Portal with a pass-through React.Fragment
-export const Portal = ({ children }: Props): React.Node => <>{children}</>
+export const Portal = ({ children }: Props): JSX.Element => <>{children}</>
 
-export const PortalRoot = (): React.Node => <></>
-export const TopPortalRoot = (): React.Node => <></>
+export const PortalRoot = (): JSX.Element => <></>
+export const TopPortalRoot = (): JSX.Element => <></>
diff --git a/app/src/App/__tests__/App.test.tsx b/app/src/App/__tests__/App.test.tsx
index 6ac0fbbe10d..e4aafa9b31a 100644
--- a/app/src/App/__tests__/App.test.tsx
+++ b/app/src/App/__tests__/App.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { MemoryRouter } from 'react-router-dom'
 import { mount } from 'enzyme'
diff --git a/app/src/App/__tests__/Navbar.test.tsx b/app/src/App/__tests__/Navbar.test.tsx
index 5bd941b22a8..ace67c0068e 100644
--- a/app/src/App/__tests__/Navbar.test.tsx
+++ b/app/src/App/__tests__/Navbar.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { mount } from 'enzyme'
 import { Provider } from 'react-redux'
@@ -20,10 +19,11 @@ import type { NavLocation } from '../../redux/nav/types'
 jest.mock('react-router-dom', () => ({ NavLink: 'a' }))
 jest.mock('../../redux/nav/selectors')
 
-const getNavbarLocations: JestMockFn<[State], Array<NavLocation>> =
-  Nav.getNavbarLocations
+const getNavbarLocations = Nav.getNavbarLocations as jest.MockedFunction<
+  typeof Nav.getNavbarLocations
+>
 
-const LOCATIONS = [
+const LOCATIONS: NavLocation[] = [
   { id: 'foo', path: '/foo', title: 'Foo', iconName: 'alert' },
   { id: 'bar', path: '/bar', title: 'Bar', iconName: 'alert' },
   { id: 'baz', path: '/baz', title: 'Baz', iconName: 'alert' },
@@ -36,7 +36,7 @@ describe('Navbar component', () => {
     subscribe: noop,
   }
 
-  const render = () => {
+  const render = (): ReturnType<typeof mount> => {
     return mount(<Navbar />, {
       wrappingComponent: Provider,
       wrappingComponentProps: { store },
@@ -44,7 +44,7 @@ describe('Navbar component', () => {
   }
 
   beforeEach(() => {
-    getNavbarLocations.mockImplementation(state => {
+    getNavbarLocations.mockImplementation((state: State): NavLocation[] => {
       expect(state).toEqual({ mockState: true })
       return LOCATIONS
     })
diff --git a/app/src/App/index.tsx b/app/src/App/index.tsx
index bad2a85ecf1..d1c165fd974 100644
--- a/app/src/App/index.tsx
+++ b/app/src/App/index.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { Switch, Route, Redirect } from 'react-router-dom'
 import { hot } from 'react-hot-loader/root'
@@ -29,9 +28,9 @@ import { MorePanel } from '../pages/More/MorePanel'
 import { Navbar } from './Navbar'
 import { PortalRoot as ModalPortalRoot, TopPortalRoot } from './portal'
 
-const stopEvent = (event: SyntheticEvent<>) => event.preventDefault()
+const stopEvent = (event: React.MouseEvent): void => event.preventDefault()
 
-export const AppComponent = (): React.Node => (
+export const AppComponent = (): JSX.Element => (
   <>
     <GlobalStyle />
     <Flex
@@ -77,4 +76,4 @@ export const AppComponent = (): React.Node => (
   </>
 )
 
-export const App: React.AbstractComponent<{||}> = hot(AppComponent)
+export const App = hot(AppComponent)
diff --git a/app/src/App/portal.tsx b/app/src/App/portal.tsx
index a2d9d8d2c70..fad97f4ab78 100644
--- a/app/src/App/portal.tsx
+++ b/app/src/App/portal.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import ReactDom from 'react-dom'
 import { Box } from '@opentrons/components'
@@ -9,41 +8,43 @@ import { Box } from '@opentrons/components'
 
 type PortalLevel = 'page' | 'top'
 
-type Props = {|
-  children: React.Node,
-  level: PortalLevel,
-|}
+interface Props {
+  children: React.ReactNode
+  level: PortalLevel
+}
 
-type State = {|
-  hasRoot: boolean,
-|}
+interface State {
+  hasRoot: boolean
+}
 
-type PortalLevelInfo = {|
-  id: string,
-  zIndex: number | string,
-|}
+interface PortalLevelInfo {
+  id: string
+  zIndex: number | string
+}
 
-const PORTAL_ROOT_PROPS_BY_LEVEL: { [PortalLevel]: PortalLevelInfo } = {
+const PORTAL_ROOT_PROPS_BY_LEVEL: Record<PortalLevel, PortalLevelInfo> = {
   page: { id: '__otAppModalPortalRoot', zIndex: 1 },
   top: { id: '__otAppTopPortalRoot', zIndex: 10 },
 }
 
-const getPortalRoot = level =>
-  global.document.getElementById(PORTAL_ROOT_PROPS_BY_LEVEL[level].id)
+const getPortalRoot = (level: PortalLevel): HTMLElement | null =>
+  (global.document as HTMLDocument).getElementById(
+    PORTAL_ROOT_PROPS_BY_LEVEL[level].id
+  )
 
-export function PortalRoot(): React.Node {
+export function PortalRoot(): JSX.Element {
   return <Box {...PORTAL_ROOT_PROPS_BY_LEVEL.page} />
 }
 
-export function TopPortalRoot(): React.Node {
+export function TopPortalRoot(): JSX.Element {
   return <Box {...PORTAL_ROOT_PROPS_BY_LEVEL.top} />
 }
 
 // the children of Portal are rendered into the PortalRoot if it exists in DOM
 export class Portal extends React.Component<Props, State> {
-  $root: ?Element
+  $root: Element | null | undefined
 
-  static defaultProps: {| level: PortalLevel |} = {
+  static defaultProps: { level: PortalLevel } = {
     level: 'page',
   }
 
@@ -55,14 +56,14 @@ export class Portal extends React.Component<Props, State> {
 
   // on first launch, $portalRoot isn't in DOM; double check once we're mounted
   // TODO(mc, 2018-10-08): prerender UI instead
-  componentDidMount() {
+  componentDidMount(): void {
     if (!this.$root) {
       this.$root = getPortalRoot(this.props.level)
       this.setState({ hasRoot: !!this.$root })
     }
   }
 
-  render(): React.Portal | null {
+  render(): React.ReactPortal | null {
     if (!this.$root) return null
     return ReactDom.createPortal(this.props.children, this.$root)
   }
diff --git a/app/src/__mocks__/logger.ts b/app/src/__mocks__/logger.ts
index fdaf076f928..dabeae5e70b 100644
--- a/app/src/__mocks__/logger.ts
+++ b/app/src/__mocks__/logger.ts
@@ -1,20 +1,22 @@
 // mock logger for tests
 import path from 'path'
+import type { Logger } from '../logger'
 
-export function createLogger(filename) {
+export function createLogger(filename: string): Logger {
   const label = path.relative(path.join(__dirname, '../../..'), filename)
 
+  // @ts-expect-error
   return new Proxy(
     {},
     {
-      get(_, level) {
-        return (message, meta) =>
+      get(_, level: string) {
+        return (message: string, meta: unknown) =>
           console.log(`[${label}] ${level}: ${message} %j`, meta)
       },
     }
   )
 }
 
-export const useLogger = filename => {
+export const useLogger = (filename: string): Logger => {
   return createLogger(filename)
 }
diff --git a/app/src/assets/labware/__mocks__/getLabware.ts b/app/src/assets/labware/__mocks__/getLabware.ts
index f523210680d..6ef2cbad7dd 100644
--- a/app/src/assets/labware/__mocks__/getLabware.ts
+++ b/app/src/assets/labware/__mocks__/getLabware.ts
@@ -1,11 +1,10 @@
-// @flow
 // TODO(mc, 2019-06-27): replace this mock with one in shared-data based on
 // jest.fn and glob
 
-export function getLegacyLabwareDef(loadName: ?string): null {
+export function getLegacyLabwareDef(loadName: string | null | undefined): null {
   return null
 }
 
-export function getLatestLabwareDef(loadName: ?string): null {
+export function getLatestLabwareDef(loadName: string | null | undefined): null {
   return null
 }
diff --git a/app/src/assets/labware/__tests__/findLabware.test.ts b/app/src/assets/labware/__tests__/findLabware.test.ts
index 79f011f059f..acd2b78986c 100644
--- a/app/src/assets/labware/__tests__/findLabware.test.ts
+++ b/app/src/assets/labware/__tests__/findLabware.test.ts
@@ -1,4 +1,3 @@
-// @flow
 import { getLatestLabwareDef } from '../getLabware'
 import { findLabwareDefWithCustom } from '../findLabware'
 import type { LabwareDefinition2 } from '@opentrons/shared-data'
@@ -9,28 +8,35 @@ jest.mock('../getLabware', () => ({
   getLatestLabwareDef: jest.fn(),
 }))
 
-const mockGetLabware: JestMockFn<
-  [?string],
-  LabwareDefinition2 | null
-> = getLatestLabwareDef
+const mockGetLabware = getLatestLabwareDef as jest.MockedFunction<
+  typeof getLatestLabwareDef
+>
 
-const fixture_custom_beta_tiprack_10_ul = {
-  namespace: 'custom_beta',
+const fixtureTipRack10ul = fixture_tiprack_10_ul as LabwareDefinition2
+
+const fixtureTipRack10ulCustomBeta = {
   ...fixture_tiprack_10_ul,
-}
+  namespace: 'custom_beta',
+} as LabwareDefinition2
 
-const fixture_tiprack_10_ul_v2 = {
-  version: 2,
+const fixtureTipRack10ulVersion2 = {
   ...fixture_tiprack_10_ul,
-}
-const opentrons_fixture_tiprack_300ul = {
-  namespace: 'opentrons',
+  version: 2,
+} as LabwareDefinition2
+
+const fixtureTipRack300ulOpentrons = {
   ...fixture_tiprack_300_ul,
-}
+  namespace: 'opentrons',
+} as LabwareDefinition2
 
 describe('findLabwareDefWithCustom', () => {
+  afterEach(() => {
+    jest.resetAllMocks()
+  })
+
   it('finds standard labware with namesearch', () => {
-    mockGetLabware.mockReturnValue(opentrons_fixture_tiprack_300ul)
+    mockGetLabware.mockReturnValue(fixtureTipRack300ulOpentrons)
+
     expect(
       findLabwareDefWithCustom(
         'opentrons',
@@ -38,9 +44,11 @@ describe('findLabwareDefWithCustom', () => {
         null,
         []
       )
-    ).toEqual(opentrons_fixture_tiprack_300ul)
+    ).toEqual(fixtureTipRack300ulOpentrons)
+
     expect(mockGetLabware).toHaveBeenCalledWith('opentrons_96_tiprack_300ul')
   })
+
   it('handles no-custom-labware', () => {
     expect(
       findLabwareDefWithCustom(
@@ -54,7 +62,7 @@ describe('findLabwareDefWithCustom', () => {
 
   const SPECS = [
     {
-      it: 'finds nothing with no specs',
+      should: 'find nothing with no specs',
       customLabware: [fixture_tiprack_10_ul, fixture_tiprack_300_ul],
       expect: null,
       namespace: null,
@@ -62,7 +70,7 @@ describe('findLabwareDefWithCustom', () => {
       version: null,
     },
     {
-      it: 'finds the first item with only namespace',
+      should: 'find the first item with only namespace',
       customLabware: [fixture_tiprack_10_ul, fixture_tiprack_300_ul],
       expect: fixture_tiprack_10_ul,
       namespace: 'fixture',
@@ -70,50 +78,54 @@ describe('findLabwareDefWithCustom', () => {
       version: null,
     },
     {
-      it: 'finds the first item with only loadName',
+      should: 'find the first item with only loadName',
       customLabware: [
-        fixture_tiprack_10_ul,
-        fixture_custom_beta_tiprack_10_ul,
-        fixture_tiprack_10_ul_v2,
+        fixtureTipRack10ul,
+        fixtureTipRack10ulCustomBeta,
+        fixtureTipRack10ulVersion2,
       ],
-      expect: fixture_tiprack_10_ul,
+      expect: fixtureTipRack10ul,
       namespace: null,
       loadName: 'fixture_tiprack_10_ul',
       version: null,
     },
     {
-      it: 'finds the right item with loadName and namespace',
+      should: 'find the right item with loadName and namespace',
       customLabware: [
         fixture_tiprack_10_ul,
-        fixture_custom_beta_tiprack_10_ul,
-        fixture_tiprack_10_ul_v2,
+        fixtureTipRack10ulCustomBeta,
+        fixtureTipRack10ulVersion2,
       ],
-      expect: fixture_custom_beta_tiprack_10_ul,
+      expect: fixtureTipRack10ulCustomBeta,
       namespace: 'custom_beta',
       loadName: 'fixture_tiprack_10_ul',
       version: null,
     },
     {
-      it: 'finds the right item with loadName and namespace and version',
+      should: 'find the right item with loadName and namespace and version',
       customLabware: [
-        fixture_tiprack_10_ul,
-        fixture_custom_beta_tiprack_10_ul,
-        fixture_tiprack_10_ul_v2,
+        fixtureTipRack10ul,
+        fixtureTipRack10ulCustomBeta,
+        fixtureTipRack10ulVersion2,
       ],
-      expect: fixture_tiprack_10_ul_v2,
+      expect: fixtureTipRack10ulVersion2,
       namespace: 'fixture',
       loadName: 'fixture_tiprack_10_ul',
       version: '2',
     },
   ]
+
   SPECS.forEach(spec => {
-    it(spec.it, () => {
+    // TODO(mc, 2021-05-19): these tests are failing due to bug in code under test
+    // see: https://github.com/Opentrons/opentrons/issues/7823
+    // eslint-disable-next-line jest/no-disabled-tests
+    it.skip(`should ${spec.should}`, () => {
       expect(
         findLabwareDefWithCustom(
           spec.namespace,
           spec.loadName,
           spec.version,
-          spec.customLabware
+          spec.customLabware as LabwareDefinition2[]
         )
       ).toEqual(spec.expect)
     })
diff --git a/app/src/assets/labware/findLabware.ts b/app/src/assets/labware/findLabware.ts
index c18a714331e..65a101c8e6f 100644
--- a/app/src/assets/labware/findLabware.ts
+++ b/app/src/assets/labware/findLabware.ts
@@ -1,15 +1,16 @@
-// @flow
-
 import head from 'lodash/head'
 import type { LabwareDefinition2 } from '@opentrons/shared-data'
 
 import { getLatestLabwareDef } from './getLabware'
 
+// TODO(mc, 2021-05-19): this function does not filter by namespace
+// nor version. Instead, it short-circuits as soon as it finds a loadName match
+// bugfix ticket: https://github.com/Opentrons/opentrons/issues/7823
 function filterLabwareDefinitions(
   namespace: string | null,
   loadName: string | null,
   version: string | null,
-  customLabware: Array<LabwareDefinition2>
+  customLabware: LabwareDefinition2[]
 ): LabwareDefinition2 | null {
   return (
     head(
@@ -27,7 +28,7 @@ export function findLabwareDefWithCustom(
   namespace: string | null,
   loadName: string | null,
   version: string | null,
-  customLabware: Array<LabwareDefinition2>
+  customLabware: LabwareDefinition2[]
 ): LabwareDefinition2 | null {
   return namespace === 'opentrons'
     ? getLatestLabwareDef(loadName)
diff --git a/app/src/assets/labware/getLabware.ts b/app/src/assets/labware/getLabware.ts
index 04e232e6189..a3e618680cf 100644
--- a/app/src/assets/labware/getLabware.ts
+++ b/app/src/assets/labware/getLabware.ts
@@ -1,4 +1,3 @@
-// @flow
 import groupBy from 'lodash/groupBy'
 import type {
   LabwareDefinition1,
@@ -7,25 +6,25 @@ import type {
 
 // require all definitions in the labware/definitions/1 directory
 // require.context is webpack-specific method
-const labwareSchemaV1DefsContext = (require: any).context(
+const labwareSchemaV1DefsContext = require.context(
   '@opentrons/shared-data/labware/definitions/1',
   true, // traverse subdirectories
   /\.json$/, // import filter
   'sync' // load every definition into one synchronous chunk
 )
-let labwareSchemaV1Defs: $ReadOnlyArray<LabwareDefinition1> | null = null
-function getLegacyLabwareDefs(): $ReadOnlyArray<LabwareDefinition1> {
+let labwareSchemaV1Defs: Readonly<LabwareDefinition1[]> | null = null
+function getLegacyLabwareDefs(): Readonly<LabwareDefinition1[]> {
   if (!labwareSchemaV1Defs) {
     labwareSchemaV1Defs = labwareSchemaV1DefsContext
       .keys()
-      .map(name => labwareSchemaV1DefsContext(name))
+      .map((name: string) => labwareSchemaV1DefsContext(name))
   }
 
-  return labwareSchemaV1Defs
+  return labwareSchemaV1Defs as Readonly<LabwareDefinition1[]>
 }
 
 export function getLegacyLabwareDef(
-  loadName: ?string
+  loadName: string | null | undefined
 ): LabwareDefinition1 | null {
   const def = getLegacyLabwareDefs().find(d => d.metadata.name === loadName)
   return def || null
@@ -33,24 +32,24 @@ export function getLegacyLabwareDef(
 
 // require all definitions in the labware/definitions/2 directory
 // require.context is webpack-specific method
-const labwareSchemaV2DefsContext = (require: any).context(
+const labwareSchemaV2DefsContext = (require as any).context(
   '@opentrons/shared-data/labware/definitions/2',
   true, // traverse subdirectories
   /\.json$/, // import filter
   'sync' // load every definition into one synchronous chunk
 )
 
-let labwareSchemaV2Defs: $ReadOnlyArray<LabwareDefinition2> | null = null
-function getLatestLabwareDefs(): $ReadOnlyArray<LabwareDefinition2> {
+let labwareSchemaV2Defs: LabwareDefinition2[] | null = null
+function getLatestLabwareDefs(): LabwareDefinition2[] {
   // NOTE: unlike labware-library, no filtering out "do not list labware"
   // also, more convenient & performant to make a map {loadName: def} not an array
   if (!labwareSchemaV2Defs) {
     const allDefs = labwareSchemaV2DefsContext
       .keys()
-      .map(name => labwareSchemaV2DefsContext(name))
+      .map((name: string) => labwareSchemaV2DefsContext(name))
     // group by namespace + loadName
     const labwareDefGroups: {
-      [groupKey: string]: Array<LabwareDefinition2>,
+      [groupKey: string]: LabwareDefinition2[]
     } = groupBy(allDefs, d => `${d.namespace}/${d.parameters.loadName}`)
 
     labwareSchemaV2Defs = Object.keys(labwareDefGroups).map(
@@ -68,7 +67,7 @@ function getLatestLabwareDefs(): $ReadOnlyArray<LabwareDefinition2> {
 }
 
 export function getLatestLabwareDef(
-  loadName: ?string
+  loadName: string | null | undefined
 ): LabwareDefinition2 | null {
   const def = getLatestLabwareDefs().find(
     d => d.parameters.loadName === loadName
diff --git a/app/src/assets/localization/en/index.ts b/app/src/assets/localization/en/index.ts
index 7419f6ec6c5..72837258ff9 100644
--- a/app/src/assets/localization/en/index.ts
+++ b/app/src/assets/localization/en/index.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import shared from './shared.json'
 import protocol_calibration from './protocol_calibration.json'
 import protocol_info from './protocol_info.json'
diff --git a/app/src/assets/localization/index.ts b/app/src/assets/localization/index.ts
index 3d6e995a91e..e92a7077ed9 100644
--- a/app/src/assets/localization/index.ts
+++ b/app/src/assets/localization/index.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import { en } from './en'
 
 export const resources = {
diff --git a/app/src/atoms/GlobalStyle/index.ts b/app/src/atoms/GlobalStyle/index.ts
index 2a53f639a33..6890eb9cff6 100644
--- a/app/src/atoms/GlobalStyle/index.ts
+++ b/app/src/atoms/GlobalStyle/index.ts
@@ -1,10 +1,8 @@
-// @flow
-import * as React from 'react'
 import { createGlobalStyle } from 'styled-components'
 import { C_DARK_GRAY } from '@opentrons/components'
 import 'typeface-open-sans'
 
-export const GlobalStyle: React.ComponentType<*> = createGlobalStyle`
+export const GlobalStyle = createGlobalStyle`
   * {
     box-sizing: border-box;
     margin: 0;
diff --git a/app/src/atoms/Page/index.tsx b/app/src/atoms/Page/index.tsx
index 1b969ad586b..78e0e40a65d 100644
--- a/app/src/atoms/Page/index.tsx
+++ b/app/src/atoms/Page/index.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 
 import styles from './styles.css'
@@ -6,12 +5,12 @@ import { TitleBar } from '@opentrons/components'
 
 import type { TitleBarProps } from '@opentrons/components'
 
-export type PageProps = {|
-  titleBarProps?: TitleBarProps,
-  children: React.Node,
-|}
+export interface PageProps {
+  titleBarProps?: TitleBarProps
+  children: React.ReactNode
+}
 
-export function Page(props: PageProps): React.Node {
+export function Page(props: PageProps): JSX.Element {
   const { titleBarProps, children } = props
 
   return (
diff --git a/app/src/atoms/TitledControl/__tests__/TitledControl.test.tsx b/app/src/atoms/TitledControl/__tests__/TitledControl.test.tsx
index 5e058e8f3e9..5ba67b6cb3f 100644
--- a/app/src/atoms/TitledControl/__tests__/TitledControl.test.tsx
+++ b/app/src/atoms/TitledControl/__tests__/TitledControl.test.tsx
@@ -1,5 +1,3 @@
-// @flow
-
 import * as React from 'react'
 import { mount } from 'enzyme'
 
diff --git a/app/src/atoms/TitledControl/index.tsx b/app/src/atoms/TitledControl/index.tsx
index 9f64beb4c7c..c5be21f9ca1 100644
--- a/app/src/atoms/TitledControl/index.tsx
+++ b/app/src/atoms/TitledControl/index.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import {
   Box,
@@ -17,13 +16,12 @@ import {
 
 import type { StyleProps } from '@opentrons/components'
 
-export type TitledControlProps = {|
-  title: string,
-  description: React.Node,
-  control?: React.Node,
-  children?: React.Node,
-  ...StyleProps,
-|}
+export interface TitledControlProps extends StyleProps {
+  title: string
+  description: React.ReactNode
+  control?: React.ReactNode
+  children?: React.ReactNode
+}
 
 export function TitledControl({
   title,
@@ -31,7 +29,7 @@ export function TitledControl({
   control,
   children,
   ...styleProps
-}: TitledControlProps): React.Node {
+}: TitledControlProps): JSX.Element {
   return (
     <Box fontSize={FONT_SIZE_BODY_1} padding={SPACING_3} {...styleProps}>
       <Flex alignItems={ALIGN_CENTER}>
diff --git a/app/src/atoms/ToggleBtn/__tests__/ToggleBtn.test.tsx b/app/src/atoms/ToggleBtn/__tests__/ToggleBtn.test.tsx
index f39f71990e9..1645e2d78dd 100644
--- a/app/src/atoms/ToggleBtn/__tests__/ToggleBtn.test.tsx
+++ b/app/src/atoms/ToggleBtn/__tests__/ToggleBtn.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { shallow } from 'enzyme'
 
diff --git a/app/src/atoms/ToggleBtn/index.tsx b/app/src/atoms/ToggleBtn/index.tsx
index c8ba2de3ad3..96d50a6592d 100644
--- a/app/src/atoms/ToggleBtn/index.tsx
+++ b/app/src/atoms/ToggleBtn/index.tsx
@@ -1,4 +1,3 @@
-// @flow
 // primitives based toggle button
 // TODO(mc, 2020-10-08): replace ToggleButton in CL with this component
 import * as React from 'react'
@@ -13,15 +12,14 @@ import {
 
 import type { StyleProps } from '@opentrons/components'
 
-export type ToggleBtnProps = {|
-  label: string,
-  toggledOn: boolean,
-  disabled?: boolean | null,
-  onClick?: (SyntheticMouseEvent<Element>) => mixed,
-  ...StyleProps,
-|}
+export interface ToggleBtnProps extends StyleProps {
+  label: string
+  toggledOn: boolean
+  disabled?: boolean | null
+  onClick?: (e: React.MouseEvent) => unknown
+}
 
-export function ToggleBtn(props: ToggleBtnProps): React.Node {
+export function ToggleBtn(props: ToggleBtnProps): JSX.Element {
   const { label, toggledOn, disabled, ...buttonProps } = props
   const iconName = toggledOn ? 'ot-toggle-switch-on' : 'ot-toggle-switch-off'
   let color = C_DARK_GRAY
@@ -34,6 +32,7 @@ export function ToggleBtn(props: ToggleBtnProps): React.Node {
 
   return (
     <Btn
+      // @ts-expect-error TODO: cast disabled to Boolean as Btn expects it
       disabled={disabled}
       role="switch"
       aria-label={label}
diff --git a/app/src/atoms/layout/CardColumn.tsx b/app/src/atoms/layout/CardColumn.tsx
index 103cbfbab55..cc50256bab4 100644
--- a/app/src/atoms/layout/CardColumn.tsx
+++ b/app/src/atoms/layout/CardColumn.tsx
@@ -1,11 +1,10 @@
-// @flow
 import * as React from 'react'
 import styles from './styles.css'
 
-export type CardColumnProps = {|
-  children: React.Node,
-|}
+export interface CardColumnProps {
+  children: React.ReactNode
+}
 
-export function CardColumn(props: CardColumnProps): React.Node {
+export function CardColumn(props: CardColumnProps): JSX.Element {
   return <div className={styles.column_50}>{props.children}</div>
 }
diff --git a/app/src/atoms/layout/CardContainer.tsx b/app/src/atoms/layout/CardContainer.tsx
index c29345eb8b1..c2d2a4ff004 100644
--- a/app/src/atoms/layout/CardContainer.tsx
+++ b/app/src/atoms/layout/CardContainer.tsx
@@ -1,11 +1,10 @@
-// @flow
 import * as React from 'react'
 import styles from './styles.css'
 
-export type CardContainerProps = {|
-  children: React.Node,
-|}
+export interface CardContainerProps {
+  children: React.ReactNode
+}
 
-export function CardContainer(props: CardContainerProps): React.Node {
+export function CardContainer(props: CardContainerProps): JSX.Element {
   return <div className={styles.card_container}>{props.children}</div>
 }
diff --git a/app/src/atoms/layout/CardContentFlex.tsx b/app/src/atoms/layout/CardContentFlex.tsx
index af0be8f8990..609e78f342c 100644
--- a/app/src/atoms/layout/CardContentFlex.tsx
+++ b/app/src/atoms/layout/CardContentFlex.tsx
@@ -1,14 +1,13 @@
-// @flow
 import * as React from 'react'
 import cx from 'classnames'
 import styles from './styles.css'
 
-export type CardContentFlexProps = {|
-  children: React.Node,
-  className?: string,
-|}
+export interface CardContentFlexProps {
+  children: React.ReactNode
+  className?: string
+}
 
-export function CardContentFlex(props: CardContentFlexProps): React.Node {
+export function CardContentFlex(props: CardContentFlexProps): JSX.Element {
   return (
     <div className={cx(styles.card_content_flex, props.className)}>
       {props.children}
diff --git a/app/src/atoms/layout/CardContentFull.tsx b/app/src/atoms/layout/CardContentFull.tsx
index 761a2505007..e11e8c31043 100644
--- a/app/src/atoms/layout/CardContentFull.tsx
+++ b/app/src/atoms/layout/CardContentFull.tsx
@@ -1,14 +1,13 @@
-// @flow
 import * as React from 'react'
 import cx from 'classnames'
 import styles from './styles.css'
 
-export type CardContentFullProps = {|
-  children: React.Node,
-  className?: string,
-|}
+export interface CardContentFullProps {
+  children: React.ReactNode
+  className?: string
+}
 
-export function CardContentFull(props: CardContentFullProps): React.Node {
+export function CardContentFull(props: CardContentFullProps): JSX.Element {
   return (
     <div className={cx(styles.card_content_full, props.className)}>
       {props.children}
diff --git a/app/src/atoms/layout/CardContentHalf.tsx b/app/src/atoms/layout/CardContentHalf.tsx
index 79fa185cc61..e71b9aa9b98 100644
--- a/app/src/atoms/layout/CardContentHalf.tsx
+++ b/app/src/atoms/layout/CardContentHalf.tsx
@@ -1,14 +1,13 @@
-// @flow
 import * as React from 'react'
 import cx from 'classnames'
 import styles from './styles.css'
 
-export type CardContentHalfProps = {|
-  children: React.Node,
-  className?: string,
-|}
+export interface CardContentHalfProps {
+  children: React.ReactNode
+  className?: string
+}
 
-export function CardContentHalf(props: CardContentHalfProps): React.Node {
+export function CardContentHalf(props: CardContentHalfProps): JSX.Element {
   return (
     <div className={cx(styles.card_content_50, props.className)}>
       {props.children}
diff --git a/app/src/atoms/layout/CardContentQuarter.tsx b/app/src/atoms/layout/CardContentQuarter.tsx
index 64c58a12f24..5aafde0d345 100644
--- a/app/src/atoms/layout/CardContentQuarter.tsx
+++ b/app/src/atoms/layout/CardContentQuarter.tsx
@@ -1,14 +1,15 @@
-// @flow
 import * as React from 'react'
 import cx from 'classnames'
 import styles from './styles.css'
 
-export type CardContentQuarterProps = {|
-  children: React.Node,
-  className?: string,
-|}
+export interface CardContentQuarterProps {
+  children: React.ReactNode
+  className?: string
+}
 
-export function CardContentQuarter(props: CardContentQuarterProps): React.Node {
+export function CardContentQuarter(
+  props: CardContentQuarterProps
+): JSX.Element {
   return (
     <div className={cx(styles.card_content_25, props.className)}>
       {props.children}
diff --git a/app/src/atoms/layout/CardContentThird.tsx b/app/src/atoms/layout/CardContentThird.tsx
index 467076a18c0..46fddf56d3a 100644
--- a/app/src/atoms/layout/CardContentThird.tsx
+++ b/app/src/atoms/layout/CardContentThird.tsx
@@ -1,14 +1,13 @@
-// @flow
 import * as React from 'react'
 import cx from 'classnames'
 import styles from './styles.css'
 
-export type CardContentThirdProps = {|
-  children: React.Node,
-  className?: string,
-|}
+export interface CardContentThirdProps {
+  children: React.ReactNode
+  className?: string
+}
 
-export function CardContentThird(props: CardContentThirdProps): React.Node {
+export function CardContentThird(props: CardContentThirdProps): JSX.Element {
   return (
     <div className={cx(styles.card_content_third, props.className)}>
       {props.children}
diff --git a/app/src/atoms/layout/CardCopy.tsx b/app/src/atoms/layout/CardCopy.tsx
index f9aef87a7ad..a2a337b316e 100644
--- a/app/src/atoms/layout/CardCopy.tsx
+++ b/app/src/atoms/layout/CardCopy.tsx
@@ -1,12 +1,11 @@
-// @flow
 import * as React from 'react'
 
 import styles from './styles.css'
 
-export type CardCopyProps = {|
-  children: React.Node,
-|}
+export interface CardCopyProps {
+  children: React.ReactNode
+}
 
-export function CardCopy(props: CardCopyProps): React.Node {
+export function CardCopy(props: CardCopyProps): JSX.Element {
   return <p className={styles.card_copy}>{props.children}</p>
 }
diff --git a/app/src/atoms/layout/CardRow.tsx b/app/src/atoms/layout/CardRow.tsx
index e4718fd8eec..1e162721bc0 100644
--- a/app/src/atoms/layout/CardRow.tsx
+++ b/app/src/atoms/layout/CardRow.tsx
@@ -1,11 +1,10 @@
-// @flow
 import * as React from 'react'
 import styles from './styles.css'
 
-export type CardRowProps = {|
-  children: React.Node,
-|}
+export interface CardRowProps {
+  children: React.ReactNode
+}
 
-export function CardRow(props: CardRowProps): React.Node {
+export function CardRow(props: CardRowProps): JSX.Element {
   return <div className={styles.row}>{props.children}</div>
 }
diff --git a/app/src/atoms/layout/SectionContentFull.tsx b/app/src/atoms/layout/SectionContentFull.tsx
index 025aa914351..eb842409d44 100644
--- a/app/src/atoms/layout/SectionContentFull.tsx
+++ b/app/src/atoms/layout/SectionContentFull.tsx
@@ -1,14 +1,15 @@
-// @flow
 import * as React from 'react'
 import cx from 'classnames'
 import styles from './styles.css'
 
-export type SectionContentFullProps = {|
-  children: React.Node,
-  className?: string,
-|}
+export interface SectionContentFullProps {
+  children: React.ReactNode
+  className?: string
+}
 
-export function SectionContentFull(props: SectionContentFullProps): React.Node {
+export function SectionContentFull(
+  props: SectionContentFullProps
+): JSX.Element {
   return (
     <div className={cx(styles.section_content_full, props.className)}>
       {props.children}
diff --git a/app/src/atoms/layout/SectionContentHalf.tsx b/app/src/atoms/layout/SectionContentHalf.tsx
index f0e4923c4ff..28aaddf7310 100644
--- a/app/src/atoms/layout/SectionContentHalf.tsx
+++ b/app/src/atoms/layout/SectionContentHalf.tsx
@@ -1,14 +1,15 @@
-// @flow
 import * as React from 'react'
 import cx from 'classnames'
 import styles from './styles.css'
 
-export type SectionContentHalfProps = {|
-  children: React.Node,
-  className?: string,
-|}
+export interface SectionContentHalfProps {
+  children: React.ReactNode
+  className?: string
+}
 
-export function SectionContentHalf(props: SectionContentHalfProps): React.Node {
+export function SectionContentHalf(
+  props: SectionContentHalfProps
+): JSX.Element {
   return (
     <div className={cx(styles.section_content_50, props.className)}>
       {props.children}
diff --git a/app/src/atoms/layout/index.ts b/app/src/atoms/layout/index.ts
index 16e6f8a0903..9933a1d41c8 100644
--- a/app/src/atoms/layout/index.ts
+++ b/app/src/atoms/layout/index.ts
@@ -1,4 +1,3 @@
-// @flow
 // TODO(mc, 2019-11-26): flex box these
 export * from './CardContainer'
 export * from './CardCopy'
diff --git a/app/src/atoms/structure/Divider.tsx b/app/src/atoms/structure/Divider.tsx
index b415573354e..42168814df5 100644
--- a/app/src/atoms/structure/Divider.tsx
+++ b/app/src/atoms/structure/Divider.tsx
@@ -1,10 +1,9 @@
-// @flow
 import * as React from 'react'
 import { Box, C_LIGHT_GRAY, SPACING_1 } from '@opentrons/components'
 
-type Props = React.ElementProps<typeof Box>
+type Props = React.ComponentProps<typeof Box>
 
-export function Divider(props: Props): React.Node {
+export function Divider(props: Props): JSX.Element {
   return (
     <Box
       borderBottom={`1px solid ${C_LIGHT_GRAY}`}
diff --git a/app/src/atoms/structure/LabeledValue.tsx b/app/src/atoms/structure/LabeledValue.tsx
index ac1cfa47220..58087bf9e1b 100644
--- a/app/src/atoms/structure/LabeledValue.tsx
+++ b/app/src/atoms/structure/LabeledValue.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import {
   Box,
@@ -7,16 +6,16 @@ import {
   FONT_BODY_1_DARK,
   FONT_WEIGHT_SEMIBOLD,
 } from '@opentrons/components'
+import type { StyleProps } from '@opentrons/components'
 
-type Props = {|
-  label: string | React.Node,
-  value: string | React.Node,
-  labelProps?: React.ElementProps<typeof Text>,
-  valueProps?: React.ElementProps<typeof Text>,
-  ...React.ElementProps<typeof Box>,
-|}
+interface Props extends StyleProps {
+  label: React.ReactNode
+  value: React.ReactNode
+  labelProps?: React.ComponentProps<typeof Text>
+  valueProps?: React.ComponentProps<typeof Text>
+}
 
-export function LabeledValue(props: Props): React.Node {
+export function LabeledValue(props: Props): JSX.Element {
   const {
     label,
     value,
diff --git a/app/src/atoms/structure/index.ts b/app/src/atoms/structure/index.ts
index 4e3f7bb040b..34107c98983 100644
--- a/app/src/atoms/structure/index.ts
+++ b/app/src/atoms/structure/index.ts
@@ -1,4 +1,2 @@
-// @flow
-
 export * from './LabeledValue'
 export * from './Divider'
diff --git a/app/src/i18n.ts b/app/src/i18n.ts
index 8d12a55c9bc..13d0b343c5d 100644
--- a/app/src/i18n.ts
+++ b/app/src/i18n.ts
@@ -23,13 +23,13 @@ i18n.use(initReactI18next).init(
     },
     keySeparator: false, // use namespaces and context instead
     saveMissing: true,
-    missingKeyHandler: (lng, ns, key, fallbackValue) => {
+    missingKeyHandler: (lng, ns, key) => {
       process.env.NODE_ENV === 'test'
         ? console.error(`Missing ${lng} Translation: key={${key}} ns={${ns}}`)
         : console.warn(`Missing ${lng} Translation: key={${key}} ns={${ns}}`)
     },
   },
-  (err, t) => {
+  err => {
     if (err) {
       console.error(
         'Internationalization was not initialized properly. error: ',
diff --git a/app/src/logger.ts b/app/src/logger.ts
index 7cc0792a3ff..18409a72012 100644
--- a/app/src/logger.ts
+++ b/app/src/logger.ts
@@ -1,4 +1,3 @@
-// @flow
 // logger
 import { useRef } from 'react'
 import { remote } from './redux/shell/remote'
@@ -15,15 +14,15 @@ export type LogLevel =
 
 export type Log = (message: string, meta?: {}) => void
 
-export type Logger = {|
-  error: Log,
-  warn: Log,
-  info: Log,
-  http: Log,
-  verbose: Log,
-  debug: Log,
-  silly: Log,
-|}
+export interface Logger {
+  error: Log
+  warn: Log
+  info: Log
+  http: Log
+  verbose: Log
+  debug: Log
+  silly: Log
+}
 
 const ERROR: 'error' = 'error'
 const WARN: 'warn' = 'warn'
@@ -47,7 +46,7 @@ export function createLogger(filename: string): Logger {
   }
 }
 
-function log(level: LogLevel, message: string, label: string, meta?: {}) {
+function log(level: LogLevel, message: string, label: string, meta?: {}): void {
   const print = `[${label}] ${level}: ${message}`
 
   // log to web console, too
diff --git a/app/src/molecules/DeckMap/LabwareItem.tsx b/app/src/molecules/DeckMap/LabwareItem.tsx
index 7fdca9e42d4..eaef349ee01 100644
--- a/app/src/molecules/DeckMap/LabwareItem.tsx
+++ b/app/src/molecules/DeckMap/LabwareItem.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import cx from 'classnames'
 import { Link } from 'react-router-dom'
@@ -17,21 +16,21 @@ import {
   humanizeLabwareType,
 } from '@opentrons/components'
 
-import { type Labware } from '../../redux/robot'
+import type { Labware } from '../../redux/robot'
 import { getLegacyLabwareDef } from '../../assets/labware/getLabware'
 
 import styles from './styles.css'
 
-export type LabwareItemProps = {|
-  highlighted?: boolean | null,
-  areTipracksConfirmed?: boolean,
-  handleClick?: () => void,
-  labware: $Exact<Labware>,
-  x: number,
-  y: number,
-|}
+export interface LabwareItemProps {
+  highlighted?: boolean | null
+  areTipracksConfirmed?: boolean
+  handleClick?: () => void
+  labware: Labware
+  x: number
+  y: number
+}
 
-export function LabwareItem(props: LabwareItemProps): React.Node {
+export function LabwareItem(props: LabwareItemProps): JSX.Element {
   const { labware, highlighted, areTipracksConfirmed, handleClick } = props
   const { isTiprack, confirmed, name, type, slot, definition } = labware
 
@@ -41,10 +40,10 @@ export function LabwareItem(props: LabwareItemProps): React.Node {
     clickable &&
     ((isTiprack && confirmed) || (!isTiprack && areTipracksConfirmed === false))
 
-  let title
-  let item
-  let width
-  let height
+  let title: string
+  let item: JSX.Element
+  let width: number
+  let height: number
 
   if (definition) {
     item = <LabwareRender definition={definition} />
@@ -58,7 +57,7 @@ export function LabwareItem(props: LabwareItemProps): React.Node {
     title = humanizeLabwareType(type)
   }
 
-  const renderContents = () => {
+  const renderContents = (): JSX.Element => {
     const contents = showSpinner ? (
       <div className={styles.labware_spinner_wrapper}>
         <Icon className={styles.spinner} name="ot-spinner" spin />
diff --git a/app/src/molecules/DeckMap/index.tsx b/app/src/molecules/DeckMap/index.tsx
index b0d96ccb4d1..bfb2d211ac4 100644
--- a/app/src/molecules/DeckMap/index.tsx
+++ b/app/src/molecules/DeckMap/index.tsx
@@ -1,23 +1,19 @@
-// @flow
 import * as React from 'react'
 import { connect } from 'react-redux'
 import { withRouter } from 'react-router-dom'
 import some from 'lodash/some'
 import map from 'lodash/map'
 import mapValues from 'lodash/mapValues'
-import { type DeckSlotId } from '@opentrons/shared-data'
-import type { ContextRouter } from 'react-router-dom'
 
 import { RobotWorkSpace, Module as ModuleItem } from '@opentrons/components'
-// $FlowFixMe(mc, 2021-03.15): ignore until TS conversion
 import { getDeckDefinitions } from '@opentrons/components/src/deck/getDeckDefinitions'
 
-import type { State, Dispatch } from '../../redux/types'
-import {
-  selectors as robotSelectors,
-  type Labware,
-  type SessionModule,
-} from '../../redux/robot'
+import { selectors as robotSelectors } from '../../redux/robot'
+
+import type { DeckSlot, DeckSlotId } from '@opentrons/shared-data'
+import type { RouteComponentProps } from 'react-router-dom'
+import type { State } from '../../redux/types'
+import type { Labware, SessionModule, Slot } from '../../redux/robot'
 
 import { getMatchedModules } from '../../redux/modules'
 
@@ -25,31 +21,27 @@ import { LabwareItem } from './LabwareItem'
 
 export * from './LabwareItem'
 
-type OP = {|
-  ...ContextRouter,
-  modulesRequired?: boolean,
-  enableLabwareSelection?: boolean,
-  className?: string,
-|}
+interface OP extends RouteComponentProps<{ slot?: string }> {
+  modulesRequired?: boolean
+  enableLabwareSelection?: boolean
+  className?: string
+}
 
-type DP = {| dispatch: Dispatch |}
+interface SP {
+  labwareBySlot?: { [slot: string]: Labware[] | undefined }
+  modulesBySlot?: { [slot: string]: DisplayModule | undefined }
+  selectedSlot?: DeckSlotId | null
+  areTipracksConfirmed?: boolean
+}
 
-type DisplayModule = {|
-  ...$Exact<SessionModule>,
-  mode?: $PropertyType<React.ElementProps<typeof ModuleItem>, 'mode'>,
-  usbInfoString?: string,
-|}
+type ModuleDisplayMode = React.ComponentProps<typeof ModuleItem>['mode']
 
-type SP = {|
-  labwareBySlot?: { [DeckSlotId]: Array<Labware> },
-  modulesBySlot?: {
-    [DeckSlotId]: ?DisplayModule,
-  },
-  selectedSlot?: ?DeckSlotId,
-  areTipracksConfirmed?: boolean,
-|}
+interface DisplayModule extends SessionModule {
+  mode?: React.ComponentProps<typeof ModuleItem>['mode']
+  usbInfoString?: string
+}
 
-type Props = {| ...OP, ...SP, ...DP |}
+interface Props extends OP, SP {}
 
 const deckSetupLayerBlocklist = [
   'calibrationMarkings',
@@ -61,7 +53,7 @@ const deckSetupLayerBlocklist = [
   'screwHoles',
 ]
 
-function DeckMapComponent(props: Props) {
+function DeckMapComponent(props: Props): JSX.Element {
   const deckDef = React.useMemo(() => getDeckDefinitions()['ot2_standard'], [])
   const {
     modulesBySlot,
@@ -78,7 +70,7 @@ function DeckMapComponent(props: Props) {
       className={className}
     >
       {({ deckSlotsById }) =>
-        map(deckSlotsById, (slot: $Values<typeof deckSlotsById>, slotId) => {
+        map<DeckSlot>(deckSlotsById, (slot: DeckSlot, slotId: string) => {
           if (!slot.matingSurfaceUnitVector) return null // if slot has no mating surface, don't render anything in it
           const moduleInSlot = modulesBySlot && modulesBySlot[slotId]
           const allLabwareInSlot = labwareBySlot && labwareBySlot[slotId]
@@ -123,18 +115,23 @@ function DeckMapComponent(props: Props) {
 }
 
 function mapStateToProps(state: State, ownProps: OP): SP {
-  let modulesBySlot = mapValues(
+  let modulesBySlot: {
+    [slot in Slot]?: DisplayModule
+  } = mapValues(
     robotSelectors.getModulesBySlot(state),
-    module => ({ ...module, mode: 'default' })
+    (module: SessionModule) => ({
+      ...module,
+      mode: 'default' as ModuleDisplayMode,
+    })
   )
 
   // only show necessary modules if still need to connect some
   if (ownProps.modulesRequired === true) {
     const matchedModules = getMatchedModules(state)
 
-    modulesBySlot = mapValues(
+    modulesBySlot = mapValues<DisplayModule | undefined>(
       robotSelectors.getModulesBySlot(state),
-      module => {
+      (module: SessionModule) => {
         const matchedMod =
           matchedModules.find(mm => mm.slot === module.slot) ?? null
         const usbPort = matchedMod?.module?.usbPort
@@ -146,7 +143,9 @@ function mapStateToProps(state: State, ownProps: OP): SP {
             : 'USB Info N/A'
         return {
           ...module,
-          mode: matchedMod !== null ? 'present' : 'missing',
+          mode: (matchedMod !== null
+            ? 'present'
+            : 'missing') as ModuleDisplayMode,
           usbInfoString: usbInfo,
         }
       }
@@ -156,7 +155,9 @@ function mapStateToProps(state: State, ownProps: OP): SP {
     }
   } else {
     const allLabware = robotSelectors.getLabware(state)
-    const labwareBySlot = allLabware.reduce((slotMap, labware) => {
+    const labwareBySlot = allLabware.reduce<
+      { [slot in Labware['slot']]?: Labware[] }
+    >((slotMap, labware) => {
       const { slot } = labware
       const slotContents = slotMap[slot] ?? []
 
@@ -170,7 +171,8 @@ function mapStateToProps(state: State, ownProps: OP): SP {
         modulesBySlot,
       }
     } else {
-      const selectedSlot: ?DeckSlotId = ownProps.match.params.slot
+      const selectedSlot: DeckSlotId | null | undefined =
+        ownProps.match.params.slot
       return {
         labwareBySlot,
         modulesBySlot,
@@ -181,8 +183,4 @@ function mapStateToProps(state: State, ownProps: OP): SP {
   }
 }
 
-export const DeckMap: React.AbstractComponent<
-  $Diff<OP, ContextRouter>
-> = withRouter(
-  connect<Props, OP, SP, DP, State, Dispatch>(mapStateToProps)(DeckMapComponent)
-)
+export const DeckMap = withRouter(connect(mapStateToProps)(DeckMapComponent))
diff --git a/app/src/molecules/InlineCalibrationWarning/__tests__/InlineCalibrationWarning.test.tsx b/app/src/molecules/InlineCalibrationWarning/__tests__/InlineCalibrationWarning.test.tsx
index d1e837e55ca..b4fae0b53c1 100644
--- a/app/src/molecules/InlineCalibrationWarning/__tests__/InlineCalibrationWarning.test.tsx
+++ b/app/src/molecules/InlineCalibrationWarning/__tests__/InlineCalibrationWarning.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { mount } from 'enzyme'
 
diff --git a/app/src/molecules/InlineCalibrationWarning/index.tsx b/app/src/molecules/InlineCalibrationWarning/index.tsx
index 69c375df138..78be0b3f954 100644
--- a/app/src/molecules/InlineCalibrationWarning/index.tsx
+++ b/app/src/molecules/InlineCalibrationWarning/index.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import {
   Icon,
@@ -14,8 +13,8 @@ import {
   SPACING_1,
   SPACING_2,
   ALIGN_CENTER,
-  type StyleProps,
 } from '@opentrons/components'
+import type { StyleProps } from '@opentrons/components'
 
 export const REQUIRED: 'required' = 'required'
 export const RECOMMENDED: 'recommended' = 'recommended'
@@ -35,14 +34,13 @@ const CONTENT_MAP = {
   },
 }
 
-export type InlineCalibrationWarningProps = {|
-  warningType: WarningType | null,
-  ...StyleProps,
-|}
+export interface InlineCalibrationWarningProps extends StyleProps {
+  warningType: WarningType | null
+}
 
 export function InlineCalibrationWarning(
   props: InlineCalibrationWarningProps
-): React.Node {
+): JSX.Element {
   const { warningType, marginTop = SPACING_2, ...styleProps } = props
   return (
     <>
diff --git a/app/src/molecules/InstructionStep/index.tsx b/app/src/molecules/InstructionStep/index.tsx
index 483c9473c69..712872f9d0a 100644
--- a/app/src/molecules/InstructionStep/index.tsx
+++ b/app/src/molecules/InstructionStep/index.tsx
@@ -1,14 +1,13 @@
-// @flow
 import * as React from 'react'
 import styles from './styles.css'
 
-export type InstructionStepProps = {|
-  step: 'one' | 'two',
-  children: React.Node,
-  diagram: string,
-|}
+export interface InstructionStepProps {
+  step: 'one' | 'two'
+  children: React.ReactNode
+  diagram: string
+}
 
-export function InstructionStep(props: InstructionStepProps): React.Node {
+export function InstructionStep(props: InstructionStepProps): JSX.Element {
   return (
     <fieldset className={styles.step}>
       <legend className={styles.step_legend}>Step {props.step}</legend>
diff --git a/app/src/molecules/JogControls/ControlContainer.tsx b/app/src/molecules/JogControls/ControlContainer.tsx
index 7ca4ca80124..8dce8b2def3 100644
--- a/app/src/molecules/JogControls/ControlContainer.tsx
+++ b/app/src/molecules/JogControls/ControlContainer.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 
 import {
@@ -11,13 +10,13 @@ import {
   FONT_HEADER_DARK,
 } from '@opentrons/components'
 
-type ControlContainerProps = {|
-  title: string,
-  subtitle: string,
-  children: React.Node,
-|}
+interface ControlContainerProps {
+  title: string
+  subtitle: string
+  children: React.ReactNode
+}
 
-export function ControlContainer(props: ControlContainerProps): React.Node {
+export function ControlContainer(props: ControlContainerProps): JSX.Element {
   return (
     <Flex flex={1} alignItems={ALIGN_CENTER} flexDirection={DIRECTION_COLUMN}>
       <Text css={FONT_HEADER_DARK}>{props.title}</Text>
diff --git a/app/src/molecules/JogControls/DirectionControl.tsx b/app/src/molecules/JogControls/DirectionControl.tsx
index 040a4b46b56..2ca4e135e92 100644
--- a/app/src/molecules/JogControls/DirectionControl.tsx
+++ b/app/src/molecules/JogControls/DirectionControl.tsx
@@ -1,4 +1,3 @@
-// @flow
 // jog controls component
 import * as React from 'react'
 
@@ -8,32 +7,32 @@ import {
   SIZE_2,
   PrimaryBtn,
   Icon,
-  type IconName,
   HandleKeypress,
   ALIGN_CENTER,
 } from '@opentrons/components'
 import { ControlContainer } from './ControlContainer'
 
-import type { Jog, Plane, Sign, Bearing } from './types'
+import type { IconName } from '@opentrons/components'
+import type { Jog, Plane, Sign, Bearing, Axis } from './types'
 import { HORIZONTAL_PLANE, VERTICAL_PLANE } from './constants'
 
-type Control = {|
-  bearing: Bearing,
-  keyName: string,
-  shiftKey: boolean,
-  gridRow: number,
-  gridColumn: number,
-  iconName: IconName,
-  axis: 'x' | 'y' | 'z',
-  sign: Sign,
-|}
-type ControlsContents = {|
-  controls: Array<Control>,
-  title: string,
-  subtitle: string,
-|}
+interface Control {
+  bearing: Bearing
+  keyName: string
+  shiftKey: boolean
+  gridRow: number
+  gridColumn: number
+  iconName: IconName
+  axis: Axis
+  sign: Sign
+}
+interface ControlsContents {
+  controls: Control[]
+  title: string
+  subtitle: string
+}
 
-const CONTROLS_CONTENTS_BY_PLANE: { [Plane]: ControlsContents } = {
+const CONTROLS_CONTENTS_BY_PLANE: Record<Plane, ControlsContents> = {
   [VERTICAL_PLANE]: {
     controls: [
       {
@@ -108,13 +107,13 @@ const CONTROLS_CONTENTS_BY_PLANE: { [Plane]: ControlsContents } = {
   },
 }
 
-type DirectionControlProps = {|
-  plane: Plane,
-  jog: Jog,
-  stepSize: number,
-|}
+interface DirectionControlProps {
+  plane: Plane
+  jog: Jog
+  stepSize: number
+}
 
-export function DirectionControl(props: DirectionControlProps): React.Node {
+export function DirectionControl(props: DirectionControlProps): JSX.Element {
   const { title, subtitle, controls } = CONTROLS_CONTENTS_BY_PLANE[props.plane]
 
   return (
diff --git a/app/src/molecules/JogControls/StepSizeControl.tsx b/app/src/molecules/JogControls/StepSizeControl.tsx
index 1b0192c8c07..c42e1263fb5 100644
--- a/app/src/molecules/JogControls/StepSizeControl.tsx
+++ b/app/src/molecules/JogControls/StepSizeControl.tsx
@@ -1,4 +1,3 @@
-// @flow
 // jog controls component
 import * as React from 'react'
 
@@ -11,12 +10,12 @@ import type { StepSize } from './types'
 const STEP_SIZE_TITLE = 'Jump Size'
 const STEP_SIZE_SUBTITLE = 'Change with + and -'
 
-type StepSizeControlProps = {|
-  stepSizes: Array<StepSize>,
-  currentStepSize: StepSize,
-  setCurrentStepSize: StepSize => void,
-|}
-export function StepSizeControl(props: StepSizeControlProps): React.Node {
+interface StepSizeControlProps {
+  stepSizes: StepSize[]
+  currentStepSize: StepSize
+  setCurrentStepSize: (stepSize: StepSize) => void
+}
+export function StepSizeControl(props: StepSizeControlProps): JSX.Element {
   const { stepSizes, currentStepSize, setCurrentStepSize } = props
 
   const increaseStepSize: () => void = () => {
@@ -29,9 +28,7 @@ export function StepSizeControl(props: StepSizeControlProps): React.Node {
     if (i > 0) setCurrentStepSize(stepSizes[i - 1])
   }
 
-  const handleStepSelect: (
-    event: SyntheticInputEvent<HTMLInputElement>
-  ) => void = event => {
+  const handleStepSelect: React.ChangeEventHandler<HTMLInputElement> = event => {
     setCurrentStepSize(Number(event.target.value))
     event.target.blur()
   }
diff --git a/app/src/molecules/JogControls/constants.ts b/app/src/molecules/JogControls/constants.ts
index 70488cab939..34490c0d85c 100644
--- a/app/src/molecules/JogControls/constants.ts
+++ b/app/src/molecules/JogControls/constants.ts
@@ -1,7 +1,6 @@
-// @flow
 import type { StepSize } from './types'
 
-export const DEFAULT_STEP_SIZES: Array<StepSize> = [0.1, 1, 10]
+export const DEFAULT_STEP_SIZES: StepSize[] = [0.1, 1, 10]
 
 export const HORIZONTAL_PLANE: 'horizontal' = 'horizontal'
 export const VERTICAL_PLANE: 'vertical' = 'vertical'
diff --git a/app/src/molecules/JogControls/index.tsx b/app/src/molecules/JogControls/index.tsx
index 22a821f178b..b1069f6f097 100644
--- a/app/src/molecules/JogControls/index.tsx
+++ b/app/src/molecules/JogControls/index.tsx
@@ -1,4 +1,3 @@
-// @flow
 // jog controls component
 import * as React from 'react'
 
@@ -21,17 +20,16 @@ import type { Jog, Plane, StepSize } from './types'
 import type { StyleProps } from '@opentrons/components'
 
 export type { Jog }
-export type JogControlsProps = {|
-  jog: Jog,
-  planes?: Array<Plane>,
-  stepSizes?: Array<StepSize>,
-  auxiliaryControl?: React.Node | null,
-  ...StyleProps,
-|}
+export interface JogControlsProps extends StyleProps {
+  jog: Jog
+  planes?: Plane[]
+  stepSizes?: StepSize[]
+  auxiliaryControl?: React.ReactNode | null
+}
 
 export { HORIZONTAL_PLANE, VERTICAL_PLANE }
 
-export function JogControls(props: JogControlsProps): React.Node {
+export function JogControls(props: JogControlsProps): JSX.Element {
   const {
     stepSizes = DEFAULT_STEP_SIZES,
     planes = [HORIZONTAL_PLANE, VERTICAL_PLANE],
diff --git a/app/src/molecules/JogControls/types.ts b/app/src/molecules/JogControls/types.ts
index f0f7afbe09c..3b964fb6036 100644
--- a/app/src/molecules/JogControls/types.ts
+++ b/app/src/molecules/JogControls/types.ts
@@ -1,6 +1,4 @@
-// @flow
-
-import typeof { HORIZONTAL_PLANE, VERTICAL_PLANE } from './constants'
+import { HORIZONTAL_PLANE, VERTICAL_PLANE } from './constants'
 
 export type Axis = 'x' | 'y' | 'z'
 export type Sign = -1 | 1
@@ -10,7 +8,7 @@ export type StepSize = number
 // param e.g. [0,0,-0.1]. All Instance of JogVector currently translate to vector
 // except Labware Calibration. Once Labware Calibration is updated, update this
 // type and remove it's constituent types (Axis, Sign, StepSize)
-export type Jog = (axis: Axis, direction: Sign, step: StepSize) => mixed
+export type Jog = (axis: Axis, direction: Sign, step: StepSize) => unknown
 
-export type Plane = HORIZONTAL_PLANE | VERTICAL_PLANE
+export type Plane = typeof HORIZONTAL_PLANE | typeof VERTICAL_PLANE
 export type Bearing = 'left' | 'right' | 'forward' | 'back' | 'up' | 'down'
diff --git a/app/src/molecules/ModuleControls/MagnetControl.tsx b/app/src/molecules/ModuleControls/MagnetControl.tsx
index ded6f2758f1..0cb012a3f38 100644
--- a/app/src/molecules/ModuleControls/MagnetControl.tsx
+++ b/app/src/molecules/ModuleControls/MagnetControl.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import {
   Box,
@@ -28,15 +27,15 @@ import {
 import type { MagneticModule, ModuleCommand } from '../../redux/modules/types'
 import type { ModuleModel } from '@opentrons/shared-data'
 
-type ModelContents = {|
-  version: string,
-  units: string | null,
-  maxHeight: number,
-  labwareBottomHeight: number,
-  disengagedHeight: number,
-|}
+interface ModelContents {
+  version: string
+  units: string | null
+  maxHeight: number
+  labwareBottomHeight: number
+  disengagedHeight: number
+}
 
-const contentsByModel: ModuleModel => ModelContents = model => {
+const contentsByModel = (model: ModuleModel): ModelContents => {
   if (model === MAGNETIC_MODULE_V1) {
     return {
       version: 'GEN 1',
@@ -56,27 +55,29 @@ const contentsByModel: ModuleModel => ModelContents = model => {
   }
 }
 
-type Props = {|
-  module: MagneticModule,
+interface Props {
+  module: MagneticModule
   sendModuleCommand: (
     moduleId: string,
     command: ModuleCommand,
-    args?: Array<mixed>
-  ) => mixed,
-  disabledReason?: string | null,
-|}
+    args?: unknown[]
+  ) => unknown
+  disabledReason?: string | null
+}
 
 export const MagnetControl = ({
   module,
   sendModuleCommand,
   disabledReason,
-}: Props): React.Node => {
-  const [engageHeightValue, setEngageHeightValue] = React.useState(null)
-  const [isModalOpen, setIsModalOpen] = React.useState(false)
+}: Props): JSX.Element => {
+  const [engageHeightValue, setEngageHeightValue] = React.useState<
+    string | null
+  >(null)
+  const [isModalOpen, setIsModalOpen] = React.useState<boolean>(false)
 
   const isEngaged = module.status === 'engaged'
 
-  const handleClick = () => {
+  const handleClick = (): void => {
     if (isEngaged) {
       sendModuleCommand(module.serial, 'deactivate')
     } else {
@@ -84,7 +85,7 @@ export const MagnetControl = ({
     }
   }
 
-  const handleSumbitHeight = () => {
+  const handleSumbitHeight = (): void => {
     if (engageHeightValue != null) {
       sendModuleCommand(module.serial, 'engage', [Number(engageHeightValue)])
     }
@@ -152,7 +153,7 @@ export const MagnetControl = ({
   )
 }
 
-function EngageHeightRangeCard(props: ModelContents) {
+function EngageHeightRangeCard(props: ModelContents): JSX.Element {
   return (
     <Box
       width="14rem"
diff --git a/app/src/molecules/ModuleControls/MagnetData.tsx b/app/src/molecules/ModuleControls/MagnetData.tsx
index 98e2a61818f..92e3158ba09 100644
--- a/app/src/molecules/ModuleControls/MagnetData.tsx
+++ b/app/src/molecules/ModuleControls/MagnetData.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 
 import {
@@ -16,11 +15,11 @@ import { MAGNETIC_MODULE_V1 } from '@opentrons/shared-data'
 
 import type { MagneticModule } from '../../redux/modules/types'
 
-type Props = {|
-  module: MagneticModule,
-|}
+interface Props {
+  module: MagneticModule
+}
 
-export function MagnetData(props: Props): React.Node {
+export function MagnetData(props: Props): JSX.Element {
   const { module } = props
   return (
     <Flex
diff --git a/app/src/molecules/ModuleControls/TemperatureControl.tsx b/app/src/molecules/ModuleControls/TemperatureControl.tsx
index 6236e15d541..1efddd79f8a 100644
--- a/app/src/molecules/ModuleControls/TemperatureControl.tsx
+++ b/app/src/molecules/ModuleControls/TemperatureControl.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 
 import {
@@ -28,25 +27,25 @@ import type {
 } from '../../redux/modules/types'
 import type { ModuleModel } from '@opentrons/shared-data'
 
-type Props = {|
-  module: ThermocyclerModule | TemperatureModule,
+interface Props {
+  module: ThermocyclerModule | TemperatureModule
   sendModuleCommand: (
     moduleId: string,
     command: ModuleCommand,
-    args?: Array<mixed>
-  ) => mixed,
-  isSecondaryTemp: boolean,
-  disabledReason?: string | null,
-|}
+    args?: unknown[]
+  ) => unknown
+  isSecondaryTemp: boolean
+  disabledReason?: string | null
+}
 
 export const TemperatureControl = ({
   module,
   isSecondaryTemp,
   sendModuleCommand,
   disabledReason,
-}: Props): React.Node => {
-  const [tempValue, setTempValue] = React.useState(null)
-  const [isModalOpen, setIsModalOpen] = React.useState(false)
+}: Props): JSX.Element => {
+  const [tempValue, setTempValue] = React.useState<string | null>(null)
+  const [isModalOpen, setIsModalOpen] = React.useState<boolean>(false)
   const [targetProps, tooltipProps] = useHoverTooltip()
 
   const isThermocycler = module.type === THERMOCYCLER_MODULE_TYPE
@@ -67,7 +66,7 @@ export const TemperatureControl = ({
       ? module.data.lidTarget != null
       : module.status !== 'idle'
 
-  const handleClick = () => {
+  const handleClick = (): void => {
     if (hasTarget) {
       sendModuleCommand(
         module.serial,
@@ -78,7 +77,7 @@ export const TemperatureControl = ({
     }
   }
 
-  const handleSubmitTemp = () => {
+  const handleSubmitTemp = (): void => {
     if (tempValue != null) {
       sendModuleCommand(
         module.serial,
@@ -90,7 +89,7 @@ export const TemperatureControl = ({
     setIsModalOpen(false)
   }
 
-  const handleCancel = () => {
+  const handleCancel = (): void => {
     setIsModalOpen(false)
     setTempValue(null)
   }
@@ -152,27 +151,28 @@ export const TemperatureControl = ({
   )
 }
 
-type temperatureRanges = {|
-  min: number,
-  max: number,
-|}
+interface TemperatureRanges {
+  min: number
+  max: number
+}
 
 function getModuleTemperatureRanges(
   model: ModuleModel,
   isSecondaryTemp: boolean
-) {
+): TemperatureRanges {
   if (isSecondaryTemp && TEMPERATURE_RANGES[model].secondary) {
-    return TEMPERATURE_RANGES[model].secondary
+    return TEMPERATURE_RANGES[model].secondary as TemperatureRanges
   } else {
-    return TEMPERATURE_RANGES[model].primary
+    return TEMPERATURE_RANGES[model].primary as TemperatureRanges
   }
 }
 
+// @ts-expect-error key should be optional as not all models are present
 const TEMPERATURE_RANGES: {
-  [ModuleModel]: {
-    primary: temperatureRanges,
-    secondary?: temperatureRanges | null,
-  },
+  [model in ModuleModel]: {
+    primary: TemperatureRanges
+    secondary?: TemperatureRanges | null
+  }
 } = {
   temperatureModuleV1: { primary: { min: 4, max: 96 }, secondary: null },
   temperatureModuleV2: { primary: { min: 4, max: 96 }, secondary: null },
diff --git a/app/src/molecules/ModuleControls/TemperatureData.tsx b/app/src/molecules/ModuleControls/TemperatureData.tsx
index 87dc58aa68a..f19860cc2e9 100644
--- a/app/src/molecules/ModuleControls/TemperatureData.tsx
+++ b/app/src/molecules/ModuleControls/TemperatureData.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import {
   DIRECTION_COLUMN,
@@ -22,19 +21,19 @@ import type {
   ThermocyclerStatus,
 } from '../../redux/modules/types'
 
-type TemperatureDataProps = {|
-  title: string | null,
-  current: number | null,
-  target: number | null,
-  status?: TemperatureStatus | ThermocyclerStatus | null,
-|}
+interface TemperatureDataProps {
+  title: string | null
+  current: number | null
+  target: number | null
+  status?: TemperatureStatus | ThermocyclerStatus | null
+}
 
 export const TemperatureData = ({
   title,
   status,
   current,
   target,
-}: TemperatureDataProps): React.Node => (
+}: TemperatureDataProps): JSX.Element => (
   <Flex flexDirection={DIRECTION_COLUMN} fontSize={FONT_SIZE_BODY_1}>
     {title && (
       <Text
diff --git a/app/src/molecules/ModuleControls/index.tsx b/app/src/molecules/ModuleControls/index.tsx
index b3da3547db3..f1d596b5667 100644
--- a/app/src/molecules/ModuleControls/index.tsx
+++ b/app/src/molecules/ModuleControls/index.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 
 import { Box, Flex, JUSTIFY_SPACE_BETWEEN } from '@opentrons/components'
@@ -18,12 +17,12 @@ import type {
   ThermocyclerModule,
 } from '../../redux/modules/types'
 
-type Props = {|
-  module: MagneticModule | TemperatureModule | ThermocyclerModule,
-  controlDisabledReason: string | null,
-|}
+interface Props {
+  module: MagneticModule | TemperatureModule | ThermocyclerModule
+  controlDisabledReason: string | null
+}
 
-export function ModuleControls(props: Props): React.Node {
+export function ModuleControls(props: Props): JSX.Element {
   const { module: mod, controlDisabledReason } = props
   const sendModuleCommand = useSendModuleCommand()
   return (
diff --git a/app/src/molecules/NavbarLink/__tests__/NavbarLink.test.tsx b/app/src/molecules/NavbarLink/__tests__/NavbarLink.test.tsx
index 636fd8a7b3b..6539adc27c4 100644
--- a/app/src/molecules/NavbarLink/__tests__/NavbarLink.test.tsx
+++ b/app/src/molecules/NavbarLink/__tests__/NavbarLink.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { mount } from 'enzyme'
 import { NavLink, StaticRouter } from 'react-router-dom'
diff --git a/app/src/molecules/NavbarLink/index.tsx b/app/src/molecules/NavbarLink/index.tsx
index ce462b0ee0a..19a36d87beb 100644
--- a/app/src/molecules/NavbarLink/index.tsx
+++ b/app/src/molecules/NavbarLink/index.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { NavLink } from 'react-router-dom'
 import { css } from 'styled-components'
@@ -26,10 +25,7 @@ import {
 import type { StyleProps } from '@opentrons/components'
 import type { NavLocation } from '../../redux/nav/types'
 
-export type NavbarLinkProps = {|
-  ...NavLocation,
-  ...StyleProps,
-|}
+export type NavbarLinkProps = NavLocation & StyleProps
 
 const ACTIVE_STYLE = css`
   &.active {
@@ -50,7 +46,7 @@ const ACTIVE_STYLE = css`
   }
 `
 
-export function NavbarLink(props: NavbarLinkProps): React.Node {
+export function NavbarLink(props: NavbarLinkProps): JSX.Element {
   const {
     id,
     path,
diff --git a/app/src/molecules/ReleaseNotes/index.tsx b/app/src/molecules/ReleaseNotes/index.tsx
index b4935252877..6079c76dc7b 100644
--- a/app/src/molecules/ReleaseNotes/index.tsx
+++ b/app/src/molecules/ReleaseNotes/index.tsx
@@ -1,12 +1,11 @@
-// @flow
 import * as React from 'react'
 import remark from 'remark'
 import reactRenderer from 'remark-react'
 import styles from './styles.css'
 
-export type ReleaseNotesProps = {|
-  source: ?string,
-|}
+export interface ReleaseNotesProps {
+  source?: string | null
+}
 
 const renderer = remark().use(reactRenderer, {
   remarkReactComponents: {
@@ -17,7 +16,7 @@ const renderer = remark().use(reactRenderer, {
 
 const DEFAULT_RELEASE_NOTES = 'We recommend upgrading to the latest version.'
 
-export function ReleaseNotes(props: ReleaseNotesProps): React.Node {
+export function ReleaseNotes(props: ReleaseNotesProps): JSX.Element {
   const { source } = props
 
   return (
@@ -31,6 +30,6 @@ export function ReleaseNotes(props: ReleaseNotesProps): React.Node {
   )
 }
 
-function ExternalLink(props) {
+function ExternalLink(props: JSX.IntrinsicAttributes): JSX.Element {
   return <a {...props} target="_blank" rel="noopener noreferrer" />
 }
diff --git a/app/src/molecules/modals/BottomButtonBar.tsx b/app/src/molecules/modals/BottomButtonBar.tsx
index cbb88cc1867..2ff66387ab2 100644
--- a/app/src/molecules/modals/BottomButtonBar.tsx
+++ b/app/src/molecules/modals/BottomButtonBar.tsx
@@ -1,4 +1,3 @@
-// @flow
 // bottom button bar for modals
 // TODO(mc, 2018-08-18): maybe make this the default AlertModal behavior
 import * as React from 'react'
@@ -9,13 +8,14 @@ import styles from './styles.css'
 
 import type { ButtonProps } from '@opentrons/components'
 
-type Props = {|
-  buttons: Array<?ButtonProps>,
-  className?: string,
-  description?: React.Node,
-|}
+type MaybeButtonProps = ButtonProps | null | undefined
+interface Props {
+  buttons: MaybeButtonProps[]
+  className?: string | null
+  description?: React.ReactNode | null
+}
 
-export function BottomButtonBar(props: Props): React.Node {
+export function BottomButtonBar(props: Props): JSX.Element {
   const buttons = props.buttons.filter(Boolean)
   const className = cx(styles.bottom_button_bar, props.className)
 
@@ -27,6 +27,7 @@ export function BottomButtonBar(props: Props): React.Node {
           <OutlineButton
             {...button}
             key={index}
+            // @ts-expect-error button is possibly null
             className={cx(styles.bottom_button, button.className)}
           />
         ))}
diff --git a/app/src/molecules/modals/ErrorModal.tsx b/app/src/molecules/modals/ErrorModal.tsx
index 3ec05a3ebce..ee235bd5565 100644
--- a/app/src/molecules/modals/ErrorModal.tsx
+++ b/app/src/molecules/modals/ErrorModal.tsx
@@ -1,26 +1,29 @@
-// @flow
 import * as React from 'react'
 import { Link } from 'react-router-dom'
 import { AlertModal } from '@opentrons/components'
 import { Portal } from '../../App/portal'
 
 import styles from './styles.css'
+import type { ButtonProps } from '@opentrons/components'
 
-type Props = {|
-  heading?: ?string,
-  description: string,
-  close?: () => mixed,
-  closeUrl?: string,
-  error: { message?: string, ... },
-|}
+interface Props {
+  heading?: string | null
+  description: string
+  close?: () => unknown
+  closeUrl?: string
+  error: { message?: string; [key: string]: unknown }
+}
 
 const DEFAULT_HEADING = 'Unexpected Error'
 const AN_UNKNOWN_ERROR_OCCURRED = 'An unknown error occurred'
 
-export function ErrorModal(props: Props): React.Node {
+export function ErrorModal(props: Props): JSX.Element {
   const { description, error } = props
   const heading = props.heading || DEFAULT_HEADING
-  let closeButtonProps = { children: 'close', onClick: props.close }
+  let closeButtonProps: ButtonProps = {
+    children: 'close',
+    onClick: props.close,
+  }
 
   if (props.closeUrl) {
     closeButtonProps = {
@@ -32,7 +35,6 @@ export function ErrorModal(props: Props): React.Node {
 
   return (
     <Portal>
-      {/* $FlowFixMe(mc, 2021-03-18): resolve with TS conversion or replacement of AlertModal */}
       <AlertModal heading={heading} buttons={[closeButtonProps]} alertOverlay>
         <p className={styles.error_modal_message}>
           {error.message ?? AN_UNKNOWN_ERROR_OCCURRED}
diff --git a/app/src/molecules/modals/ScrollableAlertModal.tsx b/app/src/molecules/modals/ScrollableAlertModal.tsx
index a62f2e3ae79..57a0b41e7f5 100644
--- a/app/src/molecules/modals/ScrollableAlertModal.tsx
+++ b/app/src/molecules/modals/ScrollableAlertModal.tsx
@@ -1,4 +1,3 @@
-// @flow
 // AlertModal with vertical scrolling
 import * as React from 'react'
 import omit from 'lodash/omit'
@@ -7,9 +6,9 @@ import { AlertModal } from '@opentrons/components'
 import { BottomButtonBar } from './BottomButtonBar'
 import styles from './styles.css'
 
-type Props = React.ElementProps<typeof AlertModal>
+type Props = React.ComponentProps<typeof AlertModal>
 
-export function ScrollableAlertModal(props: Props): React.Node {
+export function ScrollableAlertModal(props: Props): JSX.Element {
   return (
     <AlertModal
       {...omit(props, 'buttons', 'children')}
diff --git a/app/src/molecules/modals/index.ts b/app/src/molecules/modals/index.ts
index aa32c877c51..79b136eedb0 100644
--- a/app/src/molecules/modals/index.ts
+++ b/app/src/molecules/modals/index.ts
@@ -1,4 +1,3 @@
-// @flow
 // app specific modals
 export * from './ErrorModal'
 export * from './BottomButtonBar'
diff --git a/app/src/organisms/Alerts/LostConnectionAlert/ModalCopy.tsx b/app/src/organisms/Alerts/LostConnectionAlert/ModalCopy.tsx
index 707ce11d3a2..aef51da22f2 100644
--- a/app/src/organisms/Alerts/LostConnectionAlert/ModalCopy.tsx
+++ b/app/src/organisms/Alerts/LostConnectionAlert/ModalCopy.tsx
@@ -1,10 +1,9 @@
-// @flow
 import * as React from 'react'
 import { Switch, Route } from 'react-router-dom'
 
 import styles from './styles.css'
 
-export function ModalCopy(): React.Node {
+export function ModalCopy(): JSX.Element {
   return (
     <div className={styles.copy}>
       <p>
diff --git a/app/src/organisms/Alerts/LostConnectionAlert/index.tsx b/app/src/organisms/Alerts/LostConnectionAlert/index.tsx
index f09f0af7e18..814f895ceef 100644
--- a/app/src/organisms/Alerts/LostConnectionAlert/index.tsx
+++ b/app/src/organisms/Alerts/LostConnectionAlert/index.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { useDispatch, useSelector } from 'react-redux'
 import { useHistory } from 'react-router-dom'
@@ -14,7 +13,7 @@ import { ModalCopy } from './ModalCopy'
 
 import type { State, Dispatch } from '../../../redux/types'
 
-export function LostConnectionAlert(): React.Node {
+export function LostConnectionAlert(): JSX.Element | null {
   const history = useHistory()
   const dispatch = useDispatch<Dispatch>()
 
@@ -30,23 +29,21 @@ export function LostConnectionAlert(): React.Node {
     return Boolean((connectedName && robotDown) || unexpectedDisconnect)
   })
 
-  const disconnect = () => {
+  const disconnect = (): void => {
     history.push('/robots')
     dispatch(robotActions.disconnect())
   }
 
-  return (
-    showAlert && (
-      <Portal>
-        <AlertModal
-          onCloseClick={disconnect}
-          heading={'Connection to robot lost'}
-          buttons={[{ onClick: disconnect, children: 'close' }]}
-          alertOverlay
-        >
-          <ModalCopy />
-        </AlertModal>
-      </Portal>
-    )
-  )
+  return showAlert ? (
+    <Portal>
+      <AlertModal
+        onCloseClick={disconnect}
+        heading={'Connection to robot lost'}
+        buttons={[{ onClick: disconnect, children: 'close' }]}
+        alertOverlay
+      >
+        <ModalCopy />
+      </AlertModal>
+    </Portal>
+  ) : null
 }
diff --git a/app/src/organisms/Alerts/U2EDriverOutdatedAlert.tsx b/app/src/organisms/Alerts/U2EDriverOutdatedAlert.tsx
index a10ff52789d..526cda70b98 100644
--- a/app/src/organisms/Alerts/U2EDriverOutdatedAlert.tsx
+++ b/app/src/organisms/Alerts/U2EDriverOutdatedAlert.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { Link as InternalLink } from 'react-router-dom'
 import styled from 'styled-components'
@@ -28,7 +27,6 @@ const DONT_REMIND_ME_AGAIN = "Don't remind me again"
 
 const ADAPTER_INFO_URL = '/more/network-and-system'
 
-// $FlowFixMe(mc, 2021-03-15): will be fixed by TS conversion
 const LinkButton = styled(Link)`
   width: auto;
   padding-left: 1rem;
@@ -41,7 +39,7 @@ const IgnoreCheckbox = styled(CheckboxField)`
   bottom: 1.5rem;
 `
 
-export function U2EDriverOutdatedAlert(props: AlertProps): React.Node {
+export function U2EDriverOutdatedAlert(props: AlertProps): JSX.Element {
   const trackEvent = useTrackEvent()
   const [rememberDismiss, toggleRememberDismiss] = useToggle()
   const { dismissAlert } = props
@@ -51,7 +49,6 @@ export function U2EDriverOutdatedAlert(props: AlertProps): React.Node {
       alertOverlay
       heading={DRIVER_OUT_OF_DATE}
       buttons={[
-        /* $FlowFixMe(mc, 2021-03-18): resolve with TS conversion or replacement of AlertModal */
         {
           Component: LinkButton,
           as: InternalLink,
@@ -65,7 +62,6 @@ export function U2EDriverOutdatedAlert(props: AlertProps): React.Node {
             })
           },
         },
-        /* $FlowFixMe(mc, 2021-03-18): resolve with TS conversion or replacement of AlertModal */
         {
           Component: LinkButton,
           href: U2E_DRIVER_UPDATE_URL,
diff --git a/app/src/organisms/Alerts/__tests__/Alerts.test.tsx b/app/src/organisms/Alerts/__tests__/Alerts.test.tsx
index c918817d8cc..8c21097b1e9 100644
--- a/app/src/organisms/Alerts/__tests__/Alerts.test.tsx
+++ b/app/src/organisms/Alerts/__tests__/Alerts.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 
 import { mountWithStore } from '@opentrons/components/__utils__'
@@ -30,18 +29,21 @@ jest.mock('../../UpdateAppModal', () => ({
 
 jest.mock('../../../redux/alerts/selectors')
 
-const getActiveAlerts: JestMockFn<[State], $ReadOnlyArray<AlertId>> =
-  AppAlerts.getActiveAlerts
+const getActiveAlerts = AppAlerts.getActiveAlerts as jest.MockedFunction<
+  typeof AppAlerts.getActiveAlerts
+>
 
-const MOCK_STATE: State = ({ mockState: true }: any)
+const MOCK_STATE: State = { mockState: true } as any
 
 describe('app-wide Alerts component', () => {
   const render = () => {
-    return mountWithStore(<Alerts />, { initialState: MOCK_STATE })
+    return mountWithStore<React.ComponentProps<typeof Alerts>>(<Alerts />, {
+      initialState: MOCK_STATE,
+    })
   }
 
-  const stubActiveAlerts = alertIds => {
-    getActiveAlerts.mockImplementation(state => {
+  const stubActiveAlerts = (alertIds: AlertId[]): void => {
+    getActiveAlerts.mockImplementation((state: State): AlertId[] => {
       expect(state).toEqual(MOCK_STATE)
       return alertIds
     })
@@ -77,7 +79,7 @@ describe('app-wide Alerts component', () => {
     refresh()
     expect(wrapper.exists(U2EDriverOutdatedAlert)).toBe(true)
 
-    wrapper.find(U2EDriverOutdatedAlert).invoke('dismissAlert')(true)
+    wrapper.find(U2EDriverOutdatedAlert).invoke('dismissAlert')?.(true)
 
     expect(store.dispatch).toHaveBeenCalledWith(
       AppAlerts.alertDismissed(AppAlerts.ALERT_U2E_DRIVER_OUTDATED, true)
@@ -92,7 +94,7 @@ describe('app-wide Alerts component', () => {
     refresh()
     expect(wrapper.exists(UpdateAppModal)).toBe(true)
 
-    wrapper.find(UpdateAppModal).invoke('dismissAlert')(true)
+    wrapper.find(UpdateAppModal).invoke('dismissAlert')?.(true)
 
     expect(store.dispatch).toHaveBeenCalledWith(
       AppAlerts.alertDismissed(AppAlerts.ALERT_APP_UPDATE_AVAILABLE, true)
diff --git a/app/src/organisms/Alerts/__tests__/U2EDriverOutdatedAlert.test.tsx b/app/src/organisms/Alerts/__tests__/U2EDriverOutdatedAlert.test.tsx
index 2c520e7f29b..24067c80288 100644
--- a/app/src/organisms/Alerts/__tests__/U2EDriverOutdatedAlert.test.tsx
+++ b/app/src/organisms/Alerts/__tests__/U2EDriverOutdatedAlert.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { act } from 'react-dom/test-utils'
 import { mount } from 'enzyme'
@@ -16,19 +15,22 @@ jest.mock('react-router-dom', () => ({
 
 // TODO(mc, 2020-05-07): remove this feature flag
 jest.mock('../../../redux/config/hooks', () => ({
-  useFeatureFlag: flag => flag === 'systemInfoEnabled',
+  useFeatureFlag: (flag: string) => flag === 'systemInfoEnabled',
 }))
 
 const EXPECTED_DOWNLOAD_URL =
   'https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-usb-3-0-software'
 
-const useTrackEvent: JestMockFn<[], $Call<typeof Analytics.useTrackEvent>> =
-  Analytics.useTrackEvent
+const useTrackEvent = Analytics.useTrackEvent as jest.MockedFunction<
+  typeof Analytics.useTrackEvent
+>
 
 describe('U2EDriverOutdatedAlert', () => {
   const dismissAlert = jest.fn()
-  const trackEvent = jest.fn()
-  const render = () => {
+  const trackEvent: ReturnType<
+    typeof Analytics.useTrackEvent
+  > = jest.fn() as any
+  const render = (): ReturnType<typeof mount> => {
     return mount(<U2EDriverOutdatedAlert dismissAlert={dismissAlert} />)
   }
 
@@ -53,7 +55,7 @@ describe('U2EDriverOutdatedAlert', () => {
     const wrapper = render()
     const link = wrapper.find('Link[to="/more/network-and-system"]')
 
-    link.invoke('onClick')()
+    link.invoke('onClick')?.({} as React.MouseEvent)
 
     expect(link.prop('children')).toContain('view adapter info')
     expect(dismissAlert).toHaveBeenCalledWith(false)
@@ -67,7 +69,7 @@ describe('U2EDriverOutdatedAlert', () => {
     const wrapper = render()
     const link = wrapper.find(`a[href="${EXPECTED_DOWNLOAD_URL}"]`)
 
-    link.invoke('onClick')()
+    link.invoke('onClick')?.({} as React.MouseEvent)
 
     expect(link.prop('children')).toContain('get update')
     expect(dismissAlert).toHaveBeenCalledWith(false)
@@ -85,7 +87,9 @@ describe('U2EDriverOutdatedAlert', () => {
       checkbox.simulate('change')
     })
     wrapper.update()
-    wrapper.find('Link[to="/more/network-and-system"]').invoke('onClick')()
+    wrapper.find('Link[to="/more/network-and-system"]').invoke('onClick')?.(
+      {} as React.MouseEvent
+    )
 
     expect(dismissAlert).toHaveBeenCalledWith(true)
     expect(trackEvent).toHaveBeenCalledWith({
diff --git a/app/src/organisms/Alerts/index.tsx b/app/src/organisms/Alerts/index.tsx
index c8ab2b8bb7c..baa9b9b30be 100644
--- a/app/src/organisms/Alerts/index.tsx
+++ b/app/src/organisms/Alerts/index.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { useSelector, useDispatch } from 'react-redux'
 import head from 'lodash/head'
@@ -12,7 +11,7 @@ import { U2EDriverOutdatedAlert } from './U2EDriverOutdatedAlert'
 import type { State, Dispatch } from '../../redux/types'
 import type { AlertId } from '../../redux/alerts/types'
 
-export function Alerts(): React.Node {
+export function Alerts(): JSX.Element {
   const dispatch = useDispatch<Dispatch>()
 
   // TODO(mc, 2020-05-07): move head logic to selector with alert priorities
@@ -20,7 +19,7 @@ export function Alerts(): React.Node {
     return head(AppAlerts.getActiveAlerts(state)) ?? null
   })
 
-  const dismissAlert = remember => {
+  const dismissAlert = (remember?: boolean): void => {
     if (activeAlert) {
       dispatch(AppAlerts.alertDismissed(activeAlert, remember))
     }
diff --git a/app/src/organisms/Alerts/types.ts b/app/src/organisms/Alerts/types.ts
index 482ec2aa6bf..dca2a16fc8a 100644
--- a/app/src/organisms/Alerts/types.ts
+++ b/app/src/organisms/Alerts/types.ts
@@ -1,5 +1,3 @@
-// @flow
-
-export type AlertProps = {|
-  dismissAlert: (remember?: boolean) => mixed,
-|}
+export interface AlertProps {
+  dismissAlert: (remember?: boolean) => unknown
+}
diff --git a/app/src/organisms/AnalyticsSettingsModal/AnalyticsToggle.tsx b/app/src/organisms/AnalyticsSettingsModal/AnalyticsToggle.tsx
index e7e8d68d81e..110bfafd4b0 100644
--- a/app/src/organisms/AnalyticsSettingsModal/AnalyticsToggle.tsx
+++ b/app/src/organisms/AnalyticsSettingsModal/AnalyticsToggle.tsx
@@ -1,6 +1,5 @@
-// @flow
 import * as React from 'react'
-import { connect } from 'react-redux'
+import { connect, MapStateToProps, MapDispatchToProps } from 'react-redux'
 import { LabeledToggle } from '@opentrons/components'
 
 import {
@@ -8,29 +7,19 @@ import {
   getAnalyticsOptedIn,
 } from '../../redux/analytics'
 
-import type { State, Dispatch } from '../../redux/types'
+import type { State } from '../../redux/types'
 
-type OP = {||}
-
-type SP = {| optedIn: boolean |}
+interface SP {
+  optedIn: boolean
+}
 
-type DP = {| toggleOptedIn: () => mixed |}
+interface DP {
+  toggleOptedIn: () => unknown
+}
 
-type Props = {| ...SP, ...DP |}
+type Props = SP & DP
 
-export const AnalyticsToggle: React.AbstractComponent<OP> = connect<
-  Props,
-  OP,
-  SP,
-  DP,
-  _,
-  _
->(
-  mapStateToProps,
-  mapDispatchToProps
-)(AnalyticsToggleComponent)
-
-function AnalyticsToggleComponent(props: Props) {
+function AnalyticsToggleComponent(props: Props): JSX.Element {
   return (
     <LabeledToggle
       label="Share robot & app analytics with Opentrons"
@@ -50,14 +39,19 @@ function AnalyticsToggleComponent(props: Props) {
   )
 }
 
-function mapStateToProps(state: State): SP {
+const mapStateToProps: MapStateToProps<SP, {}, State> = state => {
   return {
     optedIn: getAnalyticsOptedIn(state),
   }
 }
 
-function mapDispatchToProps(dispatch: Dispatch): DP {
+const mapDispatchToProps: MapDispatchToProps<DP, {}> = dispatch => {
   return {
     toggleOptedIn: () => dispatch(toggleAnalyticsOptedIn()),
   }
 }
+
+export const AnalyticsToggle = connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(AnalyticsToggleComponent)
diff --git a/app/src/organisms/AnalyticsSettingsModal/index.tsx b/app/src/organisms/AnalyticsSettingsModal/index.tsx
index 2bb9308860e..ce057003dec 100644
--- a/app/src/organisms/AnalyticsSettingsModal/index.tsx
+++ b/app/src/organisms/AnalyticsSettingsModal/index.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { useSelector, useDispatch } from 'react-redux'
 
@@ -17,22 +16,19 @@ const TITLE = 'Privacy Settings'
 const CONTINUE = 'continue'
 
 // TODO(mc, 2020-05-07): move render logic to `state.alerts`
-export function AnalyticsSettingsModal(): React.Node {
+export function AnalyticsSettingsModal(): JSX.Element | null {
   const dispatch = useDispatch<Dispatch>()
   const seen = useSelector(getAnalyticsOptInSeen)
-  const setSeen = () => dispatch(setAnalyticsOptInSeen())
+  const setSeen = (): unknown => dispatch(setAnalyticsOptInSeen())
 
-  return (
-    !seen && (
-      <Portal>
-        <Modal onCloseClick={setSeen} heading={TITLE} alertOverlay>
-          <AnalyticsToggle />
-          {/* $FlowFixMe(mc, 2021-03-18): this should be a SecondaryBtn */}
-          <OutlineButton onClick={setSeen} float="right" margin="0.75rem">
-            {CONTINUE}
-          </OutlineButton>
-        </Modal>
-      </Portal>
-    )
-  )
+  return !seen ? (
+    <Portal>
+      <Modal onCloseClick={setSeen} heading={TITLE} alertOverlay>
+        <AnalyticsToggle />
+        <OutlineButton onClick={setSeen} float="right" margin="0.75rem">
+          {CONTINUE}
+        </OutlineButton>
+      </Modal>
+    </Portal>
+  ) : null
 }
diff --git a/app/src/organisms/CalibrateDeck/__tests__/CalibrateDeck.test.tsx b/app/src/organisms/CalibrateDeck/__tests__/CalibrateDeck.test.tsx
index ef7c84ce15e..2afc68c0723 100644
--- a/app/src/organisms/CalibrateDeck/__tests__/CalibrateDeck.test.tsx
+++ b/app/src/organisms/CalibrateDeck/__tests__/CalibrateDeck.test.tsx
@@ -1,10 +1,8 @@
-// @flow
 import * as React from 'react'
 import { Provider } from 'react-redux'
 import { mount } from 'enzyme'
 import { act } from 'react-dom/test-utils'
 
-// $FlowFixMe(mc, 2021-03.15): ignore until TS conversion
 import { getDeckDefinitions } from '@opentrons/components/src/deck/getDeckDefinitions'
 
 import * as Sessions from '../../../redux/sessions'
@@ -19,37 +17,42 @@ import {
   SaveZPoint,
   SaveXYPoint,
   CompleteConfirmation,
-} from '../../../organisms/CalibrationPanels'
+} from '../../CalibrationPanels'
 
+import type { ReactWrapper, HTMLAttributes } from 'enzyme'
 import type { DeckCalibrationStep } from '../../../redux/sessions/types'
+import type { DispatchRequestsType } from '../../../redux/robot-api'
+import type { Dispatch } from '../../../redux/types'
+import type { CalibrationPanelProps } from '../../CalibrationPanels/types'
 
 jest.mock('@opentrons/components/src/deck/getDeckDefinitions')
 jest.mock('../../../redux/sessions/selectors')
 jest.mock('../../../redux/robot-api/selectors')
 
-type CalibrateDeckSpec = {
-  component: React.AbstractComponent<any>,
-  childProps?: {},
-  currentStep: DeckCalibrationStep,
-  ...
+interface CalibrateDeckSpec {
+  component: (props: CalibrationPanelProps) => JSX.Element
+  currentStep: DeckCalibrationStep
 }
 
-const mockGetDeckDefinitions: JestMockFn<
-  [],
-  $Call<typeof getDeckDefinitions, any>
-> = getDeckDefinitions
+const mockGetDeckDefinitions = getDeckDefinitions as jest.MockedFunction<
+  typeof getDeckDefinitions
+>
 
 describe('CalibrateDeck', () => {
-  let mockStore
-  let render
-  let dispatch
-  let dispatchRequests
+  let mockStore: any
+  let render: (
+    props?: Partial<React.ComponentProps<typeof CalibrateDeck>>
+  ) => ReactWrapper<React.ComponentProps<typeof CalibrateDeck>>
+  let dispatch: Dispatch
+  let dispatchRequests: DispatchRequestsType
   let mockDeckCalSession: Sessions.DeckCalibrationSession = {
     id: 'fake_session_id',
     ...mockDeckCalibrationSessionAttributes,
   }
 
-  const getExitButton = wrapper =>
+  const getExitButton = (
+    wrapper: ReactWrapper<React.ComponentProps<typeof CalibrateDeck>>
+  ): ReactWrapper<HTMLAttributes> =>
     wrapper.find({ title: 'exit' }).find('button')
 
   const POSSIBLE_CHILDREN = [
@@ -62,7 +65,7 @@ describe('CalibrateDeck', () => {
     CompleteConfirmation,
   ]
 
-  const SPECS: Array<CalibrateDeckSpec> = [
+  const SPECS: CalibrateDeckSpec[] = [
     { component: Introduction, currentStep: 'sessionStarted' },
     { component: DeckSetup, currentStep: 'labwareLoaded' },
     { component: TipPickUp, currentStep: 'preparingPipette' },
@@ -142,7 +145,9 @@ describe('CalibrateDeck', () => {
     const wrapper = render()
 
     expect(wrapper.find('ConfirmExitModal').exists()).toBe(false)
-    act(() => getExitButton(wrapper).invoke('onClick')())
+    act((): void =>
+      getExitButton(wrapper).invoke('onClick')?.({} as React.MouseEvent)
+    )
     wrapper.update()
     expect(wrapper.find('ConfirmExitModal').exists()).toBe(true)
   })
@@ -166,7 +171,9 @@ describe('CalibrateDeck', () => {
       },
     }
     const wrapper = render({ isJogging: false, session })
-    wrapper.find('button[title="forward"]').invoke('onClick')()
+    wrapper.find('button[title="forward"]').invoke('onClick')?.(
+      {} as React.MouseEvent
+    )
     expect(dispatchRequests).toHaveBeenCalledWith(
       Sessions.createSessionCommand('robot-name', session.id, {
         command: Sessions.sharedCalCommands.JOG,
@@ -185,7 +192,9 @@ describe('CalibrateDeck', () => {
       },
     }
     const wrapper = render({ isJogging: true, session })
-    wrapper.find('button[title="forward"]').invoke('onClick')()
+    wrapper.find('button[title="forward"]').invoke('onClick')?.(
+      {} as React.MouseEvent
+    )
     expect(dispatchRequests).not.toHaveBeenCalledWith(
       Sessions.createSessionCommand('robot-name', session.id, {
         command: Sessions.sharedCalCommands.JOG,
diff --git a/app/src/organisms/CalibrateDeck/index.tsx b/app/src/organisms/CalibrateDeck/index.tsx
index e52308d8a06..cd7a146d7cd 100644
--- a/app/src/organisms/CalibrateDeck/index.tsx
+++ b/app/src/organisms/CalibrateDeck/index.tsx
@@ -1,4 +1,3 @@
-// @flow
 // Deck Calibration Orchestration Component
 import * as React from 'react'
 
@@ -31,9 +30,10 @@ import {
   INTENT_DECK_CALIBRATION,
 } from '../../organisms/CalibrationPanels'
 
-import type { StyleProps } from '@opentrons/components'
+import type { StyleProps, Mount } from '@opentrons/components'
 import type {
   CalibrationLabware,
+  CalibrationSessionStep,
   SessionCommandParams,
 } from '../../redux/sessions/types'
 import type { CalibrationPanelProps } from '../../organisms/CalibrationPanels/types'
@@ -66,9 +66,9 @@ const terminalContentsStyleProps = {
   paddingX: '1.5rem',
 }
 
-const PANEL_BY_STEP: {
-  [string]: React.ComponentType<CalibrationPanelProps>,
-} = {
+const PANEL_BY_STEP: Partial<
+  Record<CalibrationSessionStep, React.ComponentType<CalibrationPanelProps>>
+> = {
   [Sessions.DECK_STEP_SESSION_STARTED]: Introduction,
   [Sessions.DECK_STEP_LABWARE_LOADED]: DeckSetup,
   [Sessions.DECK_STEP_PREPARING_PIPETTE]: TipPickUp,
@@ -79,9 +79,10 @@ const PANEL_BY_STEP: {
   [Sessions.DECK_STEP_SAVING_POINT_THREE]: SaveXYPoint,
   [Sessions.DECK_STEP_CALIBRATION_COMPLETE]: CompleteConfirmation,
 }
-const PANEL_STYLE_PROPS_BY_STEP: {
-  [string]: StyleProps,
-} = {
+
+const PANEL_STYLE_PROPS_BY_STEP: Partial<
+  Record<CalibrationSessionStep, StyleProps>
+> = {
   [Sessions.DECK_STEP_SESSION_STARTED]: terminalContentsStyleProps,
   [Sessions.DECK_STEP_LABWARE_LOADED]: darkContentsStyleProps,
   [Sessions.DECK_STEP_PREPARING_PIPETTE]: contentsStyleProps,
@@ -92,7 +93,9 @@ const PANEL_STYLE_PROPS_BY_STEP: {
   [Sessions.DECK_STEP_SAVING_POINT_THREE]: contentsStyleProps,
   [Sessions.DECK_STEP_CALIBRATION_COMPLETE]: terminalContentsStyleProps,
 }
-export function CalibrateDeck(props: CalibrateDeckParentProps): React.Node {
+export function CalibrateDeck(
+  props: CalibrateDeckParentProps
+): JSX.Element | null {
   const { session, robotName, dispatchRequests, showSpinner, isJogging } = props
   const { currentStep, instrument, labware, supportedCommands } =
     session?.details || {}
@@ -110,7 +113,7 @@ export function CalibrateDeck(props: CalibrateDeckParentProps): React.Node {
     return spec ? spec.channels > 1 : false
   }, [instrument])
 
-  function sendCommands(...commands: Array<SessionCommandParams>) {
+  function sendCommands(...commands: SessionCommandParams[]): void {
     if (session?.id && !isJogging) {
       const sessionCommandActions = commands.map(c =>
         Sessions.createSessionCommand(robotName, session.id, {
@@ -122,7 +125,7 @@ export function CalibrateDeck(props: CalibrateDeckParentProps): React.Node {
     }
   }
 
-  function cleanUpAndExit() {
+  function cleanUpAndExit(): void {
     if (session?.id) {
       dispatchRequests(
         Sessions.createSessionCommand(robotName, session.id, {
@@ -149,20 +152,20 @@ export function CalibrateDeck(props: CalibrateDeckParentProps): React.Node {
   if (showSpinner) {
     return <SpinnerModalPage titleBar={titleBarProps} />
   }
-
+  // @ts-expect-error TODO: cannot index with undefined. Also, add test coverage for null case when no panel
   const Panel = PANEL_BY_STEP[currentStep]
   return Panel ? (
     <>
       <ModalPage
         titleBar={titleBarProps}
-        innerProps={PANEL_STYLE_PROPS_BY_STEP[currentStep]}
+        innerProps={currentStep ? PANEL_STYLE_PROPS_BY_STEP[currentStep] : {}}
       >
         <Panel
           sendCommands={sendCommands}
           cleanUpAndExit={cleanUpAndExit}
           tipRack={tipRack}
           isMulti={isMulti}
-          mount={instrument?.mount.toLowerCase()}
+          mount={instrument?.mount.toLowerCase() as Mount}
           currentStep={currentStep}
           sessionType={session.sessionType}
           intent={INTENT_DECK_CALIBRATION}
@@ -171,6 +174,7 @@ export function CalibrateDeck(props: CalibrateDeckParentProps): React.Node {
         />
       </ModalPage>
       {showConfirmExit && (
+        // @ts-expect-error TODO: ConfirmExitModal expects sessionType
         <ConfirmExitModal exit={confirmExit} back={cancelExit} />
       )}
     </>
diff --git a/app/src/organisms/CalibrateDeck/types.ts b/app/src/organisms/CalibrateDeck/types.ts
index 588990ec09c..e2589f5f55d 100644
--- a/app/src/organisms/CalibrateDeck/types.ts
+++ b/app/src/organisms/CalibrateDeck/types.ts
@@ -1,13 +1,10 @@
-// @flow
-import type { Action } from '../../redux/types'
 import type { DeckCalibrationSession } from '../../redux/sessions/types'
+import { DispatchRequestsType } from '../../redux/robot-api'
 
-export type CalibrateDeckParentProps = {|
-  robotName: string,
-  session: DeckCalibrationSession | null,
-  dispatchRequests: (
-    ...Array<{ ...Action, meta: { requestId: string } }>
-  ) => void,
-  showSpinner: boolean,
-  isJogging: boolean,
-|}
+export interface CalibrateDeckParentProps {
+  robotName: string
+  session: DeckCalibrationSession | null
+  dispatchRequests: DispatchRequestsType
+  showSpinner: boolean
+  isJogging: boolean
+}
diff --git a/app/src/organisms/CalibratePipetteOffset/__tests__/CalibratePipetteOffset.test.tsx b/app/src/organisms/CalibratePipetteOffset/__tests__/CalibratePipetteOffset.test.tsx
index 067a9c47e04..4d0ed1ef718 100644
--- a/app/src/organisms/CalibratePipetteOffset/__tests__/CalibratePipetteOffset.test.tsx
+++ b/app/src/organisms/CalibratePipetteOffset/__tests__/CalibratePipetteOffset.test.tsx
@@ -1,10 +1,8 @@
-// @flow
 import * as React from 'react'
 import { Provider } from 'react-redux'
-import { mount } from 'enzyme'
+import { HTMLAttributes, mount } from 'enzyme'
 import { act } from 'react-dom/test-utils'
 
-// $FlowFixMe(mc, 2021-03.15): ignore until TS conversion
 import { getDeckDefinitions } from '@opentrons/components/src/deck/getDeckDefinitions'
 
 import * as Sessions from '../../../redux/sessions'
@@ -23,31 +21,35 @@ import {
 } from '../../../organisms/CalibrationPanels'
 
 import type { PipetteOffsetCalibrationStep } from '../../../redux/sessions/types'
+import type { ReactWrapper } from 'enzyme'
+import type { Dispatch } from 'redux'
+import { DispatchRequestsType } from '../../../redux/robot-api'
 
 jest.mock('@opentrons/components/src/deck/getDeckDefinitions')
 jest.mock('../../../redux/sessions/selectors')
 jest.mock('../../../redux/robot-api/selectors')
 
-type CalibratePipetteOffsetSpec = {
-  component: React.AbstractComponent<any>,
-  childProps?: {},
-  currentStep: PipetteOffsetCalibrationStep,
-  ...
+interface CalibratePipetteOffsetSpec {
+  component: React.ReactNode
+  currentStep: PipetteOffsetCalibrationStep
 }
 
-const mockGetDeckDefinitions: JestMockFn<
-  [],
-  $Call<typeof getDeckDefinitions, any>
-> = getDeckDefinitions
+const mockGetDeckDefinitions = getDeckDefinitions as jest.MockedFunction<
+  typeof getDeckDefinitions
+>
 
 describe('CalibratePipetteOffset', () => {
-  let mockStore
-  let render
-  let dispatch
-  let dispatchRequests
+  let mockStore: any
+  let render: (
+    props?: Partial<React.ComponentProps<typeof CalibratePipetteOffset>>
+  ) => ReactWrapper<React.ComponentType<typeof CalibratePipetteOffset>>
+  let dispatch: jest.MockedFunction<Dispatch>
+  let dispatchRequests: DispatchRequestsType
   let mockPipOffsetCalSession: Sessions.PipetteOffsetCalibrationSession
 
-  const getExitButton = wrapper =>
+  const getExitButton = (
+    wrapper: ReturnType<typeof render>
+  ): ReactWrapper<HTMLAttributes> =>
     wrapper.find({ title: 'exit' }).find('button')
 
   const POSSIBLE_CHILDREN = [
@@ -60,7 +62,7 @@ describe('CalibratePipetteOffset', () => {
     CompleteConfirmation,
   ]
 
-  const SPECS: Array<CalibratePipetteOffsetSpec> = [
+  const SPECS: CalibratePipetteOffsetSpec[] = [
     { component: Introduction, currentStep: 'sessionStarted' },
     { component: DeckSetup, currentStep: 'labwareLoaded' },
     { component: TipPickUp, currentStep: 'preparingPipette' },
@@ -93,7 +95,7 @@ describe('CalibratePipetteOffset', () => {
         isJogging = false,
         session = mockPipOffsetCalSession,
       } = props
-      return mount(
+      return mount<React.ComponentType<typeof CalibratePipetteOffset>>(
         <CalibratePipetteOffset
           robotName="robot-name"
           session={session}
@@ -122,7 +124,7 @@ describe('CalibratePipetteOffset', () => {
           ...mockPipOffsetCalSession.details,
           currentStep: spec.currentStep,
         },
-      }
+      } as any
       const wrapper = render()
 
       POSSIBLE_CHILDREN.forEach(child => {
@@ -139,7 +141,9 @@ describe('CalibratePipetteOffset', () => {
     const wrapper = render()
 
     expect(wrapper.find('ConfirmExitModal').exists()).toBe(false)
-    act(() => getExitButton(wrapper).invoke('onClick')())
+    act((): void =>
+      getExitButton(wrapper).invoke('onClick')?.({} as React.MouseEvent)
+    )
     wrapper.update()
     expect(wrapper.find('ConfirmExitModal').exists()).toBe(true)
   })
@@ -164,7 +168,9 @@ describe('CalibratePipetteOffset', () => {
       },
     }
     const wrapper = render({ isJogging: false, session })
-    wrapper.find('button[title="forward"]').invoke('onClick')()
+    wrapper.find('button[title="forward"]').invoke('onClick')?.(
+      {} as React.MouseEvent
+    )
     expect(dispatchRequests).toHaveBeenCalledWith(
       Sessions.createSessionCommand('robot-name', session.id, {
         command: Sessions.sharedCalCommands.JOG,
@@ -183,7 +189,9 @@ describe('CalibratePipetteOffset', () => {
       },
     }
     const wrapper = render({ isJogging: true, session })
-    wrapper.find('button[title="forward"]').invoke('onClick')()
+    wrapper.find('button[title="forward"]').invoke('onClick')?.(
+      {} as React.MouseEvent
+    )
     expect(dispatchRequests).not.toHaveBeenCalledWith(
       Sessions.createSessionCommand('robot-name', session.id, {
         command: Sessions.sharedCalCommands.JOG,
diff --git a/app/src/organisms/CalibratePipetteOffset/__tests__/useCalibratePipetteOffset.test.tsx b/app/src/organisms/CalibratePipetteOffset/__tests__/useCalibratePipetteOffset.test.tsx
index 1f88b1a082c..22e75d08796 100644
--- a/app/src/organisms/CalibratePipetteOffset/__tests__/useCalibratePipetteOffset.test.tsx
+++ b/app/src/organisms/CalibratePipetteOffset/__tests__/useCalibratePipetteOffset.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import uniqueId from 'lodash/uniqueId'
 import { mountWithStore } from '@opentrons/components/__utils__'
@@ -12,31 +11,28 @@ import { useCalibratePipetteOffset } from '../useCalibratePipetteOffset'
 import { INTENT_TIP_LENGTH_OUTSIDE_PROTOCOL } from '../../../organisms/CalibrationPanels'
 import { pipetteOffsetCalibrationStarted } from '../../../redux/analytics'
 
-import type { State } from '../../../redux/types'
-import type { SessionType } from '../../../redux/sessions'
+import type { Invoker } from '../useCalibratePipetteOffset'
 
 jest.mock('../../../redux/sessions/selectors')
 jest.mock('../../../redux/robot-api/selectors')
 jest.mock('lodash/uniqueId')
 
-const mockUniqueId: JestMockFn<[string | void], string> = uniqueId
-const mockGetRobotSessionOfType: JestMockFn<
-  [State, string, SessionType],
-  $Call<typeof Sessions.getRobotSessionOfType, State, string, SessionType>
-> = Sessions.getRobotSessionOfType
-const mockGetRequestById: JestMockFn<
-  [State, string],
-  $Call<typeof RobotApi.getRequestById, State, string>
-> = RobotApi.getRequestById
+const mockUniqueId = uniqueId as jest.MockedFunction<typeof uniqueId>
+const mockGetRobotSessionOfType = Sessions.getRobotSessionOfType as jest.MockedFunction<
+  typeof Sessions.getRobotSessionOfType
+>
+const mockGetRequestById = RobotApi.getRequestById as jest.MockedFunction<
+  typeof RobotApi.getRequestById
+>
 
 describe('useCalibratePipetteOffset hook', () => {
-  let startCalibration
-  let CalWizardComponent
+  let startCalibration: Invoker
+  let CalWizardComponent: JSX.Element | null
   const robotName = 'robotName'
   const mountString = 'left'
   const onComplete = jest.fn()
 
-  const TestUseCalibratePipetteOffset = () => {
+  const TestUseCalibratePipetteOffset = (): JSX.Element => {
     const [_startCalibration, _CalWizardComponent] = useCalibratePipetteOffset(
       robotName,
       {
@@ -193,7 +189,7 @@ describe('useCalibratePipetteOffset hook', () => {
 
     wrapper
       .find('button[title="Return tip to tip rack and exit"]')
-      .invoke('onClick')()
+      .invoke('onClick')?.({} as React.MouseEvent)
     wrapper.setProps({})
     expect(store.dispatch).toHaveBeenCalledWith({
       ...Sessions.deleteSession(robotName, seshId),
diff --git a/app/src/organisms/CalibratePipetteOffset/index.tsx b/app/src/organisms/CalibratePipetteOffset/index.tsx
index c62f28653f4..372eafe3578 100644
--- a/app/src/organisms/CalibratePipetteOffset/index.tsx
+++ b/app/src/organisms/CalibratePipetteOffset/index.tsx
@@ -1,4 +1,3 @@
-// @flow
 // Pipette Offset Calibration Orchestration Component
 import * as React from 'react'
 
@@ -31,9 +30,10 @@ import {
   MeasureTip,
 } from '../../organisms/CalibrationPanels'
 
-import type { StyleProps } from '@opentrons/components'
+import type { StyleProps, Mount } from '@opentrons/components'
 import type {
   CalibrationLabware,
+  CalibrationSessionStep,
   SessionCommandParams,
 } from '../../redux/sessions/types'
 import type { CalibratePipetteOffsetParentProps } from './types'
@@ -67,9 +67,9 @@ const terminalContentsStyleProps = {
   paddingX: '1.5rem',
 }
 
-const PANEL_BY_STEP: {
-  [string]: React.ComponentType<CalibrationPanelProps>,
-} = {
+const PANEL_BY_STEP: Partial<
+  Record<CalibrationSessionStep, React.ComponentType<CalibrationPanelProps>>
+> = {
   [Sessions.PIP_OFFSET_STEP_SESSION_STARTED]: Introduction,
   [Sessions.PIP_OFFSET_STEP_LABWARE_LOADED]: DeckSetup,
   [Sessions.PIP_OFFSET_STEP_MEASURING_NOZZLE_OFFSET]: MeasureNozzle,
@@ -82,9 +82,9 @@ const PANEL_BY_STEP: {
   [Sessions.PIP_OFFSET_STEP_CALIBRATION_COMPLETE]: CompleteConfirmation,
 }
 
-const PANEL_STYLE_PROPS_BY_STEP: {
-  [string]: StyleProps,
-} = {
+const PANEL_STYLE_PROPS_BY_STEP: Partial<
+  Record<CalibrationSessionStep, StyleProps>
+> = {
   [Sessions.PIP_OFFSET_STEP_SESSION_STARTED]: terminalContentsStyleProps,
   [Sessions.PIP_OFFSET_STEP_LABWARE_LOADED]: darkContentsStyleProps,
   [Sessions.PIP_OFFSET_STEP_PREPARING_PIPETTE]: contentsStyleProps,
@@ -96,7 +96,7 @@ const PANEL_STYLE_PROPS_BY_STEP: {
 }
 export function CalibratePipetteOffset(
   props: CalibratePipetteOffsetParentProps
-): React.Node {
+): JSX.Element | null {
   const {
     session,
     robotName,
@@ -127,7 +127,7 @@ export function CalibratePipetteOffset(
     return spec ? spec.channels > 1 : false
   }, [instrument])
 
-  function sendCommands(...commands: Array<SessionCommandParams>) {
+  function sendCommands(...commands: SessionCommandParams[]): void {
     if (session?.id && !isJogging) {
       const sessionCommandActions = commands.map(c =>
         Sessions.createSessionCommand(robotName, session.id, {
@@ -139,7 +139,7 @@ export function CalibratePipetteOffset(
     }
   }
 
-  function cleanUpAndExit() {
+  function cleanUpAndExit(): void {
     if (session?.id) {
       dispatchRequests(
         Sessions.createSessionCommand(robotName, session.id, {
@@ -166,11 +166,13 @@ export function CalibratePipetteOffset(
     return <SpinnerModalPage key={instrument?.mount} titleBar={titleBarProps} />
   }
 
+  // @ts-expect-error TODO protect against currentStep === undefined
   const Panel = PANEL_BY_STEP[currentStep]
   return Panel ? (
     <>
       <ModalPage
         titleBar={titleBarProps}
+        // @ts-expect-error TODO protect against currentStep === undefined
         innerProps={PANEL_STYLE_PROPS_BY_STEP[currentStep]}
         key={instrument?.mount}
       >
@@ -179,7 +181,7 @@ export function CalibratePipetteOffset(
           cleanUpAndExit={cleanUpAndExit}
           tipRack={tipRack}
           isMulti={isMulti}
-          mount={instrument?.mount.toLowerCase()}
+          mount={instrument?.mount.toLowerCase() as Mount}
           calBlock={calBlock}
           currentStep={currentStep}
           sessionType={session.sessionType}
diff --git a/app/src/organisms/CalibratePipetteOffset/types.ts b/app/src/organisms/CalibratePipetteOffset/types.ts
index 6e6180ce980..e4132345386 100644
--- a/app/src/organisms/CalibratePipetteOffset/types.ts
+++ b/app/src/organisms/CalibratePipetteOffset/types.ts
@@ -1,5 +1,3 @@
-// @flow
-import type { Action } from '../../redux/types'
 import type {
   SessionCommandParams,
   PipetteOffsetCalibrationSession,
@@ -8,23 +6,22 @@ import type {
 import type { PipetteOffsetIntent } from '../../organisms/CalibrationPanels/types'
 
 import type { PipetteOffsetCalibrationStep } from '../../redux/sessions/pipette-offset-calibration/types'
+import { DispatchRequestsType } from '../../redux/robot-api'
 
-export type CalibratePipetteOffsetParentProps = {|
-  robotName: string,
-  session: PipetteOffsetCalibrationSession | null,
-  dispatchRequests: (
-    ...Array<{ ...Action, meta: { requestId: string } }>
-  ) => void,
-  showSpinner: boolean,
-  isJogging: boolean,
-  intent: PipetteOffsetIntent,
-|}
+export interface CalibratePipetteOffsetParentProps {
+  robotName: string
+  session: PipetteOffsetCalibrationSession | null
+  dispatchRequests: DispatchRequestsType
+  showSpinner: boolean
+  isJogging: boolean
+  intent: PipetteOffsetIntent
+}
 
-export type CalibratePipetteOffsetChildProps = {|
-  sendSessionCommands: (...Array<SessionCommandParams>) => void,
-  deleteSession: () => void,
-  tipRack: CalibrationLabware,
-  isMulti: boolean,
-  mount: string,
-  currentStep: PipetteOffsetCalibrationStep,
-|}
+export interface CalibratePipetteOffsetChildProps {
+  sendSessionCommands: (...params: SessionCommandParams[]) => void
+  deleteSession: () => void
+  tipRack: CalibrationLabware
+  isMulti: boolean
+  mount: string
+  currentStep: PipetteOffsetCalibrationStep
+}
diff --git a/app/src/organisms/CalibratePipetteOffset/useCalibratePipetteOffset.tsx b/app/src/organisms/CalibratePipetteOffset/useCalibratePipetteOffset.tsx
index 292dcfaedf3..4f151bae0d4 100644
--- a/app/src/organisms/CalibratePipetteOffset/useCalibratePipetteOffset.tsx
+++ b/app/src/organisms/CalibratePipetteOffset/useCalibratePipetteOffset.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { useSelector, useDispatch } from 'react-redux'
 
@@ -23,7 +22,7 @@ import { INTENT_CALIBRATE_PIPETTE_OFFSET } from '../../organisms/CalibrationPane
 import { pipetteOffsetCalibrationStarted } from '../../redux/analytics'
 
 // pipette calibration commands for which the full page spinner should not appear
-const spinnerCommandBlockList: Array<SessionCommandString> = [
+const spinnerCommandBlockList: SessionCommandString[] = [
   Sessions.sharedCalCommands.JOG,
 ]
 
@@ -31,18 +30,19 @@ const PIPETTE_OFFSET_TITLE = 'Pipette offset calibration'
 const TIP_LENGTH_TITLE = 'Tip length calibration'
 const EXIT = 'exit'
 
-export type InvokerProps = {|
-  overrideParams?: $Shape<PipetteOffsetCalibrationSessionParams>,
-  withIntent?: PipetteOffsetIntent,
-|}
+export interface InvokerProps {
+  overrideParams?: Partial<PipetteOffsetCalibrationSessionParams>
+  withIntent?: PipetteOffsetIntent
+}
 
-export type Invoker = (InvokerProps | void) => void
+export type Invoker = (props: InvokerProps | undefined) => void
 
 export function useCalibratePipetteOffset(
   robotName: string,
-  sessionParams: $Shape<PipetteOffsetCalibrationSessionParams>,
-  onComplete: (() => mixed) | null = null
-): [Invoker, React.Node | null] {
+  sessionParams: Pick<PipetteOffsetCalibrationSessionParams, 'mount'> &
+    Partial<Omit<PipetteOffsetCalibrationSessionParams, 'mount'>>,
+  onComplete: (() => unknown) | null = null
+): [Invoker, JSX.Element | null] {
   const createRequestId = React.useRef<string | null>(null)
   const deleteRequestId = React.useRef<string | null>(null)
   const jogRequestId = React.useRef<string | null>(null)
@@ -62,17 +62,20 @@ export function useCalibratePipetteOffset(
         dispatchedAction.payload.sessionType ===
           Sessions.SESSION_TYPE_PIPETTE_OFFSET_CALIBRATION
       ) {
+        // @ts-expect-error(sa, 2021-05-26): avoiding src code change, use in operator to type narrow
         createRequestId.current = dispatchedAction.meta.requestId
       } else if (
         dispatchedAction.type === Sessions.DELETE_SESSION &&
         pipOffsetCalSession?.id === dispatchedAction.payload.sessionId
       ) {
+        // @ts-expect-error(sa, 2021-05-26): avoiding src code change, use in operator to type narrow
         deleteRequestId.current = dispatchedAction.meta.requestId
       } else if (
         dispatchedAction.type === Sessions.CREATE_SESSION_COMMAND &&
         dispatchedAction.payload.command.command ===
           Sessions.sharedCalCommands.JOG
       ) {
+        // @ts-expect-error(sa, 2021-05-26): avoiding src code change, use in operator to type narrow
         jogRequestId.current = dispatchedAction.meta.requestId
       } else if (
         dispatchedAction.type !== Sessions.CREATE_SESSION_COMMAND ||
@@ -80,6 +83,7 @@ export function useCalibratePipetteOffset(
           dispatchedAction.payload.command.command
         )
       ) {
+        // @ts-expect-error(sa, 2021-05-26): avoiding src code change, use in operator to type narrow
         spinnerRequestId.current = dispatchedAction.meta.requestId
       }
     }
@@ -132,7 +136,7 @@ export function useCalibratePipetteOffset(
   } = sessionParams
   const handleStartPipOffsetCalSession: Invoker = (props = {}) => {
     const {
-      overrideParams = ({}: $Shape<PipetteOffsetCalibrationSessionParams>),
+      overrideParams = {},
       withIntent = INTENT_CALIBRATE_PIPETTE_OFFSET,
     } = props
     setIntent(withIntent)
diff --git a/app/src/organisms/CalibrateTipLength/AskForCalibrationBlockModal.tsx b/app/src/organisms/CalibrateTipLength/AskForCalibrationBlockModal.tsx
index f6413b727a4..6b9ae790cbf 100644
--- a/app/src/organisms/CalibrateTipLength/AskForCalibrationBlockModal.tsx
+++ b/app/src/organisms/CalibrateTipLength/AskForCalibrationBlockModal.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import {
   Box,
@@ -43,18 +42,18 @@ const REMEMBER = "Remember my selection for next time and don't ask again"
 const BLOCK_REQUEST_URL = 'https://opentrons-ux.typeform.com/to/DgvBE9Ir'
 const CAL_BLOCK_LOAD_NAME = 'opentrons_calibrationblock_short_side_right'
 
-type Props = {|
-  onResponse: (hasBlock: boolean) => void,
-  titleBarTitle: string,
-  closePrompt: () => void,
-|}
-export function AskForCalibrationBlockModal(props: Props): React.Node {
+interface Props {
+  onResponse: (hasBlock: boolean) => void
+  titleBarTitle: string
+  closePrompt: () => void
+}
+export function AskForCalibrationBlockModal(props: Props): JSX.Element {
   const [rememberPreference, setRememberPreference] = React.useState<boolean>(
     false
   )
   const dispatch = useDispatch<Dispatch>()
 
-  const makeSetHasBlock = hasBlock => () => {
+  const makeSetHasBlock = (hasBlock: boolean) => (): void => {
     if (rememberPreference) {
       dispatch(setUseTrashSurfaceForTipCal(!hasBlock))
     }
@@ -103,7 +102,9 @@ export function AskForCalibrationBlockModal(props: Props): React.Node {
         <Box css={FONT_BODY_2_DARK} marginX="1rem">
           <Flex marginLeft="1px" marginBottom={SPACING_3}>
             <CheckboxField
-              onChange={e => setRememberPreference(e.currentTarget.checked)}
+              onChange={(e: React.ChangeEvent<HTMLInputElement>) =>
+                setRememberPreference(e.currentTarget.checked)
+              }
               value={rememberPreference}
             />
             <Text marginLeft={SPACING_2}>{REMEMBER}</Text>
diff --git a/app/src/organisms/CalibrateTipLength/ConfirmRecalibrationModal.tsx b/app/src/organisms/CalibrateTipLength/ConfirmRecalibrationModal.tsx
index 9dc53d5201d..62cdbe94b18 100644
--- a/app/src/organisms/CalibrateTipLength/ConfirmRecalibrationModal.tsx
+++ b/app/src/organisms/CalibrateTipLength/ConfirmRecalibrationModal.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 
 import {
@@ -33,13 +32,13 @@ const CANCEL = 'cancel'
 // TODO: This link needs to be real(er)
 const CALIBRATION_URL = 'https://support.opentrons.com/en/articles/4523313'
 
-type Props = {|
-  confirm: () => mixed,
-  cancel: () => mixed,
-  tiprackDisplayName: string,
-|}
+interface Props {
+  confirm: () => unknown
+  cancel: () => unknown
+  tiprackDisplayName: string
+}
 
-export function ConfirmRecalibrationModal(props: Props): React.Node {
+export function ConfirmRecalibrationModal(props: Props): JSX.Element {
   const { confirm, cancel, tiprackDisplayName } = props
 
   return (
diff --git a/app/src/organisms/CalibrateTipLength/TipLengthCalibrationInfoBox.tsx b/app/src/organisms/CalibrateTipLength/TipLengthCalibrationInfoBox.tsx
index 63e1698d5ae..c4a7731a79b 100644
--- a/app/src/organisms/CalibrateTipLength/TipLengthCalibrationInfoBox.tsx
+++ b/app/src/organisms/CalibrateTipLength/TipLengthCalibrationInfoBox.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import {
   Box,
@@ -9,14 +8,14 @@ import {
   SPACING_3,
 } from '@opentrons/components'
 
-export type TipLengthCalibrationInfoBoxProps = {|
-  title: string,
-  children: React.Node,
-|}
+export interface TipLengthCalibrationInfoBoxProps {
+  title: string
+  children: React.ReactNode
+}
 
 export function TipLengthCalibrationInfoBox(
   props: TipLengthCalibrationInfoBoxProps
-): React.Node {
+): JSX.Element {
   const { title, children } = props
 
   return (
diff --git a/app/src/organisms/CalibrateTipLength/__tests__/AskForCalibrationBlockModal.test.tsx b/app/src/organisms/CalibrateTipLength/__tests__/AskForCalibrationBlockModal.test.tsx
index fae1185c859..931326029a8 100644
--- a/app/src/organisms/CalibrateTipLength/__tests__/AskForCalibrationBlockModal.test.tsx
+++ b/app/src/organisms/CalibrateTipLength/__tests__/AskForCalibrationBlockModal.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { mountWithStore } from '@opentrons/components/__utils__'
 import { act } from 'react-dom/test-utils'
@@ -7,14 +6,19 @@ import { AskForCalibrationBlockModal } from '../AskForCalibrationBlockModal'
 import { CheckboxField } from '@opentrons/components'
 import { setUseTrashSurfaceForTipCal } from '../../../redux/calibration'
 
+import type { WrapperWithStore } from '@opentrons/components/__utils__'
+
+type RenderReturnType = WrapperWithStore<
+  React.ComponentProps<typeof AskForCalibrationBlockModal>
+>
 describe('AskForCalibrationBlockModal', () => {
-  let onResponse
-  let render
+  let onResponse: jest.MockedFunction<() => {}>
+  let render: (initialValue?: boolean | null) => RenderReturnType
 
   beforeEach(() => {
     onResponse = jest.fn()
-    render = (initialValue: boolean | null = null) =>
-      mountWithStore(
+    render = (initialValue = null) =>
+      mountWithStore<React.ComponentProps<typeof AskForCalibrationBlockModal>>(
         <AskForCalibrationBlockModal
           onResponse={onResponse}
           titleBarTitle="Test Cal Flow"
@@ -32,14 +36,15 @@ describe('AskForCalibrationBlockModal', () => {
     jest.resetAllMocks()
   })
 
-  const findCalBlockModal = wrapper => wrapper.find(AskForCalibrationBlockModal)
-  const findHaveBlock = wrapper =>
+  const findCalBlockModal = (wrapper: RenderReturnType['wrapper']) =>
+    wrapper.find(AskForCalibrationBlockModal)
+  const findHaveBlock = (wrapper: RenderReturnType['wrapper']) =>
     findCalBlockModal(wrapper).find(
       'button[children="Continue with calibration block"]'
     )
-  const findUseTrash = wrapper =>
+  const findUseTrash = (wrapper: RenderReturnType['wrapper']) =>
     findCalBlockModal(wrapper).find('button[children="Use trash bin"]')
-  const findRemember = wrapper =>
+  const findRemember = (wrapper: RenderReturnType['wrapper']) =>
     findCalBlockModal(wrapper).find(CheckboxField).first()
 
   const SPECS = [
@@ -74,14 +79,14 @@ describe('AskForCalibrationBlockModal', () => {
     it(spec.it, () => {
       const { wrapper, store } = render(null)
       expect(wrapper.exists(AskForCalibrationBlockModal)).toBe(true)
-      findRemember(wrapper).invoke('onChange')({
+      findRemember(wrapper).invoke('onChange')?.({
         currentTarget: { checked: spec.save },
-      })
+      } as any)
 
       act(() => {
         spec.useTrash
-          ? findUseTrash(wrapper).invoke('onClick')()
-          : findHaveBlock(wrapper).invoke('onClick')()
+          ? findUseTrash(wrapper).invoke('onClick')?.({} as React.MouseEvent)
+          : findHaveBlock(wrapper).invoke('onClick')?.({} as React.MouseEvent)
       })
       if (spec.save) {
         wrapper.update()
diff --git a/app/src/organisms/CalibrateTipLength/__tests__/CalibrateTipLength.test.tsx b/app/src/organisms/CalibrateTipLength/__tests__/CalibrateTipLength.test.tsx
index 26530d203a2..4eb79bdbaff 100644
--- a/app/src/organisms/CalibrateTipLength/__tests__/CalibrateTipLength.test.tsx
+++ b/app/src/organisms/CalibrateTipLength/__tests__/CalibrateTipLength.test.tsx
@@ -1,10 +1,8 @@
-// @flow
 import * as React from 'react'
 import { Provider } from 'react-redux'
 import { mount } from 'enzyme'
 import { act } from 'react-dom/test-utils'
 
-// $FlowFixMe(mc, 2021-03.15): ignore until TS conversion
 import { getDeckDefinitions } from '@opentrons/components/src/deck/getDeckDefinitions'
 
 import * as Sessions from '../../../redux/sessions'
@@ -22,34 +20,36 @@ import {
 } from '../../../organisms/CalibrationPanels'
 
 import type { TipLengthCalibrationStep } from '../../../redux/sessions/types'
+import type { ReactWrapper } from 'enzyme'
 
 jest.mock('@opentrons/components/src/deck/getDeckDefinitions')
 jest.mock('../../../redux/sessions/selectors')
 jest.mock('../../../redux/robot-api/selectors')
 
-type CalibrateTipLengthSpec = {
-  component: React.AbstractComponent<any>,
-  childProps?: {},
-  currentStep: TipLengthCalibrationStep,
-  ...
+interface CalibrateTipLengthSpec {
+  component: React.ComponentType<any>
+  currentStep: TipLengthCalibrationStep
 }
 
-const mockGetDeckDefinitions: JestMockFn<
-  [],
-  $Call<typeof getDeckDefinitions, any>
-> = getDeckDefinitions
+const mockGetDeckDefinitions = getDeckDefinitions as jest.MockedFunction<
+  typeof getDeckDefinitions
+>
+
+type Wrapper = ReactWrapper<React.ComponentProps<typeof CalibrateTipLength>>
 
 describe('CalibrateTipLength', () => {
-  let mockStore
-  let render
-  let dispatch
-  let dispatchRequests
+  let mockStore: any
+  let render: (
+    props?: Partial<React.ComponentProps<typeof CalibrateTipLength>>
+  ) => Wrapper
+  let dispatch: jest.MockedFunction<() => {}>
+  let dispatchRequests: jest.MockedFunction<() => {}>
   let mockTipLengthSession: Sessions.TipLengthCalibrationSession = {
     id: 'fake_session_id',
     ...mockTipLengthCalibrationSessionAttributes,
   }
 
-  const getExitButton = wrapper =>
+  const getExitButton = (wrapper: Wrapper) =>
     wrapper.find({ title: 'exit' }).find('button')
 
   const POSSIBLE_CHILDREN = [
@@ -62,7 +62,7 @@ describe('CalibrateTipLength', () => {
     CompleteConfirmation,
   ]
 
-  const SPECS: Array<CalibrateTipLengthSpec> = [
+  const SPECS: CalibrateTipLengthSpec[] = [
     { component: Introduction, currentStep: 'sessionStarted' },
     { component: DeckSetup, currentStep: 'labwareLoaded' },
     { component: MeasureNozzle, currentStep: 'measuringNozzleOffset' },
@@ -140,7 +140,9 @@ describe('CalibrateTipLength', () => {
     const wrapper = render()
 
     expect(wrapper.find('ConfirmExitModal').exists()).toBe(false)
-    act(() => getExitButton(wrapper).invoke('onClick')())
+    act(() =>
+      getExitButton(wrapper).invoke('onClick')?.({} as React.MouseEvent)
+    )
     wrapper.update()
     expect(wrapper.find('ConfirmExitModal').exists()).toBe(true)
   })
@@ -165,7 +167,9 @@ describe('CalibrateTipLength', () => {
       },
     }
     const wrapper = render({ isJogging: false, session })
-    wrapper.find('button[title="forward"]').invoke('onClick')()
+    wrapper.find('button[title="forward"]').invoke('onClick')?.(
+      {} as React.MouseEvent
+    )
     expect(dispatchRequests).toHaveBeenCalledWith(
       Sessions.createSessionCommand('robot-name', session.id, {
         command: Sessions.sharedCalCommands.JOG,
@@ -184,7 +188,9 @@ describe('CalibrateTipLength', () => {
       },
     }
     const wrapper = render({ isJogging: true, session })
-    wrapper.find('button[title="forward"]').invoke('onClick')()
+    wrapper.find('button[title="forward"]').invoke('onClick')?.(
+      {} as React.MouseEvent
+    )
     expect(dispatchRequests).not.toHaveBeenCalledWith(
       Sessions.createSessionCommand('robot-name', session.id, {
         command: Sessions.sharedCalCommands.JOG,
diff --git a/app/src/organisms/CalibrateTipLength/index.tsx b/app/src/organisms/CalibrateTipLength/index.tsx
index 722fc6ce898..ddb2999566c 100644
--- a/app/src/organisms/CalibrateTipLength/index.tsx
+++ b/app/src/organisms/CalibrateTipLength/index.tsx
@@ -1,4 +1,3 @@
-// @flow
 // Tip Length Calibration Orchestration Component
 import * as React from 'react'
 
@@ -31,10 +30,11 @@ import {
   INTENT_TIP_LENGTH_IN_PROTOCOL,
 } from '../../organisms/CalibrationPanels'
 
-import type { StyleProps } from '@opentrons/components'
+import type { StyleProps, Mount } from '@opentrons/components'
 import type {
   SessionCommandParams,
   CalibrationLabware,
+  CalibrationSessionStep,
 } from '../../redux/sessions/types'
 import type { CalibrationPanelProps } from '../../organisms/CalibrationPanels/types'
 import type { CalibrateTipLengthParentProps } from './types'
@@ -69,9 +69,9 @@ const terminalContentsStyleProps = {
   paddingX: '1.5rem',
 }
 
-const PANEL_BY_STEP: {
-  [string]: React.ComponentType<CalibrationPanelProps>,
-} = {
+const PANEL_BY_STEP: Partial<
+  Record<CalibrationSessionStep, React.ComponentType<CalibrationPanelProps>>
+> = {
   sessionStarted: Introduction,
   labwareLoaded: DeckSetup,
   measuringNozzleOffset: MeasureNozzle,
@@ -80,9 +80,9 @@ const PANEL_BY_STEP: {
   measuringTipOffset: MeasureTip,
   calibrationComplete: CompleteConfirmation,
 }
-const PANEL_STYLE_PROPS_BY_STEP: {
-  [string]: StyleProps,
-} = {
+const PANEL_STYLE_PROPS_BY_STEP: Partial<
+  Record<CalibrationSessionStep, StyleProps>
+> = {
   [Sessions.TIP_LENGTH_STEP_SESSION_STARTED]: terminalContentsStyleProps,
   [Sessions.TIP_LENGTH_STEP_LABWARE_LOADED]: darkContentsStyleProps,
   [Sessions.TIP_LENGTH_STEP_PREPARING_PIPETTE]: contentsStyleProps,
@@ -93,7 +93,7 @@ const PANEL_STYLE_PROPS_BY_STEP: {
 }
 export function CalibrateTipLength(
   props: CalibrateTipLengthParentProps
-): React.Node {
+): JSX.Element | null {
   const { session, robotName, showSpinner, dispatchRequests, isJogging } = props
   const { currentStep, instrument, labware } = session?.details || {}
 
@@ -108,7 +108,7 @@ export function CalibrateTipLength(
     ? labware.find(l => !l.isTiprack) ?? null
     : null
 
-  function sendCommands(...commands: Array<SessionCommandParams>) {
+  function sendCommands(...commands: SessionCommandParams[]): void {
     if (session?.id && !isJogging) {
       const sessionCommandActions = commands.map(c =>
         Sessions.createSessionCommand(robotName, session.id, {
@@ -120,7 +120,7 @@ export function CalibrateTipLength(
     }
   }
 
-  function cleanUpAndExit() {
+  function cleanUpAndExit(): void {
     if (session?.id) {
       dispatchRequests(
         Sessions.createSessionCommand(robotName, session.id, {
@@ -152,20 +152,21 @@ export function CalibrateTipLength(
   if (showSpinner) {
     return <SpinnerModalPage titleBar={titleBarProps} />
   }
-
+  // @ts-expect-error(sa, 2021-05-26): cannot index undefined, leaving to avoid src code change
   const Panel = PANEL_BY_STEP[currentStep]
 
   return Panel ? (
     <>
       <ModalPage
         titleBar={titleBarProps}
+        // @ts-expect-error(sa, 2021-05-26): cannot index undefined, leaving to avoid src code change
         innerProps={PANEL_STYLE_PROPS_BY_STEP[currentStep]}
       >
         <Panel
           sendCommands={sendCommands}
           cleanUpAndExit={cleanUpAndExit}
           isMulti={isMulti}
-          mount={instrument?.mount.toLowerCase()}
+          mount={instrument?.mount.toLowerCase() as Mount}
           tipRack={tipRack}
           calBlock={calBlock}
           currentStep={currentStep}
@@ -174,6 +175,7 @@ export function CalibrateTipLength(
         />
       </ModalPage>
       {showConfirmExit && (
+        // @ts-expect-error TODO: ConfirmExitModal expects sessionType
         <ConfirmExitModal exit={confirmExit} back={cancelExit} />
       )}
     </>
diff --git a/app/src/organisms/CalibrateTipLength/types.ts b/app/src/organisms/CalibrateTipLength/types.ts
index 26c45960ef6..bc74721fe1a 100644
--- a/app/src/organisms/CalibrateTipLength/types.ts
+++ b/app/src/organisms/CalibrateTipLength/types.ts
@@ -1,14 +1,10 @@
-// @flow
-
+import { DispatchRequestsType } from '../../redux/robot-api'
 import type { TipLengthCalibrationSession } from '../../redux/sessions/types'
-import type { Action } from '../../redux/types'
 
-export type CalibrateTipLengthParentProps = {|
-  robotName: string,
-  session: TipLengthCalibrationSession | null,
-  dispatchRequests: (
-    ...Array<{ ...Action, meta: { requestId: string } }>
-  ) => void,
-  showSpinner: boolean,
-  isJogging: boolean,
-|}
+export interface CalibrateTipLengthParentProps {
+  robotName: string
+  session: TipLengthCalibrationSession | null
+  dispatchRequests: DispatchRequestsType
+  showSpinner: boolean
+  isJogging: boolean
+}
diff --git a/app/src/organisms/CalibrationPanels/CalibrationLabwareRender.tsx b/app/src/organisms/CalibrationPanels/CalibrationLabwareRender.tsx
index 605cc7282ae..e846f57cb0a 100644
--- a/app/src/organisms/CalibrationPanels/CalibrationLabwareRender.tsx
+++ b/app/src/organisms/CalibrationPanels/CalibrationLabwareRender.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 
 import {
@@ -12,26 +11,22 @@ import {
   FONT_SIZE_CAPTION,
   FONT_WEIGHT_SEMIBOLD,
 } from '@opentrons/components'
-
-import {
-  type LabwareDefinition2,
-  type DeckSlot,
-  getLabwareDisplayName,
-  getIsTiprack,
-} from '@opentrons/shared-data'
+import { getLabwareDisplayName, getIsTiprack } from '@opentrons/shared-data'
 import styles from './styles.css'
 
+import type { LabwareDefinition2, DeckSlot } from '@opentrons/shared-data'
+
 const SHORT = 'SHORT'
 const TALL = 'TALL'
 
-type CalibrationLabwareRenderProps = {|
-  labwareDef: LabwareDefinition2,
-  slotDef: DeckSlot,
-|}
+interface CalibrationLabwareRenderProps {
+  labwareDef: LabwareDefinition2
+  slotDef: DeckSlot
+}
 
 export function CalibrationLabwareRender(
   props: CalibrationLabwareRenderProps
-): React.Node {
+): JSX.Element {
   const { labwareDef, slotDef } = props
   const title = getLabwareDisplayName(labwareDef)
   const isTiprack = getIsTiprack(labwareDef)
@@ -59,7 +54,7 @@ export function CalibrationLabwareRender(
 
 export function CalibrationBlockRender(
   props: CalibrationLabwareRenderProps
-): React.Node {
+): JSX.Element | null {
   const { labwareDef, slotDef } = props
 
   switch (labwareDef.parameters.loadName) {
diff --git a/app/src/organisms/CalibrationPanels/ChooseTipRack.tsx b/app/src/organisms/CalibrationPanels/ChooseTipRack.tsx
index 9f3b70c8eff..562abfac53f 100644
--- a/app/src/organisms/CalibrationPanels/ChooseTipRack.tsx
+++ b/app/src/organisms/CalibrationPanels/ChooseTipRack.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { useSelector } from 'react-redux'
 import { head } from 'lodash'
@@ -51,6 +50,7 @@ import type {
 import type { State } from '../../redux/types'
 import type { SelectOption, SelectOptionOrGroup } from '@opentrons/components'
 import type { LabwareDefinition2 } from '@opentrons/shared-data'
+import { Mount } from '../../redux/pipettes/types'
 
 const HEADER = 'choose tip rack'
 const INTRO = 'Choose what tip rack you would like to use to calibrate your'
@@ -68,7 +68,7 @@ const OPENTRONS_LABEL = 'opentrons'
 const CUSTOM_LABEL = 'custom'
 const USE_THIS_TIP_RACK = 'use this tip rack'
 
-const introContentByType: SessionType => string = sessionType => {
+const introContentByType = (sessionType: SessionType): string => {
   switch (sessionType) {
     case Sessions.SESSION_TYPE_DECK_CALIBRATION:
       return `${INTRO} ${DECK_CAL_INTRO_FRAGMENT}.`
@@ -86,18 +86,18 @@ function formatOptionsFromLabwareDef(lw: LabwareDefinition2): SelectOption {
   }
 }
 
-type ChooseTipRackProps = {|
-  tipRack: CalibrationLabware,
-  mount: string,
-  sessionType: SessionType,
-  chosenTipRack: LabwareDefinition2 | null,
-  handleChosenTipRack: (arg: LabwareDefinition2 | null) => mixed,
-  closeModal: () => mixed,
-  robotName?: string | null,
-  defaultTipracks?: Array<LabwareDefinition2> | null,
-|}
+interface ChooseTipRackProps {
+  tipRack: CalibrationLabware
+  mount: Mount
+  sessionType: SessionType
+  chosenTipRack: LabwareDefinition2 | null
+  handleChosenTipRack: (arg: LabwareDefinition2 | null) => unknown
+  closeModal: () => unknown
+  robotName?: string | null
+  defaultTipracks?: LabwareDefinition2[] | null
+}
 
-export function ChooseTipRack(props: ChooseTipRackProps): React.Node {
+export function ChooseTipRack(props: ChooseTipRackProps): JSX.Element {
   const {
     tipRack,
     mount,
@@ -111,6 +111,7 @@ export function ChooseTipRack(props: ChooseTipRackProps): React.Node {
 
   const pipSerial = useSelector(
     (state: State) =>
+      // @ts-expect-error(sa, 2021-05-26): possibly null, can optionally chain. leaving to avoid src code change
       robotName && getAttachedPipettes(state, robotName)[mount].id
   )
 
@@ -137,7 +138,7 @@ export function ChooseTipRack(props: ChooseTipRackProps): React.Node {
   const allTipRackDefs = defaultTipracks
     ? defaultTipracks.concat(customTipRacks)
     : customTipRacks
-  const tipRackByUriMap: TipRackMap = allTipRackDefs.reduce((obj, lw) => {
+  const tipRackByUriMap = allTipRackDefs.reduce<TipRackMap>((obj, lw) => {
     if (lw) {
       obj[getLabwareDefURI(lw)] = {
         definition: lw,
@@ -161,14 +162,14 @@ export function ChooseTipRack(props: ChooseTipRackProps): React.Node {
     return obj
   }, {})
 
-  const opentronsTipRacksOptions: Array<SelectOption> = defaultTipracks
+  const opentronsTipRacksOptions: SelectOption[] = defaultTipracks
     ? defaultTipracks.map(lw => formatOptionsFromLabwareDef(lw))
     : []
-  const customTipRacksOptions: Array<SelectOption> = customTipRacks.map(lw =>
+  const customTipRacksOptions: SelectOption[] = customTipRacks.map(lw =>
     formatOptionsFromLabwareDef(lw)
   )
 
-  const groupOptions: Array<SelectOptionOrGroup> =
+  const groupOptions: SelectOptionOrGroup[] =
     customTipRacks.length > 0
       ? [
           {
@@ -188,12 +189,17 @@ export function ChooseTipRack(props: ChooseTipRackProps): React.Node {
       : formatOptionsFromLabwareDef(tipRack.definition)
   )
 
-  const handleValueChange = (selected: SelectOption | null, _) => {
+  const handleValueChange = (
+    selected: SelectOption | null,
+    _: unknown
+  ): void => {
     selected && setSelectedValue(selected)
   }
-  const handleUseTipRack = () => {
+  const handleUseTipRack = (): void => {
     const selectedTipRack = tipRackByUriMap[selectedValue.value]
+    // @ts-expect-error(sa, 2021-05-26): need to type narrow, avoiding src code change for now
     if (!isEqual(chosenTipRack, selectedTipRack.definition)) {
+      // @ts-expect-error(sa, 2021-05-26): need to type narrow, avoiding src code change for now
       handleChosenTipRack(selectedTipRack.definition)
     }
     closeModal()
diff --git a/app/src/organisms/CalibrationPanels/ChosenTipRackRender.tsx b/app/src/organisms/CalibrationPanels/ChosenTipRackRender.tsx
index ebfbdf33919..b082115c1f2 100644
--- a/app/src/organisms/CalibrationPanels/ChosenTipRackRender.tsx
+++ b/app/src/organisms/CalibrationPanels/ChosenTipRackRender.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { css } from 'styled-components'
 
@@ -31,33 +30,35 @@ const OVERRIDE_TIP_LENGTH_CALIBRATED_PROMPT =
 const TIP_LENGTH_UNCALIBRATED_PROMPT =
   'Not yet calibrated. You will calibrate this tip length before proceeding to Pipette Offset Calibration.'
 
-type TipRackInfo = {|
-  definition: LabwareDefinition2,
-  calibration: TipLengthCalibration | null,
-|}
+interface TipRackInfo {
+  definition: LabwareDefinition2
+  calibration: TipLengthCalibration | null
+}
 
-export type TipRackMap = $Shape<{|
-  [uri: string]: TipRackInfo,
-|}>
+export type TipRackMap = Partial<{
+  [uri: string]: TipRackInfo
+}>
 
-export type ChosenTipRackRenderProps = {|
-  showCalibrationText: boolean,
-  selectedValue: SelectOption,
-  tipRackByUriMap: TipRackMap,
-|}
+export interface ChosenTipRackRenderProps {
+  showCalibrationText: boolean
+  selectedValue: SelectOption
+  tipRackByUriMap: TipRackMap
+}
 
 export function ChosenTipRackRender(
   props: ChosenTipRackRenderProps
-): React.Node {
+): JSX.Element {
   const { showCalibrationText, selectedValue, tipRackByUriMap } = props
-  const loadName = selectedValue.value.split('/')[1]
+  const loadName: keyof typeof labwareImages = selectedValue.value.split(
+    '/'
+  )[1] as any
   const displayName = selectedValue.label
   const calibrationData = tipRackByUriMap[selectedValue.value]?.calibration
 
   const imageSrc =
     loadName in labwareImages
       ? labwareImages[loadName]
-      : labwareImages['generic_custom_tiprack']
+      : labwareImages.generic_custom_tiprack
   return (
     <Flex
       height="100%"
diff --git a/app/src/organisms/CalibrationPanels/CompleteConfirmation.tsx b/app/src/organisms/CalibrationPanels/CompleteConfirmation.tsx
index 1f30dfc5035..bebd8046bcd 100644
--- a/app/src/organisms/CalibrationPanels/CompleteConfirmation.tsx
+++ b/app/src/organisms/CalibrationPanels/CompleteConfirmation.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { css } from 'styled-components'
 import {
@@ -16,15 +15,19 @@ import {
   JUSTIFY_SPACE_BETWEEN,
   JUSTIFY_CENTER,
 } from '@opentrons/components'
-import type { CalibrationPanelProps } from './types'
-import type { SessionType } from '../../redux/sessions/types'
 import * as Sessions from '../../redux/sessions'
 
 import slotOneRemoveBlockAsset from '../../assets/videos/tip-length-cal/Slot_1_Remove_CalBlock_(330x260)REV1.webm'
 import slotThreeRemoveBlockAsset from '../../assets/videos/tip-length-cal/Slot_3_Remove_CalBlock_(330x260)REV1.webm'
 import { NeedHelpLink } from './NeedHelpLink'
 
-const assetBySlot = {
+import type { CalibrationPanelProps } from './types'
+import type {
+  SessionType,
+  CalibrationLabware,
+} from '../../redux/sessions/types'
+
+const assetBySlot: { [slot in CalibrationLabware['slot']]: string } = {
   '1': slotOneRemoveBlockAsset,
   '3': slotThreeRemoveBlockAsset,
 }
@@ -37,7 +40,9 @@ const PROCEED_TO_DECK = 'Continue to slot 5'
 const EXIT = 'exit'
 const PROCEED_TO_PIP_OFFSET = 'continue to Pipette Offset Calibration'
 
-const contentsBySessionType: { [SessionType]: { headerText: string } } = {
+const contentsBySessionType: Partial<
+  Record<SessionType, { headerText: string }>
+> = {
   [Sessions.SESSION_TYPE_DECK_CALIBRATION]: { headerText: DECK_CAL_HEADER },
   [Sessions.SESSION_TYPE_PIPETTE_OFFSET_CALIBRATION]: {
     headerText: PIP_OFFSET_CAL_HEADER,
@@ -47,7 +52,9 @@ const contentsBySessionType: { [SessionType]: { headerText: string } } = {
   },
 }
 
-export function CompleteConfirmation(props: CalibrationPanelProps): React.Node {
+export function CompleteConfirmation(
+  props: CalibrationPanelProps
+): JSX.Element {
   const {
     sessionType,
     calBlock,
@@ -60,13 +67,13 @@ export function CompleteConfirmation(props: CalibrationPanelProps): React.Node {
     sessionType === Sessions.SESSION_TYPE_PIPETTE_OFFSET_CALIBRATION &&
     shouldPerformTipLength
 
-  const lookupType = isExtendedPipOffset
+  const lookupType: SessionType = isExtendedPipOffset
     ? Sessions.SESSION_TYPE_TIP_LENGTH_CALIBRATION
     : sessionType
-
+  // @ts-expect-error(sa, 2021-05-27): avoiding src code change, use in operator to type narrow
   const { headerText } = contentsBySessionType[lookupType]
 
-  const proceed = () => {
+  const proceed = (): void => {
     sendCommands(
       {
         command: Sessions.sharedCalCommands.SET_CALIBRATION_BLOCK,
diff --git a/app/src/organisms/CalibrationPanels/ConfirmCrashRecoveryModal.tsx b/app/src/organisms/CalibrationPanels/ConfirmCrashRecoveryModal.tsx
index d3b80505715..38fad7432b8 100644
--- a/app/src/organisms/CalibrationPanels/ConfirmCrashRecoveryModal.tsx
+++ b/app/src/organisms/CalibrationPanels/ConfirmCrashRecoveryModal.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 
 import {
@@ -9,13 +8,13 @@ import {
 } from '@opentrons/components'
 import styles from './styles.css'
 
-export type ConfirmCrashRecoveryModalProps = {|
-  back: () => mixed,
-  confirm: () => mixed,
-  tipRackDisplayName: string,
-  tipRackSlot: string,
-  requiresNewTip: boolean,
-|}
+export interface ConfirmCrashRecoveryModalProps {
+  back: () => unknown
+  confirm: () => unknown
+  tipRackDisplayName: string
+  tipRackSlot: string
+  requiresNewTip: boolean
+}
 
 const HEADING = 'Start Over?'
 const MAIN_BODY =
@@ -23,12 +22,12 @@ const MAIN_BODY =
 const CANCEL = 'cancel'
 const START_OVER = 'yes, start over'
 const CONFIRM_AND_START_OVER = 'tip placed in a1, start over'
-const buildTiprackRequest: (string, string) => string = (displayName, slot) =>
+const buildTiprackRequest = (displayName: string, slot: string): string =>
   `Please put an undamaged tip in position A1 of the ${displayName} in slot ${slot}.`
 
 export function ConfirmCrashRecoveryModal(
   props: ConfirmCrashRecoveryModalProps
-): React.Node {
+): JSX.Element {
   const {
     back,
     confirm,
@@ -43,7 +42,6 @@ export function ConfirmCrashRecoveryModal(
       className={styles.confirm_crash_modal}
       buttons={[
         { Component: SecondaryBtn, children: CANCEL, onClick: back },
-        /* $FlowFixMe(mc, 2021-03-18): resolve with TS conversion or replacement of AlertModal */
         {
           Component: SecondaryBtn,
           children: requiresNewTip ? CONFIRM_AND_START_OVER : START_OVER,
diff --git a/app/src/organisms/CalibrationPanels/ConfirmExitModal.tsx b/app/src/organisms/CalibrationPanels/ConfirmExitModal.tsx
index 4799f0faef8..2b4451ebd92 100644
--- a/app/src/organisms/CalibrationPanels/ConfirmExitModal.tsx
+++ b/app/src/organisms/CalibrationPanels/ConfirmExitModal.tsx
@@ -1,15 +1,14 @@
-// @flow
 import * as React from 'react'
 
 import { AlertModal, Text } from '@opentrons/components'
 import * as Sessions from '../../redux/sessions'
 import type { SessionType } from '../../redux/sessions/types'
 
-export type ConfirmExitModalProps = {|
-  back: () => mixed,
-  exit: () => mixed,
-  sessionType: SessionType,
-|}
+export interface ConfirmExitModalProps {
+  back: () => unknown
+  exit: () => unknown
+  sessionType: SessionType
+}
 
 const HEADING = 'Are you sure?'
 const GO_BACK = 'no, go back'
@@ -17,7 +16,7 @@ const EXIT = 'yes, exit now'
 const ARE_YOU_SURE = 'Are you sure you want to exit'
 const NOW = 'now?'
 
-const sessionNameBySessionType: { [SessionType]: string } = {
+const sessionNameBySessionType: Record<SessionType, string> = {
   [Sessions.SESSION_TYPE_DECK_CALIBRATION]: 'Deck Calibration',
   [Sessions.SESSION_TYPE_PIPETTE_OFFSET_CALIBRATION]:
     'Pipette Offset Calibration',
@@ -25,7 +24,7 @@ const sessionNameBySessionType: { [SessionType]: string } = {
   [Sessions.SESSION_TYPE_CALIBRATION_HEALTH_CHECK]: 'Calibration Health Check',
 }
 
-const warningBySessionType: { [SessionType]: string } = {
+const warningBySessionType: Record<SessionType, string> = {
   [Sessions.SESSION_TYPE_DECK_CALIBRATION]:
     'Doing so will return the pipette tip and exit deck calibration.',
   [Sessions.SESSION_TYPE_PIPETTE_OFFSET_CALIBRATION]:
@@ -36,7 +35,7 @@ const warningBySessionType: { [SessionType]: string } = {
     'If you exit now, you will not get any data about your calibration health.',
 }
 
-export function ConfirmExitModal(props: ConfirmExitModalProps): React.Node {
+export function ConfirmExitModal(props: ConfirmExitModalProps): JSX.Element {
   const { back, exit, sessionType } = props
 
   return (
diff --git a/app/src/organisms/CalibrationPanels/DeckSetup.tsx b/app/src/organisms/CalibrationPanels/DeckSetup.tsx
index 1309e112524..def5f54b640 100644
--- a/app/src/organisms/CalibrationPanels/DeckSetup.tsx
+++ b/app/src/organisms/CalibrationPanels/DeckSetup.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import map from 'lodash/map'
 import {
@@ -19,7 +18,6 @@ import {
   SPACING_2,
   SPACING_3,
 } from '@opentrons/components'
-// $FlowFixMe(mc, 2021-03.15): ignore until TS conversion
 import { getDeckDefinitions } from '@opentrons/components/src/deck/getDeckDefinitions'
 import { getLabwareDisplayName } from '@opentrons/shared-data'
 
@@ -49,11 +47,10 @@ const SECOND_RANK_WITH_BLOCK_PROMPT =
   'and ensure Calibration Block is within its designated slot as illustrated below'
 const SECOND_RANK_NO_BLOCK_PROMPT = 'as illustrated below'
 const DECK_SETUP_BUTTON_TEXT = 'Confirm placement and continue'
-const contentsBySessionType: {
-  [SessionType]: {
-    moveCommandString: SessionCommandString,
-  },
-} = {
+const contentsBySessionType: Record<
+  SessionType,
+  { moveCommandString: SessionCommandString }
+> = {
   [Sessions.SESSION_TYPE_DECK_CALIBRATION]: {
     moveCommandString: Sessions.sharedCalCommands.MOVE_TO_TIP_RACK,
   },
@@ -72,9 +69,9 @@ function HealthCheckText({
   activePipette,
   calBlock,
 }: {
-  activePipette?: CalibrationCheckInstrument | null,
-  calBlock?: CalibrationLabware | null,
-}): React.Node {
+  activePipette?: CalibrationCheckInstrument | null
+  calBlock?: CalibrationLabware | null
+}): JSX.Element | null {
   if (!activePipette) return null
   const { mount, rank, tipRackDisplay } = activePipette
   const toCheck = rank === 'first' ? FIRST_RANK_TO_CHECK : SECOND_RANK_TO_CHECK
@@ -99,7 +96,7 @@ function HealthCheckText({
   )
 }
 
-export function DeckSetup(props: CalibrationPanelProps): React.Node {
+export function DeckSetup(props: CalibrationPanelProps): JSX.Element {
   const deckDef = React.useMemo(() => getDeckDefinitions()['ot2_standard'], [])
 
   const {
@@ -115,13 +112,13 @@ export function DeckSetup(props: CalibrationPanelProps): React.Node {
     sessionType === Sessions.SESSION_TYPE_PIPETTE_OFFSET_CALIBRATION &&
     shouldPerformTipLength
 
-  const lookupType = isExtendedPipOffset
+  const lookupType: SessionType = isExtendedPipOffset
     ? Sessions.SESSION_TYPE_TIP_LENGTH_CALIBRATION
     : sessionType
   const isHealthCheck =
     sessionType === Sessions.SESSION_TYPE_CALIBRATION_HEALTH_CHECK
 
-  const proceed = () => {
+  const proceed = (): void => {
     sendCommands({
       command: contentsBySessionType[lookupType].moveCommandString,
     })
@@ -182,7 +179,10 @@ export function DeckSetup(props: CalibrationPanelProps): React.Node {
           {({ deckSlotsById }) =>
             map(
               deckSlotsById,
-              (slot: $Values<typeof deckSlotsById>, slotId) => {
+              (
+                slot: typeof deckSlotsById[keyof typeof deckSlotsById],
+                slotId
+              ) => {
                 if (!slot.matingSurfaceUnitVector) return null // if slot has no mating surface, don't render anything in it
                 let labwareDef = null
                 if (String(tipRack?.slot) === slotId) {
diff --git a/app/src/organisms/CalibrationPanels/Introduction.tsx b/app/src/organisms/CalibrationPanels/Introduction.tsx
index 15de1c23a15..f2a681816bd 100644
--- a/app/src/organisms/CalibrationPanels/Introduction.tsx
+++ b/app/src/organisms/CalibrationPanels/Introduction.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { css } from 'styled-components'
 import { getLabwareDisplayName } from '@opentrons/shared-data'
@@ -90,25 +89,25 @@ const NOTE_HEALTH_CHECK_OUTCOMES =
 const VIEW_TIPRACK_MEASUREMENTS = 'View measurements'
 const TRASH_BIN = 'Removable black plastic trash bin'
 
-type BodySpec = {|
-  preFragment: string | null,
-  boldFragment: string | null,
-  postFragment: string | null,
-|}
+interface BodySpec {
+  preFragment: string | null
+  boldFragment: string | null
+  postFragment: string | null
+}
 
-type PanelContents = {|
-  headerText: string,
-  invalidationText: string | null,
-  bodyContentFragments: Array<BodySpec>,
-  outcomeText: string | null,
-  chooseTipRackButtonText: string | null,
-  continueButtonText: string,
-  noteBody: BodySpec,
-|}
+interface PanelContents {
+  headerText: string
+  invalidationText: string | null
+  bodyContentFragments: BodySpec[]
+  outcomeText: string | null
+  chooseTipRackButtonText: string | null
+  continueButtonText: string
+  noteBody: BodySpec
+}
 
-const bodyContentFromFragments: (
-  Array<BodySpec>
-) => React.Node = contentFragments => {
+const bodyContentFromFragments = (
+  contentFragments: BodySpec[]
+): JSX.Element => {
   return (
     <>
       {contentFragments
@@ -129,16 +128,22 @@ const bodyContentFromFragments: (
             )}
           </React.Fragment>
         ))
+        /*
+          Without passing an initial value into reduce and using generic typing, there is no way to tell TS that the reduced value is of a different type than the acc and val
+          Could do this, but it is a behavioral change bcuz the initial val would no longer be the first value in the array:
+          .reduce<React.ReactNode[]>((prev, current) => [prev, ' ', current], [])}
+        */
+        // @ts-expect-error(sa, 2021-05-27): avoiding src code change
         .reduce((prev, current) => [prev, ' ', current])}
     </>
   )
 }
 
-const contentsByParams: (SessionType, ?boolean, ?Intent) => PanelContents = (
-  sessionType,
-  isExtendedPipOffset,
-  intent
-) => {
+const contentsByParams = (
+  sessionType: SessionType,
+  isExtendedPipOffset?: boolean | null,
+  intent?: Intent
+): PanelContents => {
   switch (sessionType) {
     case Sessions.SESSION_TYPE_DECK_CALIBRATION:
       return {
@@ -384,7 +389,7 @@ const contentsByParams: (SessionType, ?boolean, ?Intent) => PanelContents = (
   }
 }
 
-export function Introduction(props: CalibrationPanelProps): React.Node {
+export function Introduction(props: CalibrationPanelProps): JSX.Element {
   const {
     tipRack,
     calBlock,
@@ -402,17 +407,17 @@ export function Introduction(props: CalibrationPanelProps): React.Node {
     setChosenTipRack,
   ] = React.useState<LabwareDefinition2 | null>(null)
 
-  const handleChosenTipRack = (value: LabwareDefinition2 | null) => {
+  const handleChosenTipRack = (value: LabwareDefinition2 | null): void => {
     value && setChosenTipRack(value)
   }
-  const isExtendedPipOffset =
+  const isExtendedPipOffset: boolean | null | undefined =
     sessionType === Sessions.SESSION_TYPE_PIPETTE_OFFSET_CALIBRATION &&
     shouldPerformTipLength
   const uniqueTipRacks = new Set(
     instruments?.map(instr => instr.tipRackLoadName)
   )
 
-  const proceed = () => {
+  const proceed = (): void => {
     if (
       supportedCommands &&
       supportedCommands.includes(Sessions.sharedCalCommands.LOAD_LABWARE)
@@ -568,11 +573,11 @@ export function Introduction(props: CalibrationPanelProps): React.Node {
   )
 }
 
-type RequiredLabwareCardProps = {|
-  loadName: string,
-  displayName: string,
-  linkToMeasurements?: boolean,
-|}
+interface RequiredLabwareCardProps {
+  loadName: string
+  displayName: string
+  linkToMeasurements?: boolean
+}
 
 const linkStyles = css`
   &:hover {
@@ -580,11 +585,11 @@ const linkStyles = css`
   }
 `
 
-function RequiredLabwareCard(props: RequiredLabwareCardProps) {
+function RequiredLabwareCard(props: RequiredLabwareCardProps): JSX.Element {
   const { loadName, displayName, linkToMeasurements } = props
   const imageSrc =
     loadName in labwareImages
-      ? labwareImages[loadName]
+      ? labwareImages[loadName as keyof typeof labwareImages]
       : labwareImages['generic_custom_tiprack']
 
   return (
diff --git a/app/src/organisms/CalibrationPanels/MeasureNozzle.tsx b/app/src/organisms/CalibrationPanels/MeasureNozzle.tsx
index 0056beeb997..4f3aa02cc97 100644
--- a/app/src/organisms/CalibrationPanels/MeasureNozzle.tsx
+++ b/app/src/organisms/CalibrationPanels/MeasureNozzle.tsx
@@ -1,5 +1,4 @@
 /* eslint-disable no-return-assign */
-// @flow
 import * as React from 'react'
 import { css } from 'styled-components'
 import {
@@ -90,7 +89,7 @@ const SAVE_NOZZLE_Z_AXIS = 'Save nozzle z-axis and move to pick up tip'
 const CHECK_NOZZLE_Z_AXIS = 'Check nozzle z-axis and move to pick up tip'
 const SLOT = 'slot'
 
-export function MeasureNozzle(props: CalibrationPanelProps): React.Node {
+export function MeasureNozzle(props: CalibrationPanelProps): JSX.Element {
   const { sendCommands, calBlock, mount, isMulti, sessionType } = props
 
   const referencePointStr = calBlock ? (
@@ -117,7 +116,7 @@ export function MeasureNozzle(props: CalibrationPanelProps): React.Node {
     [mount, isMulti, calBlock, sessionType]
   )
 
-  const jog = (axis: Axis, dir: Sign, step: StepSize) => {
+  const jog = (axis: Axis, dir: Sign, step: StepSize): void => {
     sendCommands({
       command: Sessions.sharedCalCommands.JOG,
       data: {
@@ -129,7 +128,7 @@ export function MeasureNozzle(props: CalibrationPanelProps): React.Node {
   const isHealthCheck =
     sessionType === Sessions.SESSION_TYPE_CALIBRATION_HEALTH_CHECK
 
-  const proceed = () => {
+  const proceed = (): void => {
     isHealthCheck
       ? sendCommands({ command: Sessions.sharedCalCommands.MOVE_TO_TIP_RACK })
       : sendCommands(
diff --git a/app/src/organisms/CalibrationPanels/MeasureTip.tsx b/app/src/organisms/CalibrationPanels/MeasureTip.tsx
index c6ef6cfa4cc..86114f97c4d 100644
--- a/app/src/organisms/CalibrationPanels/MeasureTip.tsx
+++ b/app/src/organisms/CalibrationPanels/MeasureTip.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { css } from 'styled-components'
 import {
@@ -89,7 +88,7 @@ const SAVE_NOZZLE_Z_AXIS = 'Save the tip length'
 const CHECK_NOZZLE_Z_AXIS = 'Check the tip length'
 const SLOT = 'slot'
 
-export function MeasureTip(props: CalibrationPanelProps): React.Node {
+export function MeasureTip(props: CalibrationPanelProps): JSX.Element {
   const {
     sendCommands,
     calBlock,
@@ -123,7 +122,7 @@ export function MeasureTip(props: CalibrationPanelProps): React.Node {
     [mount, isMulti, calBlock, sessionType]
   )
 
-  const jog = (axis: Axis, dir: Sign, step: StepSize) => {
+  const jog = (axis: Axis, dir: Sign, step: StepSize): void => {
     sendCommands({
       command: Sessions.sharedCalCommands.JOG,
       data: {
@@ -138,7 +137,7 @@ export function MeasureTip(props: CalibrationPanelProps): React.Node {
   const isHealthCheck =
     sessionType === Sessions.SESSION_TYPE_CALIBRATION_HEALTH_CHECK
 
-  const proceed = () => {
+  const proceed = (): void => {
     isHealthCheck
       ? sendCommands(
           { command: Sessions.checkCommands.COMPARE_POINT },
diff --git a/app/src/organisms/CalibrationPanels/NeedHelpLink.tsx b/app/src/organisms/CalibrationPanels/NeedHelpLink.tsx
index 02e865c218a..be84f1e0638 100644
--- a/app/src/organisms/CalibrationPanels/NeedHelpLink.tsx
+++ b/app/src/organisms/CalibrationPanels/NeedHelpLink.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { Flex, Link, C_BLUE, FONT_SIZE_BODY_1 } from '@opentrons/components'
 
@@ -6,9 +5,9 @@ const NEED_HELP = 'Need Help?'
 const SUPPORT_PAGE =
   'https://support.opentrons.com/en/collections/2426956-ot-2-calibration'
 
-type Props = React.ElementProps<typeof Flex>
+type Props = React.ComponentProps<typeof Flex>
 
-export function NeedHelpLink(props: Props): React.Node {
+export function NeedHelpLink(props: Props): JSX.Element {
   return (
     <Flex {...props}>
       <Link
diff --git a/app/src/organisms/CalibrationPanels/SaveXYPoint.tsx b/app/src/organisms/CalibrationPanels/SaveXYPoint.tsx
index 6d8dac61a2a..85240bf2abb 100644
--- a/app/src/organisms/CalibrationPanels/SaveXYPoint.tsx
+++ b/app/src/organisms/CalibrationPanels/SaveXYPoint.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { css } from 'styled-components'
 import {
@@ -25,13 +24,6 @@ import {
 } from '@opentrons/components'
 
 import * as Sessions from '../../redux/sessions'
-import type { Axis, Sign, StepSize } from '../../molecules/JogControls/types'
-import type { CalibrationPanelProps } from './types'
-import type {
-  SessionType,
-  CalibrationSessionStep,
-  SessionCommandString,
-} from '../../redux/sessions/types'
 import {
   JogControls,
   HORIZONTAL_PLANE,
@@ -54,7 +46,20 @@ import slot7LeftSingleDemoAsset from '../../assets/videos/cal-movement/SLOT_7_LE
 import slot7RightMultiDemoAsset from '../../assets/videos/cal-movement/SLOT_7_RIGHT_MULTI_X-Y.webm'
 import slot7RightSingleDemoAsset from '../../assets/videos/cal-movement/SLOT_7_RIGHT_SINGLE_X-Y.webm'
 
-const assetMap = {
+import type { Axis, Sign, StepSize } from '../../molecules/JogControls/types'
+import type { CalibrationPanelProps } from './types'
+import type {
+  SessionType,
+  CalibrationSessionStep,
+  SessionCommandString,
+  CalibrationLabware,
+} from '../../redux/sessions/types'
+import type { Mount } from '@opentrons/components'
+
+const assetMap: Record<
+  CalibrationLabware['slot'],
+  Record<Mount, Record<'multi' | 'single', string>>
+> = {
   '1': {
     left: {
       multi: slot1LeftMultiDemoAsset,
@@ -107,14 +112,14 @@ const HEALTH_POINT_THREE_BUTTON_TEXT = `${HEALTH_BUTTON_TEXT} and move to slot 7
 const ALLOW_VERTICAL_TEXT = 'Reveal Z jog controls to move up and down'
 
 const contentsBySessionTypeByCurrentStep: {
-  [SessionType]: {
-    [CalibrationSessionStep]: {
-      slotNumber: string,
-      buttonText: string,
-      moveCommand: SessionCommandString | null,
-      finalCommand?: SessionCommandString | null,
-    },
-  },
+  [sessionType in SessionType]?: {
+    [step in CalibrationSessionStep]?: {
+      slotNumber: string
+      buttonText: string
+      moveCommand: SessionCommandString | null
+      finalCommand?: SessionCommandString | null
+    }
+  }
 } = {
   [Sessions.SESSION_TYPE_DECK_CALIBRATION]: {
     [Sessions.DECK_STEP_SAVING_POINT_ONE]: {
@@ -160,7 +165,7 @@ const contentsBySessionTypeByCurrentStep: {
   },
 }
 
-export function SaveXYPoint(props: CalibrationPanelProps): React.Node {
+export function SaveXYPoint(props: CalibrationPanelProps): JSX.Element {
   const {
     isMulti,
     mount,
@@ -173,10 +178,15 @@ export function SaveXYPoint(props: CalibrationPanelProps): React.Node {
   } = props
 
   const {
+    // @ts-expect-error(sa, 2021-05-27): avoiding src code change, need to type narrow
     slotNumber,
+    // @ts-expect-error(sa, 2021-05-27): avoiding src code change, need to type narrow
     buttonText,
+    // @ts-expect-error(sa, 2021-05-27): avoiding src code change, need to type narrow
     moveCommand,
+    // @ts-expect-error(sa, 2021-05-27): avoiding src code change, need to type narrow
     finalCommand,
+    // @ts-expect-error(sa, 2021-05-27): avoiding src code change, need to type narrow
   } = contentsBySessionTypeByCurrentStep[sessionType][currentStep]
 
   const demoAsset = React.useMemo(
@@ -187,7 +197,7 @@ export function SaveXYPoint(props: CalibrationPanelProps): React.Node {
 
   const isHealthCheck =
     sessionType === Sessions.SESSION_TYPE_CALIBRATION_HEALTH_CHECK
-  const jog = (axis: Axis, dir: Sign, step: StepSize) => {
+  const jog = (axis: Axis, dir: Sign, step: StepSize): void => {
     sendCommands({
       command: Sessions.sharedCalCommands.JOG,
       data: {
@@ -196,7 +206,7 @@ export function SaveXYPoint(props: CalibrationPanelProps): React.Node {
     })
   }
 
-  const savePoint = () => {
+  const savePoint = (): void => {
     let commands = null
     if (isHealthCheck) {
       commands = [{ command: Sessions.checkCommands.COMPARE_POINT }]
@@ -228,7 +238,7 @@ export function SaveXYPoint(props: CalibrationPanelProps): React.Node {
 
   const [allowVertical, setAllowVertical] = React.useState(false)
 
-  const AllowVerticalPrompt = () => (
+  const AllowVerticalPrompt = (): JSX.Element => (
     <Flex
       justifyContent={JUSTIFY_CENTER}
       alignItems={ALIGN_CENTER}
diff --git a/app/src/organisms/CalibrationPanels/SaveZPoint.tsx b/app/src/organisms/CalibrationPanels/SaveZPoint.tsx
index 8d8e4557b50..e6838e72838 100644
--- a/app/src/organisms/CalibrationPanels/SaveZPoint.tsx
+++ b/app/src/organisms/CalibrationPanels/SaveZPoint.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { css } from 'styled-components'
 import {
@@ -73,13 +72,16 @@ const ALLOW_HORIZONTAL_TEXT = 'Reveal XY jog controls to move across deck'
 const ALLOW_XY_JOG_INSTRUCTIONS =
   'If the pipette is over the embossed 5, on the ridge of the slot, or hard to see, reveal the jog controls to move the pipette across the deck.'
 
-const contentsBySessionType: {
-  [SessionType]: {
-    headerText: string,
-    buttonText: string,
-    buttonEffectText: string,
-  },
-} = {
+const contentsBySessionType: Partial<
+  Record<
+    SessionType,
+    {
+      headerText: string
+      buttonText: string
+      buttonEffectText: string
+    }
+  >
+> = {
   [Sessions.SESSION_TYPE_DECK_CALIBRATION]: {
     buttonText: DECK_CAL_BUTTON_TEXT,
     headerText: BASE_HEADER,
@@ -97,9 +99,9 @@ const contentsBySessionType: {
   },
 }
 
-export function SaveZPoint(props: CalibrationPanelProps): React.Node {
+export function SaveZPoint(props: CalibrationPanelProps): JSX.Element {
   const { isMulti, mount, sendCommands, sessionType } = props
-
+  // @ts-expect-error(sa, 2021-05-27): avoiding src code change, need to to type narrow
   const { headerText, buttonText, buttonEffectText } = contentsBySessionType[
     sessionType
   ]
@@ -111,7 +113,7 @@ export function SaveZPoint(props: CalibrationPanelProps): React.Node {
 
   const [allowHorizontal, setAllowHorizontal] = React.useState(false)
 
-  const jog = (axis: Axis, dir: Sign, step: StepSize) => {
+  const jog = (axis: Axis, dir: Sign, step: StepSize): void => {
     sendCommands({
       command: Sessions.sharedCalCommands.JOG,
       data: {
@@ -120,16 +122,16 @@ export function SaveZPoint(props: CalibrationPanelProps): React.Node {
     })
   }
 
-  const continueCommands = () => {
+  const continueCommands = (): (() => void) => {
     if (sessionType === Sessions.SESSION_TYPE_CALIBRATION_HEALTH_CHECK) {
-      return () => {
+      return (): void => {
         sendCommands(
           { command: Sessions.checkCommands.COMPARE_POINT },
           { command: Sessions.sharedCalCommands.MOVE_TO_POINT_ONE }
         )
       }
     } else {
-      return () => {
+      return (): void => {
         sendCommands(
           { command: Sessions.sharedCalCommands.SAVE_OFFSET },
           { command: Sessions.sharedCalCommands.MOVE_TO_POINT_ONE }
@@ -143,7 +145,7 @@ export function SaveZPoint(props: CalibrationPanelProps): React.Node {
     ...props,
   })
 
-  const AllowHorizontalPrompt = () => (
+  const AllowHorizontalPrompt = (): JSX.Element => (
     <Flex
       justifyContent={JUSTIFY_CENTER}
       alignItems={ALIGN_CENTER}
diff --git a/app/src/organisms/CalibrationPanels/TipConfirmation.tsx b/app/src/organisms/CalibrationPanels/TipConfirmation.tsx
index b13981f40d0..47981e31f34 100644
--- a/app/src/organisms/CalibrationPanels/TipConfirmation.tsx
+++ b/app/src/organisms/CalibrationPanels/TipConfirmation.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import {
   Flex,
@@ -24,10 +23,10 @@ const YES_AND_MOVE_TO_CHECK_TIP = 'Yes, move to check tip length'
 const NO_TRY_AGAIN = 'No, try again'
 
 const contentsBySessionType: {
-  [SessionType]: {
-    yesButtonText: string,
-    moveCommandString: SessionCommandString,
-  },
+  [sessionType in SessionType]: {
+    yesButtonText: string
+    moveCommandString: SessionCommandString
+  }
 } = {
   [Sessions.SESSION_TYPE_DECK_CALIBRATION]: {
     yesButtonText: YES_AND_MOVE_TO_DECK,
@@ -46,7 +45,7 @@ const contentsBySessionType: {
     moveCommandString: Sessions.sharedCalCommands.MOVE_TO_REFERENCE_POINT,
   },
 }
-export function TipConfirmation(props: CalibrationPanelProps): React.Node {
+export function TipConfirmation(props: CalibrationPanelProps): JSX.Element {
   const { sendCommands, sessionType, shouldPerformTipLength } = props
 
   const isExtendedPipOffset =
@@ -59,10 +58,10 @@ export function TipConfirmation(props: CalibrationPanelProps): React.Node {
 
   const { yesButtonText, moveCommandString } = contentsBySessionType[lookupType]
 
-  const invalidateTip = () => {
+  const invalidateTip = (): void => {
     sendCommands({ command: Sessions.sharedCalCommands.INVALIDATE_TIP })
   }
-  const confirmTip = () => {
+  const confirmTip = (): void => {
     sendCommands({ command: moveCommandString })
   }
 
diff --git a/app/src/organisms/CalibrationPanels/TipPickUp.tsx b/app/src/organisms/CalibrationPanels/TipPickUp.tsx
index 6a284e27a75..10fa44e73ef 100644
--- a/app/src/organisms/CalibrationPanels/TipPickUp.tsx
+++ b/app/src/organisms/CalibrationPanels/TipPickUp.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { css } from 'styled-components'
 import {
@@ -54,7 +53,7 @@ const ASSET_MAP = {
   multi: multiDemoAsset,
   single: singleDemoAsset,
 }
-export function TipPickUp(props: CalibrationPanelProps): React.Node {
+export function TipPickUp(props: CalibrationPanelProps): JSX.Element {
   const { sendCommands, tipRack, isMulti } = props
 
   const tipRackDef = React.useMemo(
@@ -74,11 +73,11 @@ export function TipPickUp(props: CalibrationPanelProps): React.Node {
     SINGLE_JOG_UNTIL_AT
   )
 
-  const pickUpTip = () => {
+  const pickUpTip = (): void => {
     sendCommands({ command: Sessions.sharedCalCommands.PICK_UP_TIP })
   }
 
-  const jog = (axis: Axis, dir: Sign, step: StepSize) => {
+  const jog = (axis: Axis, dir: Sign, step: StepSize): void => {
     sendCommands({
       command: Sessions.sharedCalCommands.JOG,
       data: {
diff --git a/app/src/organisms/CalibrationPanels/__tests__/ChooseTipRack.test.tsx b/app/src/organisms/CalibrationPanels/__tests__/ChooseTipRack.test.tsx
index 8cbcc59b280..769967bcac7 100644
--- a/app/src/organisms/CalibrationPanels/__tests__/ChooseTipRack.test.tsx
+++ b/app/src/organisms/CalibrationPanels/__tests__/ChooseTipRack.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { mountWithStore } from '@opentrons/components/__utils__'
 
@@ -16,48 +15,47 @@ import { getCustomTipRackDefinitions } from '../../../redux/custom-labware'
 import { getAttachedPipettes } from '../../../redux/pipettes'
 
 import { ChooseTipRack } from '../ChooseTipRack'
-import type { State } from '../../../redux/types'
 import type { AttachedPipettesByMount } from '../../../redux/pipettes/types'
+import type { ReactWrapper } from 'enzyme'
+import type { WrapperWithStore } from '@opentrons/components/__utils__'
 
 jest.mock('../../../redux/pipettes/selectors')
 jest.mock('../../../redux/calibration/')
 jest.mock('../../../redux/custom-labware/selectors')
 
-const mockAttachedPipettes: AttachedPipettesByMount = ({
+const mockAttachedPipettes: AttachedPipettesByMount = {
   left: mockAttachedPipette,
   right: null,
-}: any)
+} as any
 
-const mockGetCalibrationForPipette: JestMockFn<
-  [State, string, string, string],
-  $Call<typeof getCalibrationForPipette, State, string, string, string>
-> = getCalibrationForPipette
+const mockGetCalibrationForPipette = getCalibrationForPipette as jest.MockedFunction<
+  typeof getCalibrationForPipette
+>
 
-const mockGetTipLengthForPipetteAndTiprack: JestMockFn<
-  [State, string, string, string],
-  $Call<typeof getTipLengthForPipetteAndTiprack, State, string, string, string>
-> = getTipLengthForPipetteAndTiprack
+const mockGetTipLengthForPipetteAndTiprack = getTipLengthForPipetteAndTiprack as jest.MockedFunction<
+  typeof getTipLengthForPipetteAndTiprack
+>
 
-const mockGetTipLengthCalibrations: JestMockFn<
-  [State, string],
-  $Call<typeof getTipLengthCalibrations, State, string>
-> = getTipLengthCalibrations
+const mockGetTipLengthCalibrations = getTipLengthCalibrations as jest.MockedFunction<
+  typeof getTipLengthCalibrations
+>
 
-const mockGetAttachedPipettes: JestMockFn<
-  [State, string],
-  $Call<typeof getAttachedPipettes, State, string>
-> = getAttachedPipettes
+const mockGetAttachedPipettes = getAttachedPipettes as jest.MockedFunction<
+  typeof getAttachedPipettes
+>
 
-const mockGetCustomTipRackDefinitions: JestMockFn<
-  [State],
-  $Call<typeof getCustomTipRackDefinitions, State>
-> = getCustomTipRackDefinitions
+const mockGetCustomTipRackDefinitions = getCustomTipRackDefinitions as jest.MockedFunction<
+  typeof getCustomTipRackDefinitions
+>
 
 describe('ChooseTipRack', () => {
-  let render
+  let render: (
+    props?: Partial<React.ComponentProps<typeof ChooseTipRack>>
+  ) => WrapperWithStore<React.ComponentProps<typeof ChooseTipRack>>
 
-  const getUseThisTipRackButton = wrapper =>
-    wrapper.find('button[data-test="useThisTipRackButton"]')
+  const getUseThisTipRackButton = (
+    wrapper: ReactWrapper<React.ComponentProps<typeof ChooseTipRack>>
+  ): ReactWrapper => wrapper.find('button[data-test="useThisTipRackButton"]')
 
   beforeEach(() => {
     mockGetCalibrationForPipette.mockReturnValue(null)
@@ -69,7 +67,7 @@ describe('ChooseTipRack', () => {
       mockDeckCalTipRack.definition,
     ])
 
-    render = (props: $Shape<React.ElementProps<typeof ChooseTipRack>> = {}) => {
+    render = (props = {}) => {
       const {
         tipRack = mockDeckCalTipRack,
         mount = 'left',
diff --git a/app/src/organisms/CalibrationPanels/__tests__/CompleteConfirmation.test.tsx b/app/src/organisms/CalibrationPanels/__tests__/CompleteConfirmation.test.tsx
index bde1cdc1501..2d21502979b 100644
--- a/app/src/organisms/CalibrationPanels/__tests__/CompleteConfirmation.test.tsx
+++ b/app/src/organisms/CalibrationPanels/__tests__/CompleteConfirmation.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { mount } from 'enzyme'
 import { mockDeckCalTipRack } from '../../../redux/sessions/__fixtures__'
@@ -6,21 +5,27 @@ import * as Sessions from '../../../redux/sessions'
 
 import { CompleteConfirmation } from '../CompleteConfirmation'
 
+import type { Mount } from '@opentrons/components'
+import type { ReactWrapper } from 'enzyme'
+
 describe('CompleteConfirmation', () => {
-  let render
+  let render: (
+    props?: Partial<
+      React.ComponentProps<typeof CompleteConfirmation> & { pipMount: Mount }
+    >
+  ) => ReactWrapper<React.ComponentProps<typeof CompleteConfirmation>>
 
   const mockSendCommands = jest.fn()
   const mockCleanUpAndExit = jest.fn()
 
-  const getContinueButton = wrapper =>
-    wrapper.find('button[title="Return tip to tip rack and exit"]')
+  const getContinueButton = (
+    wrapper: ReactWrapper<React.ComponentProps<typeof CompleteConfirmation>>
+  ) => wrapper.find('button[title="Return tip to tip rack and exit"]')
 
   beforeEach(() => {
-    render = (
-      props: $Shape<React.ElementProps<typeof CompleteConfirmation>> = {}
-    ) => {
+    render = (props = {}) => {
       const {
-        pipMount = 'left',
+        pipMount = 'left' as const,
         isMulti = false,
         tipRack = mockDeckCalTipRack,
         sendCommands = mockSendCommands,
@@ -49,7 +54,7 @@ describe('CompleteConfirmation', () => {
   it('clicking continue sends exit command and deletes session', () => {
     const wrapper = render()
 
-    getContinueButton(wrapper).invoke('onClick')()
+    getContinueButton(wrapper).invoke('onClick')?.({} as React.MouseEvent)
     wrapper.update()
 
     expect(mockCleanUpAndExit).toHaveBeenCalled()
diff --git a/app/src/organisms/CalibrationPanels/__tests__/ConfirmCrashRecoveryModal.test.tsx b/app/src/organisms/CalibrationPanels/__tests__/ConfirmCrashRecoveryModal.test.tsx
index 48795ae4060..35c576943bf 100644
--- a/app/src/organisms/CalibrationPanels/__tests__/ConfirmCrashRecoveryModal.test.tsx
+++ b/app/src/organisms/CalibrationPanels/__tests__/ConfirmCrashRecoveryModal.test.tsx
@@ -1,25 +1,33 @@
-// @flow
 import * as React from 'react'
-import { mount } from 'enzyme'
+import { mount, ReactWrapper } from 'enzyme'
 
 import { ConfirmCrashRecoveryModal } from '../ConfirmCrashRecoveryModal'
 
 describe('ConfirmCrashRecoveryModal', () => {
-  let render
+  let render: (
+    props?: Partial<React.ComponentProps<typeof ConfirmCrashRecoveryModal>>
+  ) => ReactWrapper<React.ComponentProps<typeof ConfirmCrashRecoveryModal>>
   const mockBack = jest.fn()
   const mockConfirm = jest.fn()
 
-  const getExitButton = wrapper =>
-    wrapper.find('OutlineButton[children="cancel"]')
-  const getNoTipRestartButton = wrapper =>
-    wrapper.find('OutlineButton[children="yes, start over"]')
-  const getReplaceTipRestartButton = wrapper =>
-    wrapper.find('OutlineButton[children="tip placed in a1, start over"]')
+  const getExitButton = (
+    wrapper: ReactWrapper<
+      React.ComponentProps<typeof ConfirmCrashRecoveryModal>
+    >
+  ) => wrapper.find('OutlineButton[children="cancel"]')
+  const getNoTipRestartButton = (
+    wrapper: ReactWrapper<
+      React.ComponentProps<typeof ConfirmCrashRecoveryModal>
+    >
+  ) => wrapper.find('OutlineButton[children="yes, start over"]')
+  const getReplaceTipRestartButton = (
+    wrapper: ReactWrapper<
+      React.ComponentProps<typeof ConfirmCrashRecoveryModal>
+    >
+  ) => wrapper.find('OutlineButton[children="tip placed in a1, start over"]')
 
   beforeEach(() => {
-    render = (
-      props: $Shape<React.ElementProps<typeof ConfirmCrashRecoveryModal>> = {}
-    ) => {
+    render = (props = {}) => {
       const {
         back = mockBack,
         confirm = mockConfirm,
@@ -45,7 +53,7 @@ describe('ConfirmCrashRecoveryModal', () => {
   it('clicking cancel cancels', () => {
     const wrapper = render()
     expect(getExitButton(wrapper).exists()).toBe(true)
-    getExitButton(wrapper).invoke('onClick')()
+    getExitButton(wrapper).invoke('onClick')?.({} as React.MouseEvent)
     wrapper.update()
 
     expect(mockBack).toHaveBeenCalled()
@@ -55,7 +63,7 @@ describe('ConfirmCrashRecoveryModal', () => {
     const wrapper = render({ requiresNewTip: false })
 
     expect(getNoTipRestartButton(wrapper).exists()).toBe(true)
-    getNoTipRestartButton(wrapper).invoke('onClick')()
+    getNoTipRestartButton(wrapper).invoke('onClick')?.({} as React.MouseEvent)
     wrapper.update()
     expect(mockConfirm).toHaveBeenCalled()
   })
@@ -63,7 +71,9 @@ describe('ConfirmCrashRecoveryModal', () => {
   it('has a working button with the right text when tip placement needed', () => {
     const wrapper = render({ requiresNewTip: true })
     expect(getReplaceTipRestartButton(wrapper).exists()).toBe(true)
-    getReplaceTipRestartButton(wrapper).invoke('onClick')()
+    getReplaceTipRestartButton(wrapper).invoke('onClick')?.(
+      {} as React.MouseEvent
+    )
     wrapper.update()
 
     expect(mockConfirm).toHaveBeenCalled()
diff --git a/app/src/organisms/CalibrationPanels/__tests__/ConfirmExitModal.test.tsx b/app/src/organisms/CalibrationPanels/__tests__/ConfirmExitModal.test.tsx
index 35a4e928e56..12434db866e 100644
--- a/app/src/organisms/CalibrationPanels/__tests__/ConfirmExitModal.test.tsx
+++ b/app/src/organisms/CalibrationPanels/__tests__/ConfirmExitModal.test.tsx
@@ -1,26 +1,29 @@
-// @flow
 import * as React from 'react'
 import { mount } from 'enzyme'
 import * as Sessions from '../../../redux/sessions'
 
 import { ConfirmExitModal } from '../ConfirmExitModal'
 
+import type { ReactWrapper } from 'enzyme'
+
 describe('ConfirmExitModal', () => {
-  let render
+  let render: (
+    props?: Partial<React.ComponentProps<typeof ConfirmExitModal>>
+  ) => ReactWrapper<React.ComponentProps<typeof ConfirmExitModal>>
 
   const mockBack = jest.fn()
   const mockExit = jest.fn()
 
-  const getExitButton = wrapper =>
-    wrapper.find('OutlineButton[children="yes, exit now"]')
+  const getExitButton = (
+    wrapper: ReactWrapper<React.ComponentProps<typeof ConfirmExitModal>>
+  ) => wrapper.find('OutlineButton[children="yes, exit now"]')
 
-  const getBackButton = wrapper =>
-    wrapper.find('OutlineButton[children="no, go back"]')
+  const getBackButton = (
+    wrapper: ReactWrapper<React.ComponentProps<typeof ConfirmExitModal>>
+  ) => wrapper.find('OutlineButton[children="no, go back"]')
 
   beforeEach(() => {
-    render = (
-      props: $Shape<React.ElementProps<typeof ConfirmExitModal>> = {}
-    ) => {
+    render = (props = {}) => {
       const { sessionType = Sessions.SESSION_TYPE_DECK_CALIBRATION } = props
       return mount(
         <ConfirmExitModal
@@ -39,7 +42,7 @@ describe('ConfirmExitModal', () => {
   it('clicking confirm exit calls exit', () => {
     const wrapper = render()
 
-    getExitButton(wrapper).invoke('onClick')()
+    getExitButton(wrapper).invoke('onClick')?.({} as React.MouseEvent)
     wrapper.update()
 
     expect(mockExit).toHaveBeenCalled()
@@ -48,7 +51,7 @@ describe('ConfirmExitModal', () => {
   it('clicking back calls back', () => {
     const wrapper = render()
 
-    getBackButton(wrapper).invoke('onClick')()
+    getBackButton(wrapper).invoke('onClick')?.({} as React.MouseEvent)
     wrapper.update()
 
     expect(mockBack).toHaveBeenCalled()
diff --git a/app/src/organisms/CalibrationPanels/__tests__/DeckSetup.test.tsx b/app/src/organisms/CalibrationPanels/__tests__/DeckSetup.test.tsx
index 5ddc8509451..c8637b04853 100644
--- a/app/src/organisms/CalibrationPanels/__tests__/DeckSetup.test.tsx
+++ b/app/src/organisms/CalibrationPanels/__tests__/DeckSetup.test.tsx
@@ -1,8 +1,6 @@
-// @flow
 import * as React from 'react'
 import { mount } from 'enzyme'
 import { act } from 'react-dom/test-utils'
-// $FlowFixMe(mc, 2021-03.15): ignore until TS conversion
 import { getDeckDefinitions } from '@opentrons/components/src/deck/getDeckDefinitions'
 import {
   mockDeckCalTipRack,
@@ -12,26 +10,32 @@ import * as Sessions from '../../../redux/sessions'
 
 import { DeckSetup } from '../DeckSetup'
 
+import type { ReactWrapper } from 'enzyme'
+import type { Mount } from '@opentrons/components'
+
 jest.mock('../../../assets/labware/getLabware')
 jest.mock('@opentrons/components/src/deck/getDeckDefinitions')
 jest.mock('@opentrons/components/src/deck/RobotWorkSpace', () => ({
   RobotWorkSpace: () => <></>,
 }))
 
-const mockGetDeckDefinitions: JestMockFn<
-  [],
-  $Call<typeof getDeckDefinitions, any>
-> = getDeckDefinitions
+const mockGetDeckDefinitions = getDeckDefinitions as jest.MockedFunction<
+  typeof getDeckDefinitions
+>
 
 describe('DeckSetup', () => {
-  let render
+  let render: (
+    props?: Partial<
+      React.ComponentProps<typeof DeckSetup> & { pipMount: Mount }
+    >
+  ) => ReactWrapper<React.ComponentProps<typeof DeckSetup>>
 
   const mockSendCommands = jest.fn()
   const mockDeleteSession = jest.fn()
 
   beforeEach(() => {
     mockGetDeckDefinitions.mockReturnValue({})
-    render = (props: $Shape<React.ElementProps<typeof DeckSetup>> = {}) => {
+    render = (props = {}) => {
       const {
         pipMount = 'left',
         isMulti = false,
@@ -64,7 +68,7 @@ describe('DeckSetup', () => {
   it('clicking continue proceeds to next step', () => {
     const wrapper = render()
 
-    act(() => wrapper.find('button').invoke('onClick')())
+    act(() => wrapper.find('button').invoke('onClick')?.({} as any))
     wrapper.update()
 
     expect(mockSendCommands).toHaveBeenCalledWith({
diff --git a/app/src/organisms/CalibrationPanels/__tests__/Introduction.test.tsx b/app/src/organisms/CalibrationPanels/__tests__/Introduction.test.tsx
index 220e51b59f0..477400aebfe 100644
--- a/app/src/organisms/CalibrationPanels/__tests__/Introduction.test.tsx
+++ b/app/src/organisms/CalibrationPanels/__tests__/Introduction.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { mount } from 'enzyme'
 import { mockDeckCalTipRack } from '../../../redux/sessions/__fixtures__'
@@ -7,19 +6,28 @@ import * as Sessions from '../../../redux/sessions'
 import * as Constants from '../constants'
 import { Introduction } from '../Introduction'
 
+import type { ReactWrapper } from 'enzyme'
+import type { Mount } from '@opentrons/components'
+
 describe('Introduction', () => {
-  let render
+  let render: (
+    props?: Partial<
+      React.ComponentProps<typeof Introduction> & { pipMount: Mount }
+    >
+  ) => ReactWrapper<React.ComponentProps<typeof Introduction>>
 
   const mockSendCommands = jest.fn()
   const mockDeleteSession = jest.fn()
 
-  const getContinueButton = wrapper =>
-    wrapper.find('button[data-test="continueButton"]')
-  const getUseDiffTipRackButton = wrapper =>
-    wrapper.find('button[data-test="chooseTipRackButton"]')
+  const getContinueButton = (
+    wrapper: ReactWrapper<React.ComponentProps<typeof Introduction>>
+  ) => wrapper.find('button[data-test="continueButton"]')
+  const getUseDiffTipRackButton = (
+    wrapper: ReactWrapper<React.ComponentProps<typeof Introduction>>
+  ) => wrapper.find('button[data-test="chooseTipRackButton"]')
 
   beforeEach(() => {
-    render = (props: $Shape<React.ElementProps<typeof Introduction>> = {}) => {
+    render = (props = {}) => {
       const {
         pipMount = 'left',
         isMulti = false,
@@ -140,7 +148,7 @@ describe('Introduction', () => {
         spec.showTipRackButton
       )
 
-      getContinueButton(wrapper).invoke('onClick')()
+      getContinueButton(wrapper).invoke('onClick')?.({} as React.MouseEvent)
       wrapper.update()
       expect(mockSendCommands).toHaveBeenCalledWith({
         command: Sessions.sharedCalCommands.LOAD_LABWARE,
@@ -158,7 +166,7 @@ describe('Introduction', () => {
     expect(allText).toContain('start deck calibration')
 
     expect(getUseDiffTipRackButton(wrapper).exists()).toBe(true)
-    getContinueButton(wrapper).invoke('onClick')()
+    getContinueButton(wrapper).invoke('onClick')?.({} as React.MouseEvent)
     wrapper.update()
     expect(mockSendCommands).toHaveBeenCalledWith({
       command: Sessions.sharedCalCommands.LOAD_LABWARE,
@@ -192,7 +200,7 @@ describe('Introduction', () => {
       expect(allText).toMatch(spec.note)
       expect(getUseDiffTipRackButton(wrapper).exists()).toBe(false)
 
-      getContinueButton(wrapper).invoke('onClick')()
+      getContinueButton(wrapper).invoke('onClick')?.({} as React.MouseEvent)
       wrapper.update()
       expect(mockSendCommands).toHaveBeenCalledWith({
         command: Sessions.sharedCalCommands.LOAD_LABWARE,
diff --git a/app/src/organisms/CalibrationPanels/__tests__/MeasureNozzle.test.tsx b/app/src/organisms/CalibrationPanels/__tests__/MeasureNozzle.test.tsx
index 532a8e2e7c0..244ea1dc155 100644
--- a/app/src/organisms/CalibrationPanels/__tests__/MeasureNozzle.test.tsx
+++ b/app/src/organisms/CalibrationPanels/__tests__/MeasureNozzle.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { mount } from 'enzyme'
 import { act } from 'react-dom/test-utils'
@@ -10,22 +9,34 @@ import * as Sessions from '../../../redux/sessions'
 
 import { MeasureNozzle } from '../MeasureNozzle'
 
+import type { ReactWrapper } from 'enzyme'
+import type { Mount } from '../../../redux/pipettes/types'
+import { VectorTuple } from '../../../redux/sessions/types'
+
 describe('MeasureNozzle', () => {
-  let render
+  let render: (
+    props?: Partial<
+      React.ComponentProps<typeof MeasureNozzle> & { pipMount: Mount }
+    >
+  ) => ReactWrapper<React.ComponentProps<typeof MeasureNozzle>>
 
   const mockSendCommands = jest.fn()
   const mockDeleteSession = jest.fn()
 
-  const getContinueButton = wrapper =>
+  const getContinueButton = (
+    wrapper: ReactWrapper<React.ComponentProps<typeof MeasureNozzle>>
+  ) =>
     wrapper
       .find('button[children="Save nozzle z-axis and move to pick up tip"]')
       .find('button')
 
-  const getJogButton = (wrapper, direction) =>
-    wrapper.find(`button[title="${direction}"]`).find('button')
+  const getJogButton = (
+    wrapper: ReactWrapper<React.ComponentProps<typeof MeasureNozzle>>,
+    direction: string
+  ) => wrapper.find(`button[title="${direction}"]`).find('button')
 
   beforeEach(() => {
-    render = (props: $Shape<React.ElementProps<typeof MeasureNozzle>> = {}) => {
+    render = (props = {}) => {
       const {
         pipMount = 'left',
         isMulti = false,
@@ -67,7 +78,9 @@ describe('MeasureNozzle', () => {
 
   it('renders the confirm crash modal when invoked', () => {
     const wrapper = render()
-    wrapper.find('a[children="Start over"]').invoke('onClick')()
+    wrapper.find('a[children="Start over"]').invoke('onClick')?.(
+      {} as React.MouseEvent
+    )
     wrapper.update()
     expect(wrapper.find('ConfirmCrashRecoveryModal').exists()).toBe(true)
   })
@@ -75,13 +88,17 @@ describe('MeasureNozzle', () => {
   it('allows jogging in z axis', () => {
     const wrapper = render()
 
-    const jogDirections = ['up', 'down']
-    const jogParamsByDirection = {
+    const jogDirections: Array<'up' | 'down'> = ['up', 'down']
+    const jogParamsByDirection: { [dir in 'up' | 'down']: VectorTuple } = {
       up: [0, 0, 0.1],
       down: [0, 0, -0.1],
     }
     jogDirections.forEach(direction => {
-      act(() => getJogButton(wrapper, direction).invoke('onClick')())
+      act(() =>
+        getJogButton(wrapper, direction).invoke('onClick')?.(
+          {} as React.MouseEvent
+        )
+      )
       wrapper.update()
 
       expect(mockSendCommands).toHaveBeenCalledWith({
@@ -98,7 +115,9 @@ describe('MeasureNozzle', () => {
   it('clicking continue proceeds to next step', () => {
     const wrapper = render()
 
-    act(() => getContinueButton(wrapper).invoke('onClick')())
+    act(() =>
+      getContinueButton(wrapper).invoke('onClick')?.({} as React.MouseEvent)
+    )
     wrapper.update()
 
     expect(mockSendCommands).toHaveBeenCalledWith(
diff --git a/app/src/organisms/CalibrationPanels/__tests__/MeasureTip.test.tsx b/app/src/organisms/CalibrationPanels/__tests__/MeasureTip.test.tsx
index 783ffd42622..60abdf0dd6e 100644
--- a/app/src/organisms/CalibrationPanels/__tests__/MeasureTip.test.tsx
+++ b/app/src/organisms/CalibrationPanels/__tests__/MeasureTip.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { mount } from 'enzyme'
 import { act } from 'react-dom/test-utils'
@@ -10,20 +9,31 @@ import * as Sessions from '../../../redux/sessions'
 
 import { MeasureTip } from '../MeasureTip'
 
+import type { Mount } from '../../../redux/pipettes/types'
+import type { ReactWrapper } from 'enzyme'
+import type { VectorTuple } from '../../../redux/sessions/types'
+
 describe('MeasureTip', () => {
-  let render
+  let render: (
+    props?: Partial<
+      React.ComponentProps<typeof MeasureTip> & { pipMount: Mount }
+    >
+  ) => ReactWrapper<React.ComponentProps<typeof MeasureTip>>
 
   const mockSendCommands = jest.fn()
   const mockDeleteSession = jest.fn()
 
-  const getContinueButton = wrapper =>
-    wrapper.find('button[title="saveTipLengthButton"]').find('button')
+  const getContinueButton = (
+    wrapper: ReactWrapper<React.ComponentProps<typeof MeasureTip>>
+  ) => wrapper.find('button[title="saveTipLengthButton"]').find('button')
 
-  const getJogButton = (wrapper, direction) =>
-    wrapper.find(`button[title="${direction}"]`).find('button')
+  const getJogButton = (
+    wrapper: ReactWrapper<React.ComponentProps<typeof MeasureTip>>,
+    direction: string
+  ) => wrapper.find(`button[title="${direction}"]`).find('button')
 
   beforeEach(() => {
-    render = (props: $Shape<React.ElementProps<typeof MeasureTip>> = {}) => {
+    render = (props = {}) => {
       const {
         pipMount = 'left',
         isMulti = false,
@@ -65,7 +75,9 @@ describe('MeasureTip', () => {
 
   it('renders the confirm crash modal when invoked', () => {
     const wrapper = render()
-    wrapper.find('a[children="Start over"]').invoke('onClick')()
+    wrapper.find('a[children="Start over"]').invoke('onClick')?.(
+      {} as React.MouseEvent
+    )
     wrapper.update()
     expect(wrapper.find('ConfirmCrashRecoveryModal').exists()).toBe(true)
   })
@@ -73,13 +85,18 @@ describe('MeasureTip', () => {
   it('allows jogging in z axis', () => {
     const wrapper = render()
 
-    const jogDirections = ['up', 'down']
-    const jogParamsByDirection = {
+    type ZJogDirections = 'up' | 'down'
+    const jogDirections: ZJogDirections[] = ['up', 'down']
+    const jogParamsByDirection: { [dir in ZJogDirections]: VectorTuple } = {
       up: [0, 0, 0.1],
       down: [0, 0, -0.1],
     }
-    jogDirections.forEach(direction => {
-      act(() => getJogButton(wrapper, direction).invoke('onClick')())
+    jogDirections.forEach((direction: ZJogDirections) => {
+      act(() =>
+        getJogButton(wrapper, direction).invoke('onClick')?.(
+          {} as React.MouseEvent
+        )
+      )
       wrapper.update()
 
       expect(mockSendCommands).toHaveBeenCalledWith({
@@ -96,7 +113,9 @@ describe('MeasureTip', () => {
   it('clicking continue proceeds to next step', () => {
     const wrapper = render()
 
-    act(() => getContinueButton(wrapper).invoke('onClick')())
+    act(() =>
+      getContinueButton(wrapper).invoke('onClick')?.({} as React.MouseEvent)
+    )
     wrapper.update()
 
     expect(mockSendCommands).toHaveBeenCalledWith(
diff --git a/app/src/organisms/CalibrationPanels/__tests__/SaveXYPoint.test.tsx b/app/src/organisms/CalibrationPanels/__tests__/SaveXYPoint.test.tsx
index bcde2d5bd3b..4a53758926d 100644
--- a/app/src/organisms/CalibrationPanels/__tests__/SaveXYPoint.test.tsx
+++ b/app/src/organisms/CalibrationPanels/__tests__/SaveXYPoint.test.tsx
@@ -1,30 +1,46 @@
-// @flow
 import * as React from 'react'
 import { mount } from 'enzyme'
-import type { Mount } from '@opentrons/components'
 
 import { mockDeckCalTipRack } from '../../../redux/sessions/__fixtures__'
 import * as Sessions from '../../../redux/sessions'
 import { SaveXYPoint } from '../SaveXYPoint'
 
-const currentStepBySlot = {
+import type { Mount } from '@opentrons/components'
+import type { ReactWrapper, HTMLAttributes } from 'enzyme'
+import type {
+  CalibrationSessionStep,
+  VectorTuple,
+} from '../../../redux/sessions/types'
+
+type ChannelString = 'multi' | 'single'
+const currentStepBySlot: { [slotNumber: string]: CalibrationSessionStep } = {
   '1': Sessions.DECK_STEP_SAVING_POINT_ONE,
   '3': Sessions.DECK_STEP_SAVING_POINT_TWO,
   '7': Sessions.DECK_STEP_SAVING_POINT_THREE,
 }
 describe('SaveXYPoint', () => {
-  let render
+  let render: (
+    props?: Partial<
+      React.ComponentProps<typeof SaveXYPoint> & { pipMount: Mount }
+    >
+  ) => ReactWrapper<React.ComponentProps<typeof SaveXYPoint>>
 
   const mockSendCommands = jest.fn()
   const mockDeleteSession = jest.fn()
 
-  const getSaveButton = (wrapper, direction) =>
-    wrapper.find('button[title="save"]')
+  const getSaveButton = (
+    wrapper: ReactWrapper<React.ComponentProps<typeof SaveXYPoint>>
+  ): ReactWrapper<HTMLAttributes> => wrapper.find('button[title="save"]')
 
-  const getJogButton = (wrapper, direction) =>
+  const getJogButton = (
+    wrapper: ReactWrapper<React.ComponentProps<typeof SaveXYPoint>>,
+    direction: string
+  ): ReactWrapper<HTMLAttributes> =>
     wrapper.find(`button[title="${direction}"]`).find('button')
 
-  const getVideo = wrapper => wrapper.find(`source`)
+  const getVideo = (
+    wrapper: ReactWrapper<React.ComponentProps<typeof SaveXYPoint>>
+  ): ReactWrapper<HTMLAttributes> => wrapper.find(`source`)
 
   beforeEach(() => {
     render = (props = {}) => {
@@ -67,7 +83,11 @@ describe('SaveXYPoint', () => {
     const slot7LeftSingleSrc = 'SLOT_7_LEFT_SINGLE_X-Y.webm'
     const slot7RightMultiSrc = 'SLOT_7_RIGHT_MULTI_X-Y.webm'
     const slot7RightSingleSrc = 'SLOT_7_RIGHT_SINGLE_X-Y.webm'
-    const assetMap: { [string]: { [Mount]: { ... }, ... }, ... } = {
+    const assetMap: {
+      [slot: string]: {
+        [mount in Mount]: { [channels in ChannelString]: string }
+      }
+    } = {
       '1': {
         left: {
           multi: slot1LeftMultiSrc,
@@ -102,14 +122,14 @@ describe('SaveXYPoint', () => {
     Object.keys(assetMap).forEach(slotNumber => {
       const xyStep = assetMap[slotNumber]
       Object.keys(xyStep).forEach(mountString => {
-        Object.keys(xyStep[mountString]).forEach(channelString => {
+        Object.keys(xyStep[mountString as Mount]).forEach(channelString => {
           const wrapper = render({
-            pipMount: mountString,
+            pipMount: mountString as Mount,
             isMulti: channelString === 'multi',
             currentStep: currentStepBySlot[slotNumber],
           })
           expect(getVideo(wrapper).prop('src')).toEqual(
-            xyStep[mountString][channelString]
+            xyStep[mountString as Mount][channelString as ChannelString]
           )
         })
       })
@@ -119,15 +139,17 @@ describe('SaveXYPoint', () => {
   it('allows jogging in z axis', () => {
     const wrapper = render()
 
-    const jogDirections = ['left', 'right', 'back', 'forward']
-    const jogVectorByDirection = {
+    const jogDirections: string[] = ['left', 'right', 'back', 'forward']
+    const jogVectorByDirection: { [dir: string]: VectorTuple } = {
       left: [-0.1, 0, 0],
       right: [0.1, 0, 0],
       back: [0, 0.1, 0],
       forward: [0, -0.1, 0],
     }
     jogDirections.forEach(direction => {
-      getJogButton(wrapper, direction).invoke('onClick')()
+      getJogButton(wrapper, direction).invoke('onClick')?.(
+        {} as React.MouseEvent
+      )
       wrapper.update()
 
       expect(mockSendCommands).toHaveBeenCalledWith({
@@ -156,7 +178,7 @@ describe('SaveXYPoint', () => {
     })
 
     expect(wrapper.text()).toContain('slot 1')
-    getSaveButton(wrapper).invoke('onClick')()
+    getSaveButton(wrapper).invoke('onClick')?.({} as React.MouseEvent)
 
     wrapper.update()
 
@@ -177,7 +199,7 @@ describe('SaveXYPoint', () => {
     })
 
     expect(wrapper.text()).toContain('slot 3')
-    getSaveButton(wrapper).invoke('onClick')()
+    getSaveButton(wrapper).invoke('onClick')?.({} as React.MouseEvent)
     wrapper.update()
 
     expect(mockSendCommands).toHaveBeenCalledWith(
@@ -197,7 +219,7 @@ describe('SaveXYPoint', () => {
     })
 
     expect(wrapper.text()).toContain('slot 7')
-    getSaveButton(wrapper).invoke('onClick')()
+    getSaveButton(wrapper).invoke('onClick')?.({} as React.MouseEvent)
     wrapper.update()
 
     expect(mockSendCommands).toHaveBeenCalledWith(
@@ -219,7 +241,7 @@ describe('SaveXYPoint', () => {
     expect(allText).toContain('save calibration')
     expect(allText).toContain('slot 1')
 
-    getSaveButton(wrapper).invoke('onClick')()
+    getSaveButton(wrapper).invoke('onClick')?.({} as React.MouseEvent)
     wrapper.update()
 
     expect(mockSendCommands).toHaveBeenCalledWith({
@@ -234,7 +256,9 @@ describe('SaveXYPoint', () => {
 
   it('renders the confirm crash modal when invoked', () => {
     const wrapper = render()
-    wrapper.find('a[children="Start over"]').invoke('onClick')()
+    wrapper.find('a[children="Start over"]').invoke('onClick')?.(
+      {} as React.MouseEvent
+    )
     wrapper.update()
     expect(wrapper.find('ConfirmCrashRecoveryModal').exists()).toBe(true)
   })
diff --git a/app/src/organisms/CalibrationPanels/__tests__/SaveZPoint.test.tsx b/app/src/organisms/CalibrationPanels/__tests__/SaveZPoint.test.tsx
index c2a8f55119e..29ec19ee044 100644
--- a/app/src/organisms/CalibrationPanels/__tests__/SaveZPoint.test.tsx
+++ b/app/src/organisms/CalibrationPanels/__tests__/SaveZPoint.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { mount } from 'enzyme'
 
@@ -6,18 +5,33 @@ import { mockDeckCalTipRack } from '../../../redux/sessions/__fixtures__'
 import * as Sessions from '../../../redux/sessions'
 import { SaveZPoint } from '../SaveZPoint'
 
+import type { Mount } from '@opentrons/components'
+import type { ReactWrapper, HTMLAttributes } from 'enzyme'
+import type { VectorTuple } from '../../../redux/sessions/types'
+
 describe('SaveZPoint', () => {
-  let render
+  let render: (
+    props?: Partial<
+      React.ComponentProps<typeof SaveZPoint> & { pipMount: Mount }
+    >
+  ) => ReactWrapper<React.ComponentProps<typeof SaveZPoint>>
 
   const mockSendCommands = jest.fn()
   const mockDeleteSession = jest.fn()
 
-  const getSaveButton = wrapper => wrapper.find('button[title="save"]')
+  const getSaveButton = (
+    wrapper: ReactWrapper<React.ComponentProps<typeof SaveZPoint>>
+  ): ReactWrapper<HTMLAttributes> => wrapper.find('button[title="save"]')
 
-  const getJogButton = (wrapper, direction) =>
+  const getJogButton = (
+    wrapper: ReactWrapper<React.ComponentProps<typeof SaveZPoint>>,
+    direction: string
+  ): ReactWrapper<HTMLAttributes> =>
     wrapper.find(`button[title="${direction}"]`).find('button')
 
-  const getVideo = wrapper => wrapper.find(`source`)
+  const getVideo = (
+    wrapper: ReactWrapper<React.ComponentProps<typeof SaveZPoint>>
+  ): ReactWrapper<HTMLAttributes> => wrapper.find(`source`)
 
   beforeEach(() => {
     render = (props = {}) => {
@@ -48,7 +62,9 @@ describe('SaveZPoint', () => {
   })
 
   it('displays proper asset', () => {
-    const assetMap = {
+    const assetMap: {
+      [mount in Mount]: { [c in 'multi' | 'single']: string }
+    } = {
       left: {
         multi: 'SLOT_5_LEFT_MULTI_Z.webm',
         single: 'SLOT_5_LEFT_SINGLE_Z.webm',
@@ -60,13 +76,13 @@ describe('SaveZPoint', () => {
     }
 
     Object.keys(assetMap).forEach(mountString => {
-      Object.keys(assetMap[mountString]).forEach(channelString => {
+      Object.keys(assetMap[mountString as Mount]).forEach(channelString => {
         const wrapper = render({
-          pipMount: mountString,
-          isMulti: channelString === 'multi',
+          pipMount: mountString as Mount,
+          isMulti: (channelString as 'multi' | 'single') === 'multi',
         })
         expect(getVideo(wrapper).prop('src')).toEqual(
-          assetMap[mountString][channelString]
+          assetMap[mountString as Mount][channelString as 'multi' | 'single']
         )
       })
     })
@@ -75,13 +91,16 @@ describe('SaveZPoint', () => {
   it('allows jogging in z axis', () => {
     const wrapper = render()
 
-    const jogDirections = ['up', 'down']
-    const jogVectorByDirection = {
+    type ZJogDir = 'up' | 'down'
+    const jogDirections: ZJogDir[] = ['up', 'down']
+    const jogVectorByDirection: { [dir in ZJogDir]: VectorTuple } = {
       up: [0, 0, 0.1],
       down: [0, 0, -0.1],
     }
     jogDirections.forEach(direction => {
-      getJogButton(wrapper, direction).invoke('onClick')()
+      getJogButton(wrapper, direction).invoke('onClick')?.(
+        {} as React.MouseEvent
+      )
       wrapper.update()
 
       expect(mockSendCommands).toHaveBeenCalledWith({
@@ -102,8 +121,8 @@ describe('SaveZPoint', () => {
   it('allows jogging in xy axis after prompt clicked', () => {
     const wrapper = render()
 
-    const jogDirections = ['left', 'right', 'back', 'forward']
-    const jogVectorByDirection = {
+    const jogDirections: string[] = ['left', 'right', 'back', 'forward']
+    const jogVectorByDirection: { [dir: string]: VectorTuple } = {
       left: [-0.1, 0, 0],
       right: [0.1, 0, 0],
       back: [0, 0.1, 0],
@@ -114,9 +133,11 @@ describe('SaveZPoint', () => {
     })
     wrapper
       .find('button[children="Reveal XY jog controls to move across deck"]')
-      .invoke('onClick')({ preventDefault: () => {} })
+      .invoke('onClick')?.({} as React.MouseEvent)
     jogDirections.forEach(direction => {
-      getJogButton(wrapper, direction).invoke('onClick')()
+      getJogButton(wrapper, direction).invoke('onClick')?.(
+        {} as React.MouseEvent
+      )
 
       expect(mockSendCommands).toHaveBeenCalledWith({
         command: Sessions.deckCalCommands.JOG,
@@ -136,7 +157,7 @@ describe('SaveZPoint', () => {
   it('sends save offset command when primary button is clicked', () => {
     const wrapper = render()
 
-    getSaveButton(wrapper).invoke('onClick')()
+    getSaveButton(wrapper).invoke('onClick')?.({} as React.MouseEvent)
     wrapper.update()
 
     expect(mockSendCommands).toHaveBeenCalledWith(
@@ -188,7 +209,9 @@ describe('SaveZPoint', () => {
 
   it('renders the confirm crash modal when invoked', () => {
     const wrapper = render()
-    wrapper.find('a[children="Start over"]').invoke('onClick')()
+    wrapper.find('a[children="Start over"]').invoke('onClick')?.(
+      {} as React.MouseEvent
+    )
     wrapper.update()
     expect(wrapper.find('ConfirmCrashRecoveryModal').exists()).toBe(true)
   })
diff --git a/app/src/organisms/CalibrationPanels/__tests__/TipConfirmation.test.tsx b/app/src/organisms/CalibrationPanels/__tests__/TipConfirmation.test.tsx
index adb0686320a..b5be4103764 100644
--- a/app/src/organisms/CalibrationPanels/__tests__/TipConfirmation.test.tsx
+++ b/app/src/organisms/CalibrationPanels/__tests__/TipConfirmation.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { mount } from 'enzyme'
 import { mockDeckCalTipRack } from '../../../redux/sessions/__fixtures__'
@@ -6,22 +5,31 @@ import * as Sessions from '../../../redux/sessions'
 
 import { TipConfirmation } from '../TipConfirmation'
 
+import type { Mount } from '@opentrons/components'
+import type { ReactWrapper, HTMLAttributes } from 'enzyme'
+
 describe('TipConfirmation', () => {
-  let render
+  let render: (
+    props?: Partial<
+      React.ComponentProps<typeof TipConfirmation> & { pipMount: Mount }
+    >
+  ) => ReactWrapper<React.ComponentProps<typeof TipConfirmation>>
 
   const mockSendCommands = jest.fn()
   const mockDeleteSession = jest.fn()
 
-  const getConfirmTipButton = wrapper =>
+  const getConfirmTipButton = (
+    wrapper: ReactWrapper<React.ComponentProps<typeof TipConfirmation>>
+  ): ReactWrapper<HTMLAttributes> =>
     wrapper.find('button[title="confirmTipAttachedButton"]')
 
-  const getInvalidateTipButton = wrapper =>
+  const getInvalidateTipButton = (
+    wrapper: ReactWrapper<React.ComponentProps<typeof TipConfirmation>>
+  ): ReactWrapper<HTMLAttributes> =>
     wrapper.find('button[title="invalidateTipButton"]')
 
   beforeEach(() => {
-    render = (
-      props: $Shape<React.ElementProps<typeof TipConfirmation>> = {}
-    ) => {
+    render = (props = {}) => {
       const {
         pipMount = 'left',
         isMulti = false,
@@ -52,7 +60,7 @@ describe('TipConfirmation', () => {
   it('clicking invalidate tip send invalidate tip command', () => {
     const wrapper = render()
 
-    getInvalidateTipButton(wrapper).invoke('onClick')()
+    getInvalidateTipButton(wrapper).invoke('onClick')?.({} as React.MouseEvent)
     wrapper.update()
     expect(mockSendCommands).toHaveBeenCalledWith({
       command: Sessions.sharedCalCommands.INVALIDATE_TIP,
@@ -63,7 +71,7 @@ describe('TipConfirmation', () => {
       sessionType: Sessions.SESSION_TYPE_PIPETTE_OFFSET_CALIBRATION,
     })
     expect(wrapper.text()).toContain('Yes, move to slot 5')
-    getConfirmTipButton(wrapper).invoke('onClick')()
+    getConfirmTipButton(wrapper).invoke('onClick')?.({} as React.MouseEvent)
     wrapper.update()
 
     expect(mockSendCommands).toHaveBeenCalledWith({
@@ -75,7 +83,7 @@ describe('TipConfirmation', () => {
       sessionType: Sessions.SESSION_TYPE_DECK_CALIBRATION,
     })
     expect(wrapper.text()).toContain('Yes, move to slot 5')
-    getConfirmTipButton(wrapper).invoke('onClick')()
+    getConfirmTipButton(wrapper).invoke('onClick')?.({} as React.MouseEvent)
     wrapper.update()
 
     expect(mockSendCommands).toHaveBeenCalledWith({
@@ -87,7 +95,7 @@ describe('TipConfirmation', () => {
       sessionType: Sessions.SESSION_TYPE_TIP_LENGTH_CALIBRATION,
     })
     expect(wrapper.text()).toContain('Yes, move to measure tip length')
-    getConfirmTipButton(wrapper).invoke('onClick')()
+    getConfirmTipButton(wrapper).invoke('onClick')?.({} as React.MouseEvent)
     wrapper.update()
 
     expect(mockSendCommands).toHaveBeenCalledWith({
diff --git a/app/src/organisms/CalibrationPanels/__tests__/TipPickUp.test.tsx b/app/src/organisms/CalibrationPanels/__tests__/TipPickUp.test.tsx
index 3cd303967c4..008251c2c89 100644
--- a/app/src/organisms/CalibrationPanels/__tests__/TipPickUp.test.tsx
+++ b/app/src/organisms/CalibrationPanels/__tests__/TipPickUp.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { mount } from 'enzyme'
 import { mockDeckCalTipRack } from '../../../redux/sessions/__fixtures__'
@@ -6,20 +5,31 @@ import * as Sessions from '../../../redux/sessions'
 
 import { TipPickUp } from '../TipPickUp'
 
+import type { Mount } from '@opentrons/components'
+import type { ReactWrapper } from 'enzyme'
+import type { VectorTuple } from '../../../redux/sessions/types'
+
 describe('TipPickUp', () => {
-  let render
+  let render: (
+    props?: Partial<
+      React.ComponentProps<typeof TipPickUp> & { pipMount: Mount }
+    >
+  ) => ReactWrapper<React.ComponentProps<typeof TipPickUp>>
 
   const mockSendCommands = jest.fn()
   const mockDeleteSession = jest.fn()
 
-  const getPickUpTipButton = wrapper =>
-    wrapper.find('button[children="Pick up tip"]')
+  const getPickUpTipButton = (
+    wrapper: ReactWrapper<React.ComponentProps<typeof TipPickUp>>
+  ) => wrapper.find('button[children="Pick up tip"]')
 
-  const getJogButton = (wrapper, direction) =>
-    wrapper.find(`button[title="${direction}"]`).find('button')
+  const getJogButton = (
+    wrapper: ReactWrapper<React.ComponentProps<typeof TipPickUp>>,
+    direction: string
+  ) => wrapper.find(`button[title="${direction}"]`).find('button')
 
   beforeEach(() => {
-    render = (props: $Shape<React.ElementProps<typeof TipPickUp>> = {}) => {
+    render = (props = {}) => {
       const {
         pipMount = 'left',
         isMulti = false,
@@ -50,8 +60,15 @@ describe('TipPickUp', () => {
   it('allows jogging in z axis', () => {
     const wrapper = render()
 
-    const jogDirections = ['left', 'right', 'back', 'forward', 'up', 'down']
-    const jogVectorsByDirection = {
+    const jogDirections: string[] = [
+      'left',
+      'right',
+      'back',
+      'forward',
+      'up',
+      'down',
+    ]
+    const jogVectorsByDirection: { [dir: string]: VectorTuple } = {
       up: [0, 0, 0.1],
       down: [0, 0, -0.1],
       left: [-0.1, 0, 0],
@@ -60,7 +77,9 @@ describe('TipPickUp', () => {
       forward: [0, -0.1, 0],
     }
     jogDirections.forEach(direction => {
-      getJogButton(wrapper, direction).invoke('onClick')()
+      getJogButton(wrapper, direction).invoke('onClick')?.(
+        {} as React.MouseEvent
+      )
       wrapper.update()
 
       expect(mockSendCommands).toHaveBeenCalledWith({
@@ -72,7 +91,7 @@ describe('TipPickUp', () => {
   it('clicking pick up tip sends pick up tip command', () => {
     const wrapper = render()
 
-    getPickUpTipButton(wrapper).invoke('onClick')()
+    getPickUpTipButton(wrapper).invoke('onClick')?.({} as React.MouseEvent)
     wrapper.update()
     expect(mockSendCommands).toHaveBeenCalledWith({
       command: Sessions.sharedCalCommands.PICK_UP_TIP,
@@ -91,7 +110,9 @@ describe('TipPickUp', () => {
 
   it('renders the confirm crash modal when invoked', () => {
     const wrapper = render()
-    wrapper.find('a[children="Start over"]').invoke('onClick')()
+    wrapper.find('a[children="Start over"]').invoke('onClick')?.(
+      {} as React.MouseEvent
+    )
     wrapper.update()
     expect(wrapper.find('ConfirmCrashRecoveryModal').exists()).toBe(true)
   })
diff --git a/app/src/organisms/CalibrationPanels/__tests__/useConfirmCrashRecovery.test.tsx b/app/src/organisms/CalibrationPanels/__tests__/useConfirmCrashRecovery.test.tsx
index 33222746ec8..d966de7cb85 100644
--- a/app/src/organisms/CalibrationPanels/__tests__/useConfirmCrashRecovery.test.tsx
+++ b/app/src/organisms/CalibrationPanels/__tests__/useConfirmCrashRecovery.test.tsx
@@ -1,5 +1,3 @@
-// @flow
-
 import * as React from 'react'
 import { mount } from 'enzyme'
 
@@ -10,26 +8,34 @@ import type {
   LabwareDefinition2,
   LabwareMetadata,
 } from '@opentrons/shared-data'
+import type { ReactWrapper, HTMLAttributes } from 'enzyme'
 
 describe('useConfirmCrashRecovery', () => {
-  let render
+  let render: (props?: Partial<Props>) => ReactWrapper<Props>
   const mockSendCommands = jest.fn()
-  const mockTipRack: $Shape<CalibrationLabware> = {
+  const mockTipRack: Partial<CalibrationLabware> = {
     slot: '4',
-    definition: ({
-      metadata: ({
+    definition: {
+      metadata: {
         displayName: 'my tiprack',
-      }: $Shape<LabwareMetadata>),
-    }: $Shape<LabwareDefinition2>),
+      } as LabwareMetadata,
+    } as LabwareDefinition2,
   }
 
-  const getStarterLink = wrapper => wrapper.find('a')
-  const getModal = wrapper => wrapper.find('ConfirmCrashRecoveryModal')
-  const getExitButton = wrapper =>
+  const getStarterLink = (
+    wrapper: ReactWrapper<Props>
+  ): ReactWrapper<HTMLAttributes> => wrapper.find('a')
+  const getModal = (wrapper: ReactWrapper<Props>): ReactWrapper =>
+    wrapper.find('ConfirmCrashRecoveryModal')
+  const getExitButton = (
+    wrapper: ReactWrapper<Props>
+  ): ReactWrapper<HTMLAttributes> =>
     wrapper.find('OutlineButton[children="cancel"]')
-  const getRestartButton = wrapper => wrapper.find('OutlineButton').at(1)
+  const getRestartButton = (
+    wrapper: ReactWrapper<Props>
+  ): ReactWrapper<HTMLAttributes> => wrapper.find('OutlineButton').at(1)
 
-  const TestUseConfirmCrashRecovery = (props: $Shape<Props>) => {
+  const TestUseConfirmCrashRecovery = (props: Partial<Props>): JSX.Element => {
     const {
       requiresNewTip = false,
       sendCommands = mockSendCommands,
@@ -39,8 +45,8 @@ describe('useConfirmCrashRecovery', () => {
       ...props,
       requiresNewTip: requiresNewTip,
       sendCommands: sendCommands,
-      tipRack: tipRack,
-    })
+      tipRack: tipRack as CalibrationLabware,
+    } as any)
     return (
       <>
         {starterText}
@@ -49,7 +55,7 @@ describe('useConfirmCrashRecovery', () => {
     )
   }
   beforeEach(() => {
-    render = (props: $Shape<Props> = {}) => {
+    render = (props: Partial<Props> = {}) => {
       return mount(<TestUseConfirmCrashRecovery {...props} />)
     }
   })
@@ -64,7 +70,7 @@ describe('useConfirmCrashRecovery', () => {
 
   it('renders the modal with the right props when you click the link', () => {
     const wrapper = render()
-    getStarterLink(wrapper).invoke('onClick')()
+    getStarterLink(wrapper).invoke('onClick')?.({} as React.MouseEvent)
     wrapper.update()
     expect(getModal(wrapper).exists()).toBe(true)
     expect(getModal(wrapper).prop('requiresNewTip')).toBe(false)
@@ -74,9 +80,9 @@ describe('useConfirmCrashRecovery', () => {
 
   it('invokes invalidate_last_action when you click confirm', () => {
     const wrapper = render()
-    getStarterLink(wrapper).invoke('onClick')()
+    getStarterLink(wrapper).invoke('onClick')?.({} as React.MouseEvent)
     wrapper.update()
-    getRestartButton(wrapper).invoke('onClick')()
+    getRestartButton(wrapper).invoke('onClick')?.({} as React.MouseEvent)
     wrapper.update()
     expect(mockSendCommands).toHaveBeenCalledWith({
       command: 'calibration.invalidateLastAction',
@@ -85,10 +91,10 @@ describe('useConfirmCrashRecovery', () => {
 
   it('stops rendering the modal when you click cancel', () => {
     const wrapper = render()
-    getStarterLink(wrapper).invoke('onClick')()
+    getStarterLink(wrapper).invoke('onClick')?.({} as React.MouseEvent)
     wrapper.update()
     expect(getModal(wrapper).exists()).toBe(true)
-    getExitButton(wrapper).invoke('onClick')()
+    getExitButton(wrapper).invoke('onClick')?.({} as React.MouseEvent)
     wrapper.update()
     expect(getModal(wrapper).exists()).toBe(false)
   })
diff --git a/app/src/organisms/CalibrationPanels/constants.ts b/app/src/organisms/CalibrationPanels/constants.ts
index f3a5b7fa137..592ece3b7c2 100644
--- a/app/src/organisms/CalibrationPanels/constants.ts
+++ b/app/src/organisms/CalibrationPanels/constants.ts
@@ -1,5 +1,3 @@
-// @flow
-
 export const INTENT_TIP_LENGTH_OUTSIDE_PROTOCOL: 'tip-length-no-protocol' =
   'tip-length-no-protocol'
 export const INTENT_TIP_LENGTH_IN_PROTOCOL: 'tip-length-in-protocol' =
diff --git a/app/src/organisms/CalibrationPanels/labwareImages.ts b/app/src/organisms/CalibrationPanels/labwareImages.ts
index cb607f808cd..345c8e0bd33 100644
--- a/app/src/organisms/CalibrationPanels/labwareImages.ts
+++ b/app/src/organisms/CalibrationPanels/labwareImages.ts
@@ -1,4 +1,3 @@
-// @flow
 // images by labware load name
 
 // TODO: BC 2020-04-01): this mapping should live in shared-data,
diff --git a/app/src/organisms/CalibrationPanels/types.ts b/app/src/organisms/CalibrationPanels/types.ts
index 751b7f2c8ba..7f3c36b937a 100644
--- a/app/src/organisms/CalibrationPanels/types.ts
+++ b/app/src/organisms/CalibrationPanels/types.ts
@@ -1,4 +1,3 @@
-// @flow
 import type {
   SessionCommandParams,
   SessionType,
@@ -9,7 +8,7 @@ import type {
   CalibrationCheckComparisonByPipette,
 } from '../../redux/sessions/types'
 
-import typeof {
+import {
   INTENT_TIP_LENGTH_OUTSIDE_PROTOCOL,
   INTENT_TIP_LENGTH_IN_PROTOCOL,
   INTENT_CALIBRATE_PIPETTE_OFFSET,
@@ -19,6 +18,7 @@ import typeof {
 } from './constants'
 
 import type { LabwareDefinition2 } from '@opentrons/shared-data'
+import type { Mount } from '../../redux/pipettes/types'
 
 /*
  * Intents capture the context in which a calibration flow is invoked.
@@ -37,40 +37,41 @@ import type { LabwareDefinition2 } from '@opentrons/shared-data'
  */
 
 export type Intent =
-  | INTENT_TIP_LENGTH_OUTSIDE_PROTOCOL
-  | INTENT_TIP_LENGTH_IN_PROTOCOL
-  | INTENT_CALIBRATE_PIPETTE_OFFSET
-  | INTENT_RECALIBRATE_PIPETTE_OFFSET
-  | INTENT_DECK_CALIBRATION
-  | INTENT_HEALTH_CHECK
+  | typeof INTENT_TIP_LENGTH_OUTSIDE_PROTOCOL
+  | typeof INTENT_TIP_LENGTH_IN_PROTOCOL
+  | typeof INTENT_CALIBRATE_PIPETTE_OFFSET
+  | typeof INTENT_RECALIBRATE_PIPETTE_OFFSET
+  | typeof INTENT_DECK_CALIBRATION
+  | typeof INTENT_HEALTH_CHECK
 export type PipetteOffsetIntent =
-  | INTENT_TIP_LENGTH_OUTSIDE_PROTOCOL
-  | INTENT_TIP_LENGTH_IN_PROTOCOL
-  | INTENT_CALIBRATE_PIPETTE_OFFSET
+  | typeof INTENT_TIP_LENGTH_OUTSIDE_PROTOCOL
+  | typeof INTENT_TIP_LENGTH_IN_PROTOCOL
+  | typeof INTENT_CALIBRATE_PIPETTE_OFFSET
+  | typeof INTENT_RECALIBRATE_PIPETTE_OFFSET
 export type TipLengthIntent =
-  | INTENT_TIP_LENGTH_OUTSIDE_PROTOCOL
-  | INTENT_TIP_LENGTH_IN_PROTOCOL
+  | typeof INTENT_TIP_LENGTH_OUTSIDE_PROTOCOL
+  | typeof INTENT_TIP_LENGTH_IN_PROTOCOL
 
 // TODO (lc 10-20-2020) Given there are lots of optional
 // keys here now we should split these panel props out
 // into different session types and combine them into
 // a union object
-export type CalibrationPanelProps = {|
-  sendCommands: (...Array<SessionCommandParams>) => void,
-  cleanUpAndExit: () => void,
-  tipRack: CalibrationLabware,
-  isMulti: boolean,
-  mount: string,
-  currentStep: CalibrationSessionStep,
-  sessionType: SessionType,
-  calBlock?: CalibrationLabware | null,
-  shouldPerformTipLength?: boolean | null,
-  checkBothPipettes?: boolean | null,
-  instruments?: Array<CalibrationCheckInstrument> | null,
-  comparisonsByPipette?: CalibrationCheckComparisonByPipette | null,
-  activePipette?: CalibrationCheckInstrument,
-  intent?: Intent,
-  robotName?: string | null,
-  supportedCommands?: Array<SessionCommandString> | null,
-  defaultTipracks?: Array<LabwareDefinition2> | null,
-|}
+export interface CalibrationPanelProps {
+  sendCommands: (...params: SessionCommandParams[]) => void
+  cleanUpAndExit: () => void
+  tipRack: CalibrationLabware
+  isMulti: boolean
+  mount: Mount
+  currentStep: CalibrationSessionStep
+  sessionType: SessionType
+  calBlock?: CalibrationLabware | null
+  shouldPerformTipLength?: boolean | null
+  checkBothPipettes?: boolean | null
+  instruments?: CalibrationCheckInstrument[] | null
+  comparisonsByPipette?: CalibrationCheckComparisonByPipette | null
+  activePipette?: CalibrationCheckInstrument
+  intent?: Intent
+  robotName?: string | null
+  supportedCommands?: SessionCommandString[] | null
+  defaultTipracks?: LabwareDefinition2[] | null
+}
diff --git a/app/src/organisms/CalibrationPanels/useConfirmCrashRecovery.tsx b/app/src/organisms/CalibrationPanels/useConfirmCrashRecovery.tsx
index 39b480a1ad8..2c79b557f17 100644
--- a/app/src/organisms/CalibrationPanels/useConfirmCrashRecovery.tsx
+++ b/app/src/organisms/CalibrationPanels/useConfirmCrashRecovery.tsx
@@ -1,5 +1,3 @@
-// @flow
-
 import * as React from 'react'
 import { css } from 'styled-components'
 
@@ -21,18 +19,17 @@ import type { CalibrationPanelProps } from './types'
 const CONDITION = 'Jog too far or bend a tip?'
 const START_OVER = 'Start over'
 
-export type Props = {|
-  requiresNewTip: boolean,
-  ...CalibrationPanelProps,
-|}
+export interface Props extends CalibrationPanelProps {
+  requiresNewTip: boolean
+}
 
 export function useConfirmCrashRecovery(
   props: Props
-): [React.Node, React.Node] {
+): [message: React.ReactNode, modal: React.ReactNode] {
   const { sendCommands, tipRack, requiresNewTip } = props
   const [showModal, setShowModal] = React.useState(false)
 
-  const doStartOver = () => {
+  const doStartOver = (): void => {
     sendCommands({ command: Sessions.sharedCalCommands.INVALIDATE_LAST_ACTION })
   }
   return [
diff --git a/app/src/organisms/CalibrationPanels/utils.ts b/app/src/organisms/CalibrationPanels/utils.ts
index cfb4513e394..ba44eda6055 100644
--- a/app/src/organisms/CalibrationPanels/utils.ts
+++ b/app/src/organisms/CalibrationPanels/utils.ts
@@ -1,4 +1,3 @@
-// @flow
 import { format } from 'date-fns'
 import type { Axis } from '../../molecules/JogControls/types'
 import type { VectorTuple } from '../../redux/sessions/types'
@@ -11,7 +10,7 @@ export function formatJogVector(
   direction: number,
   step: number
 ): VectorTuple {
-  const vector = [0, 0, 0]
+  const vector: VectorTuple = [0, 0, 0]
   const index = ORDERED_AXES.findIndex(a => a === axis)
   if (index >= 0) {
     vector[index] = step * direction
diff --git a/app/src/organisms/ChangePipette/CheckPipettesButton.tsx b/app/src/organisms/ChangePipette/CheckPipettesButton.tsx
index e9a1d165410..8b5a7689f69 100644
--- a/app/src/organisms/ChangePipette/CheckPipettesButton.tsx
+++ b/app/src/organisms/ChangePipette/CheckPipettesButton.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { useSelector } from 'react-redux'
 
@@ -14,32 +13,32 @@ import { PrimaryButton, Icon } from '@opentrons/components'
 
 import type { State } from '../../redux/types'
 import type { RequestState } from '../../redux/robot-api/types'
-import type { FetchPipettesAction } from '../../redux/pipettes/types'
 
-export type CheckPipetteButtonProps = {|
-  robotName: string,
-  className: string,
-  children: React.Node,
-  hidden?: boolean,
-  onDone?: () => mixed,
-|}
+export interface CheckPipetteButtonProps {
+  robotName: string
+  className: string
+  children: React.ReactNode
+  hidden?: boolean
+  onDone?: () => unknown
+}
 
 export function CheckPipettesButton(
   props: CheckPipetteButtonProps
-): React.Node {
+): JSX.Element | null {
   const { robotName, onDone, className, children, hidden = false } = props
   const fetchPipettesRequestId = React.useRef<string | null>(null)
-  const [dispatch] = useDispatchApiRequests<FetchPipettesAction>(
-    dispatchedAction => {
-      if (
-        dispatchedAction.type === FETCH_PIPETTES &&
-        dispatchedAction.meta.requestId
-      ) {
-        fetchPipettesRequestId.current = dispatchedAction.meta.requestId
-      }
+  const [dispatch] = useDispatchApiRequests(dispatchedAction => {
+    if (
+      dispatchedAction.type === FETCH_PIPETTES &&
+      // @ts-expect-error(sa, 2021-05-27): avoiding src code change, need to type narrow
+      dispatchedAction.meta.requestId
+    ) {
+      // @ts-expect-error(sa, 2021-05-27): avoiding src code change, need to type narrow
+      fetchPipettesRequestId.current = dispatchedAction.meta.requestId
     }
-  )
-  const handleClick = () => dispatch(fetchPipettes(robotName, true))
+  })
+
+  const handleClick = (): void => dispatch(fetchPipettes(robotName, true))
   const requestStatus = useSelector<State, RequestState | null>(state =>
     fetchPipettesRequestId.current
       ? getRequestById(state, fetchPipettesRequestId.current)
diff --git a/app/src/organisms/ChangePipette/ClearDeckAlertModal/index.tsx b/app/src/organisms/ChangePipette/ClearDeckAlertModal/index.tsx
index 78056a82294..0229b63bc9c 100644
--- a/app/src/organisms/ChangePipette/ClearDeckAlertModal/index.tsx
+++ b/app/src/organisms/ChangePipette/ClearDeckAlertModal/index.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { Link } from 'react-router-dom'
 
@@ -7,21 +6,21 @@ import removeTrashSrc from '../../../assets/images/remove-trash@3x.png'
 import { Portal } from '../../../App/portal'
 import styles from './styles.css'
 
-export type ClearDeckAlertModalProps = {|
-  onContinueClick?: () => mixed,
-  onCancelClick?: () => mixed,
-  parentUrl?: string,
-  cancelText: string,
-  continueText: string,
-  removeTrash?: boolean,
-  children?: React.Node,
-|}
+export interface ClearDeckAlertModalProps {
+  onContinueClick?: () => unknown
+  onCancelClick?: () => unknown
+  parentUrl?: string
+  cancelText: string
+  continueText: string
+  removeTrash?: boolean
+  children?: React.ReactNode
+}
 
 const HEADING = 'Before continuing, please remove:'
 
 export function ClearDeckAlertModal(
   props: ClearDeckAlertModalProps
-): React.Node {
+): JSX.Element {
   const {
     onContinueClick,
     onCancelClick,
@@ -36,7 +35,6 @@ export function ClearDeckAlertModal(
       <AlertModal
         heading={HEADING}
         buttons={[
-          /* $FlowFixMe(mc, 2021-03-18): resolve with TS conversion or replacement of AlertModal */
           {
             children: `${cancelText}`,
             onClick: onCancelClick,
diff --git a/app/src/organisms/ChangePipette/ConfirmPipette.tsx b/app/src/organisms/ChangePipette/ConfirmPipette.tsx
index 284030e1ed3..b8c73dc0d94 100644
--- a/app/src/organisms/ChangePipette/ConfirmPipette.tsx
+++ b/app/src/organisms/ChangePipette/ConfirmPipette.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import cx from 'classnames'
 
@@ -20,25 +19,25 @@ const EXIT_BUTTON_MESSAGE_WRONG = 'keep pipette and exit setup'
 const EXIT_WITHOUT_CAL = 'exit without calibrating'
 const CONTINUE_TO_PIP_OFFSET = 'continue to pipette offset calibration'
 
-export type Props = {|
-  robotName: string,
-  mount: Mount,
-  title: string,
-  subtitle: string,
-  success: boolean,
-  attachedWrong: boolean,
-  wantedPipette: PipetteNameSpecs | null,
-  actualPipette: PipetteModelSpecs | null,
-  actualPipetteOffset: PipetteOffsetCalibration | null,
-  displayName: string,
-  displayCategory: PipetteDisplayCategory | null,
-  tryAgain: () => mixed,
-  back: () => mixed,
-  exit: () => mixed,
-  startPipetteOffsetCalibration: () => void,
-|}
-
-export function ConfirmPipette(props: Props): React.Node {
+export interface Props {
+  robotName: string
+  mount: Mount
+  title: string
+  subtitle: string
+  success: boolean
+  attachedWrong: boolean
+  wantedPipette: PipetteNameSpecs | null
+  actualPipette: PipetteModelSpecs | null
+  actualPipetteOffset: PipetteOffsetCalibration | null
+  displayName: string
+  displayCategory: PipetteDisplayCategory | null
+  tryAgain: () => unknown
+  back: () => unknown
+  exit: () => unknown
+  startPipetteOffsetCalibration: () => void
+}
+
+export function ConfirmPipette(props: Props): JSX.Element {
   const {
     title,
     subtitle,
@@ -69,7 +68,7 @@ export function ConfirmPipette(props: Props): React.Node {
   )
 }
 
-function Status(props: Props) {
+function Status(props: Props): JSX.Element {
   const { displayName, wantedPipette, attachedWrong, success } = props
   const iconName = success ? 'check-circle' : 'close-circle'
   const iconClass = cx(styles.confirm_icon, {
@@ -97,7 +96,7 @@ function Status(props: Props) {
   )
 }
 
-function StatusDetails(props: Props) {
+function StatusDetails(props: Props): JSX.Element | null {
   const {
     mount,
     displayCategory,
@@ -151,7 +150,7 @@ function StatusDetails(props: Props) {
   return null
 }
 
-function AttachAnotherButton(props: Props) {
+function AttachAnotherButton(props: Props): JSX.Element {
   return (
     <PrimaryBtn marginBottom={SPACING_2} width="100%" onClick={props.back}>
       attach another pipette
@@ -159,7 +158,7 @@ function AttachAnotherButton(props: Props) {
   )
 }
 
-function CalibratePipetteOffsetButton(props: Props) {
+function CalibratePipetteOffsetButton(props: Props): JSX.Element {
   return (
     <PrimaryBtn
       marginBottom={SPACING_2}
@@ -171,7 +170,7 @@ function CalibratePipetteOffsetButton(props: Props) {
   )
 }
 
-function TryAgainButton(props: Props) {
+function TryAgainButton(props: Props): JSX.Element {
   const {
     robotName,
     attachedWrong,
@@ -211,7 +210,7 @@ const exitButtonMessage: (props: Props) => string = props => {
   return EXIT_BUTTON_MESSAGE
 }
 
-function ExitButton(props: Props) {
+function ExitButton(props: Props): JSX.Element {
   const { exit } = props
   const buttonText = exitButtonMessage(props)
 
diff --git a/app/src/organisms/ChangePipette/ExitAlertModal.tsx b/app/src/organisms/ChangePipette/ExitAlertModal.tsx
index 7264b7aa529..e1abaeae289 100644
--- a/app/src/organisms/ChangePipette/ExitAlertModal.tsx
+++ b/app/src/organisms/ChangePipette/ExitAlertModal.tsx
@@ -1,13 +1,12 @@
-// @flow
 import * as React from 'react'
 
 import { AlertModal } from '@opentrons/components'
 import { Portal } from '../../App/portal'
 
-type Props = {|
-  back: () => mixed,
-  exit: () => mixed,
-|}
+interface Props {
+  back: () => unknown
+  exit: () => unknown
+}
 
 // TODO(mc, 2019-12-18): i18n
 const ARE_YOU_SURE_YOU_WANT_TO_GO_BACK = 'Are you sure you want to go back?'
@@ -16,7 +15,7 @@ const EXITING_WILL_END_PIPETTE_SETUP =
 const CANCEL = 'cancel'
 const EXIT = 'exit'
 
-export function ExitAlertModal(props: Props): React.Node {
+export function ExitAlertModal(props: Props): JSX.Element {
   const { back, exit } = props
 
   return (
diff --git a/app/src/organisms/ChangePipette/InstructionStep.tsx b/app/src/organisms/ChangePipette/InstructionStep.tsx
index 14c6cda0a08..63866d85665 100644
--- a/app/src/organisms/ChangePipette/InstructionStep.tsx
+++ b/app/src/organisms/ChangePipette/InstructionStep.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 
 import type {
@@ -13,19 +12,18 @@ import styles from './styles.css'
 
 type Diagram = 'screws' | 'tab'
 
-type DiagramProps = {|
-  direction: Direction,
-  mount: Mount,
-  channels: PipetteChannels,
-  diagram: Diagram,
-  displayCategory: PipetteDisplayCategory | null,
-|}
+interface DiagramProps {
+  direction: Direction
+  mount: Mount
+  channels: PipetteChannels
+  diagram: Diagram
+  displayCategory: PipetteDisplayCategory | null
+}
 
-type Props = {|
-  ...DiagramProps,
-  step: 'one' | 'two',
-  children: React.Node,
-|}
+interface Props extends DiagramProps {
+  step: 'one' | 'two'
+  children: React.ReactNode
+}
 
 export function getDiagramsSrc(props: DiagramProps): string {
   const { channels, displayCategory, direction, mount, diagram } = props
@@ -36,7 +34,7 @@ export function getDiagramsSrc(props: DiagramProps): string {
     : require(`../../assets/images/change-pip/${direction}-${mount}-${channelsKey}-${diagram}@3x.png`)
 }
 
-export function InstructionStep(props: Props): React.Node {
+export function InstructionStep(props: Props): JSX.Element {
   const { step, children, ...diagramProps } = props
 
   return (
diff --git a/app/src/organisms/ChangePipette/Instructions.tsx b/app/src/organisms/ChangePipette/Instructions.tsx
index 2ac6a532525..d9f3fec0b8a 100644
--- a/app/src/organisms/ChangePipette/Instructions.tsx
+++ b/app/src/organisms/ChangePipette/Instructions.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import capitalize from 'lodash/capitalize'
 
@@ -21,22 +20,22 @@ const ATTACH_CONFIRM = 'have robot check connection'
 const DETACH_CONFIRM = 'confirm pipette is detached'
 const EXIT = 'exit'
 
-type Props = {|
-  title: string,
-  subtitle: string,
-  robotName: string,
-  mount: Mount,
-  wantedPipette: PipetteNameSpecs | null,
-  actualPipette: PipetteModelSpecs | null,
-  displayName: string,
-  displayCategory: PipetteDisplayCategory | null,
-  direction: Direction,
-  setWantedName: (name: string | null) => mixed,
-  confirm: () => mixed,
-  exit: () => mixed,
-|}
+interface Props {
+  title: string
+  subtitle: string
+  robotName: string
+  mount: Mount
+  wantedPipette: PipetteNameSpecs | null
+  actualPipette: PipetteModelSpecs | null
+  displayName: string
+  displayCategory: PipetteDisplayCategory | null
+  direction: Direction
+  setWantedName: (name: string | null) => unknown
+  confirm: () => unknown
+  exit: () => unknown
+}
 
-export function Instructions(props: Props): React.Node {
+export function Instructions(props: Props): JSX.Element {
   const {
     title,
     subtitle,
@@ -81,7 +80,7 @@ export function Instructions(props: Props): React.Node {
   )
 }
 
-function Steps(props: Props) {
+function Steps(props: Props): JSX.Element {
   const {
     direction,
     mount,
diff --git a/app/src/organisms/ChangePipette/LevelPipette.tsx b/app/src/organisms/ChangePipette/LevelPipette.tsx
index a7f58a2ca5c..c8a12a2b4e0 100644
--- a/app/src/organisms/ChangePipette/LevelPipette.tsx
+++ b/app/src/organisms/ChangePipette/LevelPipette.tsx
@@ -1,5 +1,3 @@
-// @flow
-
 import * as React from 'react'
 import cx from 'classnames'
 
@@ -25,26 +23,28 @@ import type { PipetteOffsetCalibration } from '../../redux/calibration/types'
 const EXIT_BUTTON_MESSAGE = 'confirm pipette is leveled'
 const EXIT_WITHOUT_CAL = 'exit without calibrating'
 const CONTINUE_TO_PIP_OFFSET = 'continue to pipette offset calibration'
-const LEVEL_MESSAGE = (displayName: string) => `Next, level the ${displayName}`
-const CONNECTED_MESSAGE = (displayName: string) => `${displayName} connected`
+const LEVEL_MESSAGE = (displayName: string): string =>
+  `Next, level the ${displayName}`
+const CONNECTED_MESSAGE = (displayName: string): string =>
+  `${displayName} connected`
 
-type Props = {|
-  robotName: string,
-  mount: Mount,
-  title: string,
-  subtitle: string,
-  wantedPipette: PipetteNameSpecs | null,
-  actualPipette: PipetteModelSpecs | null,
-  actualPipetteOffset: PipetteOffsetCalibration | null,
-  displayName: string,
-  displayCategory: PipetteDisplayCategory | null,
-  pipetteModelName: string,
-  back: () => mixed,
-  exit: () => mixed,
-  startPipetteOffsetCalibration: () => void,
-|}
+interface Props {
+  robotName: string
+  mount: Mount
+  title: string
+  subtitle: string
+  wantedPipette: PipetteNameSpecs | null
+  actualPipette: PipetteModelSpecs | null
+  actualPipetteOffset: PipetteOffsetCalibration | null
+  displayName: string
+  displayCategory: PipetteDisplayCategory | null
+  pipetteModelName: string
+  back: () => unknown
+  exit: () => unknown
+  startPipetteOffsetCalibration: () => void
+}
 
-function Status(props: { displayName: string }) {
+function Status(props: { displayName: string }): JSX.Element {
   const iconName = 'check-circle'
   const iconClass = cx(styles.confirm_icon, {
     [styles.success]: true,
@@ -59,7 +59,7 @@ function Status(props: { displayName: string }) {
   )
 }
 
-function LevelingInstruction(props: { displayName: string }) {
+function LevelingInstruction(props: { displayName: string }): JSX.Element {
   return (
     <div className={styles.leveling_instruction}>
       {LEVEL_MESSAGE(props.displayName)}
@@ -67,7 +67,10 @@ function LevelingInstruction(props: { displayName: string }) {
   )
 }
 
-function LevelingVideo(props: { pipetteName: string, mount: Mount }) {
+function LevelingVideo(props: {
+  pipetteName: string
+  mount: Mount
+}): JSX.Element {
   const { pipetteName, mount } = props
   return (
     <div className={styles.leveling_video_wrapper}>
@@ -85,7 +88,7 @@ function LevelingVideo(props: { pipetteName: string, mount: Mount }) {
   )
 }
 
-export function LevelPipette(props: Props): React.Node {
+export function LevelPipette(props: Props): JSX.Element {
   const {
     title,
     subtitle,
diff --git a/app/src/organisms/ChangePipette/PipetteSelection.tsx b/app/src/organisms/ChangePipette/PipetteSelection.tsx
index 7a7bd9015ef..f005187a98f 100644
--- a/app/src/organisms/ChangePipette/PipetteSelection.tsx
+++ b/app/src/organisms/ChangePipette/PipetteSelection.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 
 import { PipetteSelect } from '@opentrons/components'
@@ -6,11 +5,9 @@ import styles from './styles.css'
 
 const LABEL = 'Select the pipette you wish to attach:'
 
-export type PipetteSelectionProps = {
-  ...React.ElementProps<typeof PipetteSelect>,
-}
+export type PipetteSelectionProps = React.ComponentProps<typeof PipetteSelect>
 
-export function PipetteSelection(props: PipetteSelectionProps): React.Node {
+export function PipetteSelection(props: PipetteSelectionProps): JSX.Element {
   return (
     <label className={styles.pipette_selection}>
       <span className={styles.pipette_selection_label}>{LABEL}</span>
diff --git a/app/src/organisms/ChangePipette/RequestInProgressModal.tsx b/app/src/organisms/ChangePipette/RequestInProgressModal.tsx
index 34924a6ad7a..dea90ff0c91 100644
--- a/app/src/organisms/ChangePipette/RequestInProgressModal.tsx
+++ b/app/src/organisms/ChangePipette/RequestInProgressModal.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 
 import { HOMING, MOVING } from '../../redux/robot-controls'
@@ -16,15 +15,15 @@ const TO_FRONT_AND_RIGHT = 'to front and right'
 const UP = 'up'
 const ROBOT_IS_HOMING = 'Robot is homing'
 
-type Props = {|
-  title: string,
-  subtitle: string,
-  mount: Mount,
-  movementStatus: MovementStatus,
-  isPipetteHoming: boolean,
-|}
+interface Props {
+  title: string
+  subtitle: string
+  mount: Mount
+  movementStatus: MovementStatus
+  isPipetteHoming: boolean
+}
 
-export function RequestInProgressModal(props: Props): React.Node {
+export function RequestInProgressModal(props: Props): JSX.Element {
   const { title, subtitle, mount, movementStatus, isPipetteHoming } = props
   let message = `${mount === RIGHT ? RIGHT_PIP : LEFT_PIP} ${CARRIAGE_MOVING}`
 
diff --git a/app/src/organisms/ChangePipette/__tests__/ConfirmPipette.test.tsx b/app/src/organisms/ChangePipette/__tests__/ConfirmPipette.test.tsx
index 065f6a7d719..95eccac2a2f 100644
--- a/app/src/organisms/ChangePipette/__tests__/ConfirmPipette.test.tsx
+++ b/app/src/organisms/ChangePipette/__tests__/ConfirmPipette.test.tsx
@@ -1,12 +1,14 @@
-// @flow
-
 import * as React from 'react'
-import { mountWithStore } from '@opentrons/components/__utils__'
+import {
+  mountWithStore,
+  WrapperWithStore,
+} from '@opentrons/components/__utils__'
 
 import { ConfirmPipette } from '../ConfirmPipette'
 import { CheckPipettesButton } from '../CheckPipettesButton'
 import { TitleBar, Icon } from '@opentrons/components'
 
+import type { Action, State } from '../../../redux/types'
 import type { PipetteOffsetCalibration } from '../../../redux/calibration/types'
 import type { Props } from '../ConfirmPipette'
 import type {
@@ -22,7 +24,13 @@ describe('ConfirmPipette', () => {
   beforeEach(() => {
     jest.resetAllMocks()
   })
-  const render = (props: $Shape<Props>) => {
+  const render = (
+    props: Partial<Props>
+  ): WrapperWithStore<
+    React.ComponentProps<typeof ConfirmPipette>,
+    State,
+    Action
+  > => {
     const {
       robotName = 'robot-name',
       mount = 'left',
@@ -30,16 +38,20 @@ describe('ConfirmPipette', () => {
       subtitle = 'my-subtitle',
       success = true,
       attachedWrong = false,
-      wantedPipette = ({
+      wantedPipette = {
         displayName: 'wanted-display-name',
         channels: 1,
-      }: $Shape<PipetteNameSpecs>),
-      actualPipette = ({}: $Shape<PipetteModelSpecs>),
-      actualPipetteOffset = ({}: $Shape<PipetteOffsetCalibration>),
+      } as PipetteNameSpecs,
+      actualPipette = {} as PipetteModelSpecs,
+      actualPipetteOffset = {} as PipetteOffsetCalibration,
       displayName = 'actual-display-name',
       displayCategory = 'GEN2',
     } = props
-    return mountWithStore(
+    return mountWithStore<
+      React.ComponentProps<typeof ConfirmPipette>,
+      State,
+      Action
+    >(
       <ConfirmPipette
         robotName={robotName}
         mount={mount}
@@ -57,7 +69,7 @@ describe('ConfirmPipette', () => {
         tryAgain={mockTryAgain}
         startPipetteOffsetCalibration={mockStartPipetteOffsetCalibration}
       />,
-      { initialState: { robotApi: {} } }
+      { initialState: { robotApi: {} } } as any
     )
   }
 
@@ -65,11 +77,11 @@ describe('ConfirmPipette', () => {
     {
       success: true,
       attachedWrong: false,
-      wantedPipette: ({
+      wantedPipette: {
         displayName: 'wanted',
         channels: 1,
-      }: $Shape<PipetteNameSpecs>),
-      actualPipette: ({}: $Shape<PipetteModelSpecs>),
+      } as Partial<PipetteNameSpecs>,
+      actualPipette: {} as Partial<PipetteModelSpecs>,
       actualPipetteOffset: null,
       backDisabled: true,
       iconName: 'check-circle',
@@ -83,12 +95,12 @@ describe('ConfirmPipette', () => {
     {
       success: true,
       attachedWrong: false,
-      wantedPipette: ({
+      wantedPipette: {
         displayName: 'wanted',
         channels: 1,
-      }: $Shape<PipetteNameSpecs>),
-      actualPipette: ({}: $Shape<PipetteModelSpecs>),
-      actualPipetteOffset: ({}: $Shape<PipetteOffsetCalibration>),
+      } as Partial<PipetteNameSpecs>,
+      actualPipette: {} as Partial<PipetteModelSpecs>,
+      actualPipetteOffset: {} as Partial<PipetteOffsetCalibration>,
       backDisabled: true,
       iconName: 'check-circle',
       continueMatch: null,
@@ -117,8 +129,8 @@ describe('ConfirmPipette', () => {
       success: false,
       attachedWrong: false,
       wantedPipette: null,
-      actualPipette: ({}: $Shape<PipetteModelSpecs>),
-      actualPipetteOffset: ({}: $Shape<PipetteOffsetCalibration>),
+      actualPipette: {} as Partial<PipetteModelSpecs>,
+      actualPipetteOffset: {} as Partial<PipetteOffsetCalibration>,
       backDisabled: false,
       iconName: 'close-circle',
       continueMatch: /confirm pipette is detached/,
@@ -131,11 +143,11 @@ describe('ConfirmPipette', () => {
     {
       success: false,
       attachedWrong: true,
-      wantedPipette: ({
+      wantedPipette: {
         displayName: 'my-display-name',
         channels: 1,
-      }: $Shape<PipetteNameSpecs>),
-      actualPipette: ({}: $Shape<PipetteModelSpecs>),
+      } as Partial<PipetteNameSpecs>,
+      actualPipette: {} as Partial<PipetteModelSpecs>,
       actualPipetteOffset: null,
       backDisabled: true,
       iconName: 'close-circle',
@@ -149,12 +161,12 @@ describe('ConfirmPipette', () => {
     {
       success: false,
       attachedWrong: true,
-      wantedPipette: ({
+      wantedPipette: {
         displayName: 'my-display-name',
         channels: 1,
-      }: $Shape<PipetteNameSpecs>),
-      actualPipette: ({}: $Shape<PipetteModelSpecs>),
-      actualPipetteOffset: ({}: $Shape<PipetteOffsetCalibration>),
+      } as Partial<PipetteNameSpecs>,
+      actualPipette: {} as Partial<PipetteModelSpecs>,
+      actualPipetteOffset: {} as Partial<PipetteOffsetCalibration>,
       backDisabled: true,
       iconName: 'close-circle',
       continueMatch: /detach and try again/,
@@ -171,16 +183,16 @@ describe('ConfirmPipette', () => {
       const { wrapper } = render({
         success: spec.success,
         attachedWrong: spec.attachedWrong,
-        wantedPipette: spec.wantedPipette,
-        actualPipette: spec.actualPipette,
-        actualPipetteOffset: spec.actualPipetteOffset,
+        wantedPipette: spec.wantedPipette as PipetteNameSpecs,
+        actualPipette: spec.actualPipette as PipetteModelSpecs,
+        actualPipetteOffset: spec.actualPipetteOffset as PipetteOffsetCalibration,
       })
       it('has the right title bar including back button disabled or not', () => {
         const titleBarProps = wrapper.find(TitleBar).props()
         expect(titleBarProps.title).toEqual('my-title')
         expect(titleBarProps.subtitle).toEqual('my-subtitle')
-        expect(titleBarProps.back.onClick).toBe(mockBack)
-        expect(titleBarProps.back.disabled).toEqual(spec.backDisabled)
+        expect(titleBarProps.back?.onClick).toBe(mockBack)
+        expect(titleBarProps.back?.disabled).toEqual(spec.backDisabled)
       })
       it('displays the right exit button text', () => {
         const exitButton = wrapper.findWhere(
diff --git a/app/src/organisms/ChangePipette/constants.ts b/app/src/organisms/ChangePipette/constants.ts
index f8fa8f1ceee..eb177ddd234 100644
--- a/app/src/organisms/ChangePipette/constants.ts
+++ b/app/src/organisms/ChangePipette/constants.ts
@@ -1,5 +1,3 @@
-// @flow
-
 export const ATTACH: 'attach' = 'attach'
 export const DETACH: 'detach' = 'detach'
 
diff --git a/app/src/organisms/ChangePipette/index.tsx b/app/src/organisms/ChangePipette/index.tsx
index b4d375e280c..6d09ef34248 100644
--- a/app/src/organisms/ChangePipette/index.tsx
+++ b/app/src/organisms/ChangePipette/index.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { useSelector, useDispatch } from 'react-redux'
 import { getPipetteNameSpecs, shouldLevel } from '@opentrons/shared-data'
@@ -47,11 +46,11 @@ import type { State, Dispatch } from '../../redux/types'
 import type { Mount } from '../../redux/robot/types'
 import type { WizardStep } from './types'
 
-type Props = {|
-  robotName: string,
-  mount: Mount,
-  closeModal: () => mixed,
-|}
+interface Props {
+  robotName: string
+  mount: Mount
+  closeModal: () => unknown
+}
 
 // TODO(mc, 2019-12-18): i18n
 const PIPETTE_SETUP = 'Pipette Setup'
@@ -60,22 +59,24 @@ const CANCEL = 'Cancel'
 const MOUNT = 'mount'
 const PIPETTE_OFFSET_CALIBRATION = 'pipette offset calibration'
 
-export function ChangePipette(props: Props): React.Node {
+export function ChangePipette(props: Props): JSX.Element | null {
   const { robotName, mount, closeModal } = props
   const dispatch = useDispatch<Dispatch>()
-  const finalRequestId = React.useRef<string | null>(null)
+  const finalRequestId = React.useRef<string | null | undefined>(null)
   const [dispatchApiRequests] = useDispatchApiRequests(dispatchedAction => {
     if (
       dispatchedAction.type === HOME &&
       dispatchedAction.payload.target === PIPETTE
     ) {
       // track final home pipette request, its success closes modal
+      // @ts-expect-error(sa, 2021-05-27): avoiding src code change, use in operator to type narrow
       finalRequestId.current = dispatchedAction.meta.requestId
     }
   })
   const [wizardStep, setWizardStep] = React.useState<WizardStep>(CLEAR_DECK)
   const [wantedName, setWantedName] = React.useState<string | null>(null)
   const [confirmExit, setConfirmExit] = React.useState(false)
+  // @ts-expect-error(sa, 2021-05-27): avoiding src code change, use in operator to type narrow
   const wantedPipette = wantedName ? getPipetteNameSpecs(wantedName) : null
   const attachedPipette = useSelector(
     (state: State) => getAttachedPipettes(state, robotName)[mount]
@@ -120,7 +121,7 @@ export function ChangePipette(props: Props): React.Node {
 
   const startPipetteOffsetWizard = (
     hasBlockModalResponse: boolean | null = null
-  ) => {
+  ): void => {
     if (hasBlockModalResponse === null && configHasCalibrationBlock === null) {
       setShowCalBlockModal(true)
     } else {
@@ -212,7 +213,7 @@ export function ChangePipette(props: Props): React.Node {
 
     const attachedWrong = Boolean(!success && wantedPipette && actualPipette)
 
-    const launchPOC = () => {
+    const launchPOC = (): void => {
       // home before cal flow to account for skips when attaching pipette
       setWizardStep(CALIBRATE_PIPETTE)
       dispatchApiRequests(home(robotName, ROBOT))
diff --git a/app/src/organisms/ChangePipette/types.ts b/app/src/organisms/ChangePipette/types.ts
index 29ddcc19cb8..3a72632b26e 100644
--- a/app/src/organisms/ChangePipette/types.ts
+++ b/app/src/organisms/ChangePipette/types.ts
@@ -1,5 +1,3 @@
-// @flow
-
 export type Direction = 'attach' | 'detach'
 
 export type WizardStep =
diff --git a/app/src/organisms/CheckCalibration/ConfirmExitModal.tsx b/app/src/organisms/CheckCalibration/ConfirmExitModal.tsx
index ef4bc7cfc36..e5effc40c9c 100644
--- a/app/src/organisms/CheckCalibration/ConfirmExitModal.tsx
+++ b/app/src/organisms/CheckCalibration/ConfirmExitModal.tsx
@@ -1,12 +1,11 @@
-// @flow
 import * as React from 'react'
 
 import { AlertModal } from '@opentrons/components'
 
-export type ConfirmExitModalProps = {|
-  back: () => mixed,
-  exit: () => mixed,
-|}
+export interface ConfirmExitModalProps {
+  back: () => unknown
+  exit: () => unknown
+}
 
 const HEADING = 'Are you sure you want to exit?'
 const GO_BACK = 'go back'
@@ -14,7 +13,7 @@ const EXIT = 'continue'
 const WARNING =
   'Doing so will take you to the summary page and prompt you to drop the tip.'
 
-export function ConfirmExitModal(props: ConfirmExitModalProps): React.Node {
+export function ConfirmExitModal(props: ConfirmExitModalProps): JSX.Element {
   const { back, exit } = props
 
   return (
diff --git a/app/src/organisms/CheckCalibration/ResultsSummary.tsx b/app/src/organisms/CheckCalibration/ResultsSummary.tsx
index 8198babee21..ee44b3eba36 100644
--- a/app/src/organisms/CheckCalibration/ResultsSummary.tsx
+++ b/app/src/organisms/CheckCalibration/ResultsSummary.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import {
   Icon,
@@ -39,6 +38,7 @@ import find from 'lodash/find'
 import { PIPETTE_MOUNTS, LEFT, RIGHT } from '../../redux/pipettes'
 import { saveAs } from 'file-saver'
 
+import type { Mount } from '../../redux/pipettes/types'
 import type { CalibrationPanelProps } from '../../organisms/CalibrationPanels/types'
 import {
   CHECK_STATUS_OUTSIDE_THRESHOLD,
@@ -76,7 +76,9 @@ const DECK_INVALIDATES =
   'Recalibrating your deck will invalidate Pipette Offsets, and you will need to recalibrate Pipette Offsets after redoing Deck Calibration.'
 const NO_PIPETTE = 'No pipette attached'
 
-export function ResultsSummary(props: CalibrationPanelProps): React.Node {
+export function ResultsSummary(
+  props: CalibrationPanelProps
+): JSX.Element | null {
   const {
     comparisonsByPipette,
     instruments,
@@ -88,7 +90,7 @@ export function ResultsSummary(props: CalibrationPanelProps): React.Node {
     return null
   }
 
-  const handleDownloadButtonClick = () => {
+  const handleDownloadButtonClick = (): void => {
     const now = new Date()
     const report = {
       comparisonsByPipette,
@@ -109,8 +111,13 @@ export function ResultsSummary(props: CalibrationPanelProps): React.Node {
     instruments,
     (p: CalibrationCheckInstrument) => p.mount.toLowerCase() === RIGHT
   )
-
-  const calibrationsByMount = {
+  type CalibrationByMount = {
+    [m in Mount]: {
+      pipette: CalibrationCheckInstrument | undefined
+      calibration: CalibrationCheckComparisonsPerCalibration | null
+    }
+  }
+  const calibrationsByMount: CalibrationByMount = {
     left: {
       pipette: leftPipette,
       calibration: leftPipette
@@ -130,7 +137,9 @@ export function ResultsSummary(props: CalibrationPanelProps): React.Node {
     : comparisonsByPipette.first.deck?.status
   const deckCalibrationResult = getDeckCalibration ?? null
 
-  const pipetteResultsBad = perPipette => ({
+  const pipetteResultsBad = (
+    perPipette: CalibrationCheckComparisonsPerCalibration | null
+  ): { offsetBad: boolean; tipLengthBad: boolean } => ({
     offsetBad: perPipette?.pipetteOffset?.status
       ? perPipette.pipetteOffset.status === CHECK_STATUS_OUTSIDE_THRESHOLD
       : false,
@@ -205,9 +214,12 @@ export function ResultsSummary(props: CalibrationPanelProps): React.Node {
             >
               {calibrationsByMount[m].pipette &&
               calibrationsByMount[m].calibration &&
+              // @ts-expect-error TODO: ts can't narrow that this isn't nullish
               Object.entries(calibrationsByMount[m].calibration).length ? (
                 <PipetteResult
+                  // @ts-expect-error TODO: ts can't narrow that this isn't nullish
                   pipetteInfo={calibrationsByMount[m].pipette}
+                  // @ts-expect-error TODO: ts can't narrow that this isn't nullish
                   pipetteCalibration={calibrationsByMount[m].calibration}
                 />
               ) : (
@@ -251,11 +263,11 @@ export function ResultsSummary(props: CalibrationPanelProps): React.Node {
   )
 }
 
-type RenderResultProps = {|
-  status: string | null,
-|}
+interface RenderResultProps {
+  status: string | null
+}
 
-function RenderResult(props: RenderResultProps): React.Node {
+function RenderResult(props: RenderResultProps): JSX.Element | null {
   const { status } = props
   if (!status) {
     return null
@@ -278,12 +290,12 @@ function RenderResult(props: RenderResultProps): React.Node {
   }
 }
 
-type PipetteResultProps = {|
-  pipetteInfo: CalibrationCheckInstrument,
-  pipetteCalibration: CalibrationCheckComparisonsPerCalibration,
-|}
+interface PipetteResultProps {
+  pipetteInfo: CalibrationCheckInstrument
+  pipetteCalibration: CalibrationCheckComparisonsPerCalibration
+}
 
-function PipetteResult(props: PipetteResultProps): React.Node {
+function PipetteResult(props: PipetteResultProps): JSX.Element {
   const { pipetteInfo, pipetteCalibration } = props
   const displayName =
     getPipetteModelSpecs(pipetteInfo.model)?.displayName || pipetteInfo.model
@@ -324,13 +336,13 @@ function PipetteResult(props: PipetteResultProps): React.Node {
   )
 }
 
-function WarningText(props: {|
-  deckCalibrationBad: boolean,
-  pipettes: {|
-    left: {| offsetBad: boolean, tipLengthBad: boolean |},
-    right: {| offsetBad: boolean, tipLengthBad: boolean |},
-  |},
-|}): React.Node | null {
+function WarningText(props: {
+  deckCalibrationBad: boolean
+  pipettes: {
+    left: { offsetBad: boolean; tipLengthBad: boolean }
+    right: { offsetBad: boolean; tipLengthBad: boolean }
+  }
+}): JSX.Element | null {
   const badCount = [
     props.deckCalibrationBad,
     props.pipettes.left.offsetBad,
diff --git a/app/src/organisms/CheckCalibration/ReturnTip.tsx b/app/src/organisms/CheckCalibration/ReturnTip.tsx
index b284e624bf9..53feac0bfd0 100644
--- a/app/src/organisms/CheckCalibration/ReturnTip.tsx
+++ b/app/src/organisms/CheckCalibration/ReturnTip.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import {
   Flex,
@@ -13,6 +12,7 @@ import uniq from 'lodash/uniq'
 
 import * as Sessions from '../../redux/sessions'
 import type { CalibrationPanelProps } from '../../organisms/CalibrationPanels/types'
+import type { SessionCommandString } from '../../redux/sessions/types'
 
 const CONFIRM_RETURN_BODY = 'Return tip and '
 const CONTINUE_TO_NEXT = 'continue to next pipette'
@@ -20,12 +20,14 @@ const EXIT_PROGRAM = 'see calibration health check results'
 const CONTINUE = 'continue to the next tiprack'
 const EXIT = 'continue to the result summary'
 
-export function ReturnTip(props: CalibrationPanelProps): React.Node {
+export function ReturnTip(props: CalibrationPanelProps): JSX.Element {
   const { sendCommands, checkBothPipettes, activePipette, instruments } = props
   const onFinalPipette =
     !checkBothPipettes ||
     activePipette?.rank === Sessions.CHECK_PIPETTE_RANK_SECOND
-  let commandsList = [{ command: Sessions.checkCommands.RETURN_TIP }]
+  let commandsList: Array<{ command: SessionCommandString }> = [
+    { command: Sessions.checkCommands.RETURN_TIP },
+  ]
   if (onFinalPipette) {
     commandsList = [
       ...commandsList,
@@ -48,7 +50,7 @@ export function ReturnTip(props: CalibrationPanelProps): React.Node {
     }
   }
 
-  const confirmReturnTip = () => {
+  const confirmReturnTip = (): void => {
     sendCommands(...commandsList)
   }
   return (
diff --git a/app/src/organisms/CheckCalibration/ThresholdValue.tsx b/app/src/organisms/CheckCalibration/ThresholdValue.tsx
index 508b0c2bf7c..4ff957fbb47 100644
--- a/app/src/organisms/CheckCalibration/ThresholdValue.tsx
+++ b/app/src/organisms/CheckCalibration/ThresholdValue.tsx
@@ -1,12 +1,12 @@
-// @flow
 import * as React from 'react'
 
-type Props = {|
-  thresholdVector: [number, number, number],
-|}
+interface Props {
+  thresholdVector: [number, number, number]
+}
 
-export function ThresholdValue(props: Props): React.Node {
+export function ThresholdValue(props: Props): JSX.Element {
   const value = props.thresholdVector.find(axis => axis > 0)
+  // @ts-expect-error(sa, 2021-05-27): avoiding src code change, cast to value to string
   const formattedValue = parseFloat(value).toFixed(1)
   return <span>{`±${formattedValue} mm`}</span>
 }
diff --git a/app/src/organisms/CheckCalibration/__tests__/CheckCalibration.test.tsx b/app/src/organisms/CheckCalibration/__tests__/CheckCalibration.test.tsx
index de96f983a80..b0a088c596a 100644
--- a/app/src/organisms/CheckCalibration/__tests__/CheckCalibration.test.tsx
+++ b/app/src/organisms/CheckCalibration/__tests__/CheckCalibration.test.tsx
@@ -1,11 +1,9 @@
-// @flow
 import * as React from 'react'
 import { Provider } from 'react-redux'
 import { mount } from 'enzyme'
 import { act } from 'react-dom/test-utils'
 
 import * as Sessions from '../../../redux/sessions'
-// $FlowFixMe(mc, 2021-03.15): ignore until TS conversion
 import { getDeckDefinitions } from '@opentrons/components/src/deck/getDeckDefinitions'
 
 import { CheckCalibration } from '../index'
@@ -22,34 +20,36 @@ import {
 
 import { mockCalibrationCheckSessionAttributes } from '../../../redux/sessions/__fixtures__'
 
+import type { ReactWrapper } from 'enzyme'
+import type { Dispatch } from '../../../redux/types'
 import type { RobotCalibrationCheckStep } from '../../../redux/sessions/types'
 
 jest.mock('@opentrons/components/src/deck/getDeckDefinitions')
 jest.mock('../../../redux/calibration/selectors')
 
-type CheckCalibrationSpec = {
-  component: React.AbstractComponent<any>,
-  childProps?: {},
-  currentStep: RobotCalibrationCheckStep,
-  ...
+interface CheckCalibrationSpec {
+  component: React.ComponentType<any>
+  currentStep: RobotCalibrationCheckStep
 }
 
-const mockGetDeckDefinitions: JestMockFn<
-  [],
-  $Call<typeof getDeckDefinitions, any>
-> = getDeckDefinitions
+const mockGetDeckDefinitions = getDeckDefinitions as jest.MockedFunction<
+  typeof getDeckDefinitions
+>
 
 describe('CheckCalibration', () => {
-  let mockStore
-  let render
-  let dispatch
-  let dispatchRequests
+  let mockStore: any
+  let render: (
+    props?: Partial<React.ComponentProps<typeof CheckCalibration>>
+  ) => ReactWrapper<React.ComponentProps<typeof CheckCalibration>>
+  let dispatch: jest.MockedFunction<Dispatch>
+  let dispatchRequests: jest.MockedFunction<any>
   let mockCalibrationCheckSession: Sessions.CalibrationCheckSession = {
     id: 'fake_check_session_id',
     ...mockCalibrationCheckSessionAttributes,
   }
-  const getExitButton = wrapper =>
-    wrapper.find({ title: 'exit' }).find('button')
+  const getExitButton = (
+    wrapper: ReactWrapper<React.ComponentProps<typeof CheckCalibration>>
+  ) => wrapper.find({ title: 'exit' }).find('button')
 
   const POSSIBLE_CHILDREN = [
     Introduction,
@@ -61,7 +61,7 @@ describe('CheckCalibration', () => {
     ResultsSummary,
   ]
 
-  const SPECS: Array<CheckCalibrationSpec> = [
+  const SPECS: CheckCalibrationSpec[] = [
     { component: Introduction, currentStep: 'sessionStarted' },
     { component: DeckSetup, currentStep: 'labwareLoaded' },
     { component: TipPickUp, currentStep: 'preparingPipette' },
@@ -91,7 +91,9 @@ describe('CheckCalibration', () => {
     }
     dispatchRequests = jest.fn()
 
-    render = (props = {}) => {
+    render = (
+      props: Partial<React.ComponentProps<typeof CheckCalibration>> = {}
+    ) => {
       const { showSpinner = false, isJogging = false } = props
       return mount(
         <CheckCalibration
@@ -122,7 +124,7 @@ describe('CheckCalibration', () => {
           ...mockCalibrationCheckSession.details,
           currentStep: spec.currentStep,
         },
-      }
+      } as any
       const wrapper = render()
       POSSIBLE_CHILDREN.forEach(child => {
         if (child === spec.component) {
@@ -138,7 +140,9 @@ describe('CheckCalibration', () => {
     const wrapper = render()
 
     expect(wrapper.find('ConfirmExitModal').exists()).toBe(false)
-    act(() => getExitButton(wrapper).invoke('onClick')())
+    act(() =>
+      getExitButton(wrapper).invoke('onClick')?.({} as React.MouseEvent)
+    )
     wrapper.update()
     expect(wrapper.find('ConfirmExitModal').exists()).toBe(true)
   })
@@ -162,7 +166,9 @@ describe('CheckCalibration', () => {
       },
     }
     const wrapper = render({ isJogging: false })
-    wrapper.find('button[title="forward"]').invoke('onClick')()
+    wrapper.find('button[title="forward"]').invoke('onClick')?.(
+      {} as React.MouseEvent
+    )
     expect(dispatchRequests).toHaveBeenCalledWith(
       Sessions.createSessionCommand(
         'robot-name',
@@ -184,7 +190,9 @@ describe('CheckCalibration', () => {
     }
     const wrapper = render({ isJogging: true })
     dispatch.mockClear()
-    wrapper.find('button[title="forward"]').invoke('onClick')()
+    wrapper.find('button[title="forward"]').invoke('onClick')?.(
+      {} as React.MouseEvent
+    )
     expect(dispatchRequests).not.toHaveBeenCalled()
   })
 })
diff --git a/app/src/organisms/CheckCalibration/__tests__/ResultsSummary.test.tsx b/app/src/organisms/CheckCalibration/__tests__/ResultsSummary.test.tsx
index 121d8bbd96a..ace6bb96a69 100644
--- a/app/src/organisms/CheckCalibration/__tests__/ResultsSummary.test.tsx
+++ b/app/src/organisms/CheckCalibration/__tests__/ResultsSummary.test.tsx
@@ -1,18 +1,18 @@
-// @flow
 import * as React from 'react'
 import { Provider } from 'react-redux'
-import { mount } from 'enzyme'
+import { HTMLAttributes, mount } from 'enzyme'
 import { act } from 'react-dom/test-utils'
 import * as Calibration from '../../../redux/calibration'
 import { mockCalibrationStatus } from '../../../redux/calibration/__fixtures__'
 import * as Fixtures from '../../../redux/sessions/__fixtures__'
 import * as Sessions from '../../../redux/sessions'
-import type { State } from '../../../redux/types'
 import { ResultsSummary } from '../ResultsSummary'
 import { saveAs } from 'file-saver'
 import { PrimaryBtn, Flex, Text } from '@opentrons/components'
 import { getPipetteModelSpecs } from '@opentrons/shared-data'
-import type { PipetteModelSpecs } from '@opentrons/shared-data'
+
+import type { ReactWrapper } from 'enzyme'
+import type { Mount } from '../../../redux/pipettes/types'
 
 jest.mock('file-saver')
 jest.mock('../../../redux/calibration/selectors')
@@ -26,43 +26,54 @@ jest.mock('@opentrons/shared-data', () => ({
   getPipetteModelSpecs: jest.fn(),
 }))
 
-const mockSaveAs: JestMockFn<
-  [Blob, string],
-  $Call<typeof saveAs, Blob, string>
-> = saveAs
+const mockSaveAs = saveAs as jest.MockedFunction<typeof saveAs>
 
-const mockGetCalibrationStatus: JestMockFn<
-  [State, string],
-  $Call<typeof Calibration.getCalibrationStatus, State, string>
-> = Calibration.getCalibrationStatus
+const mockGetCalibrationStatus = Calibration.getCalibrationStatus as jest.MockedFunction<
+  typeof Calibration.getCalibrationStatus
+>
 
 const mockSessionDetails = Fixtures.mockRobotCalibrationCheckSessionDetails
 
-const mockGetPipetteModelSpecs: JestMockFn<
-  [string],
-  ?$Shape<PipetteModelSpecs>
-> = getPipetteModelSpecs
+const mockGetPipetteModelSpecs = getPipetteModelSpecs as jest.MockedFunction<
+  typeof getPipetteModelSpecs
+>
 
 describe('ResultsSummary', () => {
-  let render
-  let mockStore
+  let render: (
+    props?: Partial<
+      React.ComponentProps<typeof ResultsSummary> & { pipMount: Mount }
+    >
+  ) => ReactWrapper<React.ComponentProps<typeof ResultsSummary>>
+  let mockStore: jest.MockedFunction<any>
   let dispatch
-  let mockDeleteSession
+  let mockDeleteSession: jest.MockedFunction<any>
 
-  const getExitButton = wrapper => wrapper.find(PrimaryBtn)
+  const getExitButton = (
+    wrapper: ReactWrapper<React.ComponentProps<typeof ResultsSummary>>
+  ): ReactWrapper<React.ComponentProps<typeof PrimaryBtn>> =>
+    wrapper.find(PrimaryBtn)
 
-  const getSaveLink = wrapper =>
+  const getSaveLink = (
+    wrapper: ReactWrapper<React.ComponentProps<typeof ResultsSummary>>
+  ): ReactWrapper<HTMLAttributes> =>
     wrapper.find('button[title="download-results-button"]')
 
-  const getDeckParent = wrapper => wrapper.children(Flex).at(1)
-  const getLeftPipParent = wrapper =>
-    wrapper.find('div[title="left-mount-container"]')
-  const getLeftPipResultsParent = wrapper =>
-    wrapper.find('div[title="left-mount-results"]')
-  const getRightPipParent = wrapper =>
-    wrapper.find('div[title="right-mount-container"]')
-  const getRightPipResultsParent = wrapper =>
-    wrapper.find('div[title="right-mount-results"]')
+  const getDeckParent = (
+    wrapper: ReactWrapper<React.ComponentProps<typeof ResultsSummary>>
+  ): ReactWrapper => wrapper.children(Flex).at(1)
+  const getLeftPipParent = (
+    wrapper: ReactWrapper<React.ComponentProps<typeof ResultsSummary>>
+  ): ReactWrapper => wrapper.find('div[title="left-mount-container"]')
+  const getLeftPipResultsParent = (
+    wrapper: ReactWrapper<React.ComponentProps<typeof ResultsSummary>>
+  ): ReactWrapper => wrapper.find('div[title="left-mount-results"]')
+  const getRightPipParent = (
+    wrapper: ReactWrapper<React.ComponentProps<typeof ResultsSummary>>
+  ): ReactWrapper => wrapper.find('div[title="right-mount-container"]')
+  const getRightPipResultsParent = (
+    wrapper: ReactWrapper<React.ComponentProps<typeof ResultsSummary>>
+  ): ReactWrapper => wrapper.find('div[title="right-mount-results"]')
+
   beforeEach(() => {
     mockDeleteSession = jest.fn()
     const mockSendCommands = jest.fn()
@@ -77,10 +88,8 @@ describe('ResultsSummary', () => {
     }
     mockGetPipetteModelSpecs.mockReturnValue({
       displayName: 'mock pipette display name',
-    })
-    render = (
-      props: $Shape<React.ElementProps<typeof ResultsSummary>> = {}
-    ) => {
+    } as any)
+    render = (props = {}) => {
       const {
         pipMount = 'left',
         isMulti = false,
@@ -188,7 +197,9 @@ describe('ResultsSummary', () => {
 
   it('exits when button is clicked', () => {
     const wrapper = render()
-    act(() => getExitButton(wrapper).invoke('onClick')())
+    act((): void =>
+      getExitButton(wrapper).invoke('onClick')?.({} as React.MouseEvent)
+    )
     wrapper.update()
 
     expect(mockDeleteSession).toHaveBeenCalled()
@@ -196,7 +207,9 @@ describe('ResultsSummary', () => {
 
   it('saves the calibration report when the button is clicked', () => {
     const wrapper = render()
-    act(() => getSaveLink(wrapper).invoke('onClick')())
+    act((): void =>
+      getSaveLink(wrapper).invoke('onClick')?.({} as React.MouseEvent)
+    )
     wrapper.update()
     expect(mockSaveAs).toHaveBeenCalled()
   })
diff --git a/app/src/organisms/CheckCalibration/__tests__/ReturnTip.test.tsx b/app/src/organisms/CheckCalibration/__tests__/ReturnTip.test.tsx
index ed58303c694..700faa8fca2 100644
--- a/app/src/organisms/CheckCalibration/__tests__/ReturnTip.test.tsx
+++ b/app/src/organisms/CheckCalibration/__tests__/ReturnTip.test.tsx
@@ -1,23 +1,30 @@
-// @flow
 import * as React from 'react'
 import { mount } from 'enzyme'
 import * as Fixtures from '../../../redux/sessions/__fixtures__'
 import * as Sessions from '../../../redux/sessions'
 import { ReturnTip } from '../ReturnTip'
 
+import type { ReactWrapper } from 'enzyme'
+import type { Mount } from '@opentrons/components'
+
 const mockSessionDetails = Fixtures.mockRobotCalibrationCheckSessionDetails
 
 describe('ReturnTip', () => {
-  let render
-  let mockSendCommands
+  let render: (
+    props?: Partial<
+      React.ComponentProps<typeof ReturnTip> & { pipMount: Mount }
+    >
+  ) => ReactWrapper<React.ComponentProps<typeof ReturnTip>>
+  let mockSendCommands: jest.MockedFunction<any>
 
-  const getContinueButton = wrapper =>
-    wrapper.find('button[title="confirmReturnTip"]')
+  const getContinueButton = (
+    wrapper: ReactWrapper<React.ComponentProps<typeof ReturnTip>>
+  ) => wrapper.find('button[title="confirmReturnTip"]')
 
   beforeEach(() => {
     mockSendCommands = jest.fn()
 
-    render = (props: $Shape<React.ElementProps<typeof ReturnTip>> = {}) => {
+    render = (props = {}) => {
       const {
         pipMount = 'left',
         isMulti = false,
@@ -54,14 +61,14 @@ describe('ReturnTip', () => {
     jest.resetAllMocks()
   })
 
-  it('on continue, if final pipette, return tip and transition ', () => {
+  it('on continue, if final pipette, return tip and transition', () => {
     const wrapper = render({
       activePipette: {
         ...mockSessionDetails.activePipette,
         rank: Sessions.CHECK_PIPETTE_RANK_SECOND,
       },
     })
-    getContinueButton(wrapper).invoke('onClick')()
+    getContinueButton(wrapper).invoke('onClick')?.({} as React.MouseEvent)
 
     expect(mockSendCommands).toHaveBeenCalledWith(
       { command: Sessions.checkCommands.RETURN_TIP },
@@ -71,7 +78,7 @@ describe('ReturnTip', () => {
 
   it('on continue, if first pipette with diff tip racks, return tip and switch', () => {
     const wrapper = render()
-    getContinueButton(wrapper).invoke('onClick')()
+    getContinueButton(wrapper).invoke('onClick')?.({} as React.MouseEvent)
 
     expect(mockSendCommands).toHaveBeenCalledWith(
       { command: Sessions.checkCommands.RETURN_TIP },
@@ -86,7 +93,7 @@ describe('ReturnTip', () => {
         tipRackLoadName: 'same-tip-rack-name',
       })),
     })
-    getContinueButton(wrapper).invoke('onClick')()
+    getContinueButton(wrapper).invoke('onClick')?.({} as React.MouseEvent)
 
     expect(mockSendCommands).toHaveBeenCalledWith(
       { command: Sessions.checkCommands.RETURN_TIP },
diff --git a/app/src/organisms/CheckCalibration/index.tsx b/app/src/organisms/CheckCalibration/index.tsx
index c88fe31e4fd..70861430632 100644
--- a/app/src/organisms/CheckCalibration/index.tsx
+++ b/app/src/organisms/CheckCalibration/index.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 
 import { getPipetteModelSpecs } from '@opentrons/shared-data'
@@ -31,9 +30,10 @@ import {
 import { ReturnTip } from './ReturnTip'
 import { ResultsSummary } from './ResultsSummary'
 
-import type { StyleProps } from '@opentrons/components'
+import type { StyleProps, Mount } from '@opentrons/components'
 import type {
   CalibrationLabware,
+  RobotCalibrationCheckStep,
   SessionCommandParams,
 } from '../../redux/sessions/types'
 
@@ -70,7 +70,7 @@ const terminalContentsStyleProps = {
 }
 
 const PANEL_BY_STEP: {
-  [string]: React.ComponentType<CalibrationPanelProps>,
+  [step in RobotCalibrationCheckStep]?: React.ComponentType<CalibrationPanelProps>
 } = {
   [Sessions.CHECK_STEP_SESSION_STARTED]: Introduction,
   [Sessions.CHECK_STEP_LABWARE_LOADED]: DeckSetup,
@@ -87,7 +87,7 @@ const PANEL_BY_STEP: {
 }
 
 const PANEL_STYLE_PROPS_BY_STEP: {
-  [string]: StyleProps,
+  [step in RobotCalibrationCheckStep]?: StyleProps
 } = {
   [Sessions.CHECK_STEP_SESSION_STARTED]: terminalContentsStyleProps,
   [Sessions.CHECK_STEP_LABWARE_LOADED]: darkContentsStyleProps,
@@ -102,7 +102,7 @@ const PANEL_STYLE_PROPS_BY_STEP: {
 
 export function CheckCalibration(
   props: CalibrationCheckParentProps
-): React.Node {
+): JSX.Element | null {
   const { session, robotName, dispatchRequests, showSpinner, isJogging } = props
   const {
     currentStep,
@@ -130,7 +130,7 @@ export function CheckCalibration(
     ? labware.find(l => !l.isTiprack) ?? null
     : null
 
-  function sendCommands(...commands: Array<SessionCommandParams>) {
+  function sendCommands(...commands: SessionCommandParams[]): void {
     if (session?.id && !isJogging) {
       const sessionCommandActions = commands.map(c =>
         Sessions.createSessionCommand(robotName, session.id, {
@@ -142,7 +142,7 @@ export function CheckCalibration(
     }
   }
 
-  function cleanUpAndExit() {
+  function cleanUpAndExit(): void {
     if (session?.id) {
       dispatchRequests(
         Sessions.createSessionCommand(robotName, session.id, {
@@ -175,13 +175,13 @@ export function CheckCalibration(
   if (showSpinner) {
     return <SpinnerModalPage titleBar={titleBarProps} />
   }
-
+  // @ts-expect-error(sa, 2021-05-27): avoiding src code change, currentStep might be undefined
   const Panel = PANEL_BY_STEP[currentStep]
   return Panel ? (
     <>
       <ModalPage
-        /* $FlowFixMe(mc, 2021-03-18): resolve with TS conversion */
         titleBar={titleBarProps}
+        // @ts-expect-error(sa, 2021-05-27): avoiding src code change, currentStep might be undefined
         innerProps={PANEL_STYLE_PROPS_BY_STEP[currentStep]}
       >
         <Panel
@@ -190,7 +190,7 @@ export function CheckCalibration(
           tipRack={activeTipRack}
           calBlock={calBlock}
           isMulti={isMulti}
-          mount={activePipette?.mount.toLowerCase()}
+          mount={activePipette?.mount.toLowerCase() as Mount}
           currentStep={currentStep}
           sessionType={session.sessionType}
           checkBothPipettes={checkBothPipettes}
diff --git a/app/src/organisms/CheckCalibration/types.ts b/app/src/organisms/CheckCalibration/types.ts
index 45e2160ae4e..52113aefd17 100644
--- a/app/src/organisms/CheckCalibration/types.ts
+++ b/app/src/organisms/CheckCalibration/types.ts
@@ -1,14 +1,11 @@
-// @flow
-import type { Action } from '../../redux/types'
 import type { CalibrationCheckSession } from '../../redux/sessions/types'
+import { DispatchRequestsType } from '../../redux/robot-api'
 
-export type CalibrationCheckParentProps = {|
-  robotName: string,
-  session: CalibrationCheckSession | null,
-  dispatchRequests: (
-    ...Array<{ ...Action, meta: { requestId: string } }>
-  ) => void,
-  isJogging: boolean,
-  showSpinner: boolean,
-  hasBlock?: boolean,
-|}
+export interface CalibrationCheckParentProps {
+  robotName: string
+  session: CalibrationCheckSession | null
+  dispatchRequests: DispatchRequestsType
+  isJogging: boolean
+  showSpinner: boolean
+  hasBlock?: boolean
+}
diff --git a/app/src/organisms/ConfigurePipette/ConfigErrorBanner.tsx b/app/src/organisms/ConfigurePipette/ConfigErrorBanner.tsx
index 94cbbd9514e..fc9b22c8163 100644
--- a/app/src/organisms/ConfigurePipette/ConfigErrorBanner.tsx
+++ b/app/src/organisms/ConfigurePipette/ConfigErrorBanner.tsx
@@ -1,15 +1,14 @@
-// @flow
 import * as React from 'react'
 import { AlertItem } from '@opentrons/components'
 import styles from './styles.css'
 
-type Props = {|
-  message: ?string,
-|}
+interface Props {
+  message?: string | null
+}
 
 const TITLE = 'Error updating pipette settings'
 
-export function ConfigErrorBanner(props: Props): React.Node {
+export function ConfigErrorBanner(props: Props): JSX.Element | null {
   const { message } = props
   const [dismissed, setDismissed] = React.useState(false)
   if (message == null || dismissed) return null
diff --git a/app/src/organisms/ConfigurePipette/ConfigForm.tsx b/app/src/organisms/ConfigurePipette/ConfigForm.tsx
index 315a704ac5d..a68f7fee25e 100644
--- a/app/src/organisms/ConfigurePipette/ConfigForm.tsx
+++ b/app/src/organisms/ConfigurePipette/ConfigForm.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { Formik, Form } from 'formik'
 
@@ -19,7 +18,7 @@ import {
   ConfigQuirkGroup,
 } from './ConfigFormGroup'
 
-import type { FormikProps } from 'formik/@flow-typed'
+import type { FormikProps } from 'formik'
 import type {
   PipetteSettingsField,
   PipetteSettingsFieldsMap,
@@ -28,25 +27,24 @@ import type {
 
 import type { FormValues } from './ConfigFormGroup'
 
-export type DisplayFieldProps = {|
-  ...PipetteSettingsField,
-  name: string,
-  displayName: string,
-|}
+export interface DisplayFieldProps extends PipetteSettingsField {
+  name: string
+  displayName: string
+}
 
-export type DisplayQuirkFieldProps = {|
-  [quirkId: string]: boolean,
-  name: string,
-  displayName: string,
-|}
+export interface DisplayQuirkFieldProps {
+  name: string
+  displayName: string
+  [quirkId: string]: boolean | string
+}
 
-export type ConfigFormProps = {|
-  settings: PipetteSettingsFieldsMap,
-  updateInProgress: boolean,
-  updateSettings: (fields: PipetteSettingsFieldsUpdate) => mixed,
-  closeModal: () => mixed,
-  __showHiddenFields: boolean,
-|}
+export interface ConfigFormProps {
+  settings: PipetteSettingsFieldsMap
+  updateInProgress: boolean
+  updateSettings: (fields: PipetteSettingsFieldsUpdate) => unknown
+  closeModal: () => unknown
+  __showHiddenFields: boolean
+}
 
 const PLUNGER_KEYS = ['top', 'bottom', 'blowout', 'dropTip']
 const POWER_KEYS = ['plungerCurrent', 'pickUpCurrent', 'dropTipCurrent']
@@ -55,9 +53,9 @@ const QUIRK_KEY = 'quirks'
 
 export class ConfigForm extends React.Component<ConfigFormProps> {
   getFieldsByKey(
-    keys: Array<string>,
+    keys: string[],
     fields: PipetteSettingsFieldsMap
-  ): Array<DisplayFieldProps> {
+  ): DisplayFieldProps[] {
     return keys.map(k => {
       const field = fields[k]
       const displayName = startCase(k)
@@ -70,11 +68,11 @@ export class ConfigForm extends React.Component<ConfigFormProps> {
     })
   }
 
-  getKnownQuirks: () => Array<DisplayQuirkFieldProps> = () => {
+  getKnownQuirks = (): DisplayQuirkFieldProps[] => {
     const quirks = this.props.settings[QUIRK_KEY]
     if (!quirks) return []
     const quirkKeys = Object.keys(quirks)
-    return quirkKeys.map(name => {
+    return quirkKeys.map<DisplayQuirkFieldProps>((name: string) => {
       const value = quirks[name]
       const displayName = startCase(name)
       return {
@@ -94,8 +92,8 @@ export class ConfigForm extends React.Component<ConfigFormProps> {
     ])
   }
 
-  getUnknownKeys: () => Array<string> = () => {
-    return keys<string>(
+  getUnknownKeys: () => string[] = () => {
+    return keys(
       omit(this.props.settings, [
         ...PLUNGER_KEYS,
         ...POWER_KEYS,
@@ -106,18 +104,19 @@ export class ConfigForm extends React.Component<ConfigFormProps> {
   }
 
   handleSubmit: (values: FormValues) => void = values => {
-    const params = mapValues(values, (v: ?(string | boolean)) => {
+    const params = mapValues<FormValues, number | boolean | null>(values, v => {
       if (v === true || v === false) return v
       if (v === '' || v == null) return null
       return Number(v)
     })
 
+    // @ts-expect-error TODO updateSettings type doesn't include boolean for values of params, but they could be returned.
     this.props.updateSettings(params)
   }
 
   getFieldValue(
     key: string,
-    fields: Array<DisplayFieldProps>,
+    fields: DisplayFieldProps[],
     values: FormValues
   ): number {
     const field = fields.find(f => f.name === key)
@@ -126,13 +125,14 @@ export class ConfigForm extends React.Component<ConfigFormProps> {
     return Number(value)
   }
 
-  validate: (values: FormValues) => { ... } = values => {
+  validate = (values: FormValues): {} => {
     const errors = {}
     const fields = this.getVisibleFields()
     const plungerFields = this.getFieldsByKey(PLUNGER_KEYS, fields)
 
     // validate all visible fields with min and max
     forOwn(fields, (field, name) => {
+      // @ts-expect-error TODO: value needs to be of type string here, but technically that's not prover
       const value = values[name].trim()
       const { min, max } = field
       if (value !== '') {
@@ -142,6 +142,7 @@ export class ConfigForm extends React.Component<ConfigFormProps> {
         } else if (
           typeof min === 'number' &&
           typeof max === 'number' &&
+          // TODO(bc, 2021-05-18): this should probably be (parsed < min || parsed > max) so we're not accidentally comparing a string to a number
           (parsed < min || value > max)
         ) {
           set(errors, name, `Min ${min} / Max ${max}`)
@@ -164,8 +165,13 @@ export class ConfigForm extends React.Component<ConfigFormProps> {
 
   getInitialValues: () => FormValues = () => {
     const fields = this.getVisibleFields()
-    const initialFieldValues = mapValues(fields, f => {
+    const initialFieldValues = mapValues<
+      PipetteSettingsFieldsMap,
+      string | boolean
+    >(fields, f => {
+      // @ts-expect-error TODO: PipetteSettingsFieldsMap doesn't include a boolean value, despite checking for it here
       if (f.value === true || f.value === false) return f.value
+      // @ts-expect-error(sa, 2021-05-27): avoiding src code change, use optional chain to access f.value
       return f.value !== f.default ? f.value.toString() : ''
     })
     const initialQuirkValues = this.props.settings[QUIRK_KEY]
@@ -178,7 +184,7 @@ export class ConfigForm extends React.Component<ConfigFormProps> {
     return initialValues
   }
 
-  render(): React.Node {
+  render(): JSX.Element {
     const { updateInProgress, closeModal } = this.props
     const fields = this.getVisibleFields()
     const UNKNOWN_KEYS = this.getUnknownKeys()
@@ -200,7 +206,7 @@ export class ConfigForm extends React.Component<ConfigFormProps> {
         {(formProps: FormikProps<FormValues>) => {
           const { errors, values } = formProps
           const disableSubmit = !isEmpty(errors)
-          const handleReset = () => {
+          const handleReset = (): void => {
             const newValues = mapValues(values, v => {
               if (typeof v === 'boolean') {
                 // NOTE: checkbox fields don't have defaults from the API b/c they come in from `quirks`
diff --git a/app/src/organisms/ConfigurePipette/ConfigFormGroup.tsx b/app/src/organisms/ConfigurePipette/ConfigFormGroup.tsx
index 241540f115e..ce43ffb279c 100644
--- a/app/src/organisms/ConfigurePipette/ConfigFormGroup.tsx
+++ b/app/src/organisms/ConfigurePipette/ConfigFormGroup.tsx
@@ -1,29 +1,31 @@
-// @flow
 import * as React from 'react'
-import { Field, type FieldProps } from 'formik'
+import { Field } from 'formik'
 import { FormGroup, InputField, CheckboxField } from '@opentrons/components'
 
 import styles from './styles.css'
 
+import type { FieldProps } from 'formik'
 import type { DisplayFieldProps, DisplayQuirkFieldProps } from './ConfigForm'
 
-export type FormColumnProps = {|
-  children: React.Node,
-|}
+export interface FormColumnProps {
+  children: React.ReactNode
+}
 
-export function FormColumn(props: FormColumnProps): React.Node {
+export function FormColumn(props: FormColumnProps): JSX.Element {
   return <div className={styles.form_column}>{props.children}</div>
 }
 
-export type FormValues = { [string]: ?(string | boolean) }
+export interface FormValues {
+  [key: string]: (string | boolean) | null | undefined
+}
 
-export type ConfigFormGroupProps = {|
-  groupLabel: string,
-  groupError?: ?string,
-  formFields: Array<DisplayFieldProps>,
-|}
+export interface ConfigFormGroupProps {
+  groupLabel: string
+  groupError?: string | null | undefined
+  formFields: DisplayFieldProps[]
+}
 
-export function ConfigFormGroup(props: ConfigFormGroupProps): React.Node {
+export function ConfigFormGroup(props: ConfigFormGroupProps): JSX.Element {
   const { groupLabel, groupError, formFields } = props
   const formattedError =
     groupError &&
@@ -45,19 +47,20 @@ export function ConfigFormGroup(props: ConfigFormGroupProps): React.Node {
   )
 }
 
-export type ConfigFormRowProps = {|
-  label: string,
-  labelFor: string,
-  children: React.Node,
-|}
+export interface ConfigFormRowProps {
+  label: string
+  labelFor: string
+  children: React.ReactNode
+}
 
 const FIELD_ID_PREFIX = '__PipetteConfig__'
-const makeId = name => `${FIELD_ID_PREFIX}.${name}`
+const makeId = (name: string): string => `${FIELD_ID_PREFIX}.${name}`
 
-export function ConfigFormRow(props: ConfigFormRowProps): React.Node {
+export function ConfigFormRow(props: ConfigFormRowProps): JSX.Element {
   const { labelFor, label } = props
   return (
     <div className={styles.form_row}>
+      {/* @ts-expect-error TODO: this label element's label prop doesn't do anything, remove it */}
       <label label={label} htmlFor={labelFor} className={styles.form_label}>
         {props.label}
       </label>
@@ -66,12 +69,12 @@ export function ConfigFormRow(props: ConfigFormRowProps): React.Node {
   )
 }
 
-export type ConfigInputProps = {|
-  field: DisplayFieldProps,
-  className?: string,
-|}
+export interface ConfigInputProps {
+  field: DisplayFieldProps
+  className?: string
+}
 
-export function ConfigInput(props: ConfigInputProps): React.Node {
+export function ConfigInput(props: ConfigInputProps): JSX.Element {
   const { field, className } = props
   const { name, units, displayName } = field
   const id = makeId(field.name)
@@ -86,6 +89,7 @@ export function ConfigInput(props: ConfigInputProps): React.Node {
             value={String(fieldProps.field.value ?? '')}
             onChange={fieldProps.field.onChange}
             onBlur={fieldProps.field.onBlur}
+            // @ts-expect-error TODO: this error prop can't handle some formik error array types
             error={fieldProps.form.errors[name]}
             {...{
               units,
@@ -98,19 +102,19 @@ export function ConfigInput(props: ConfigInputProps): React.Node {
   )
 }
 
-export type ConfigCheckboxProps = {|
-  field: DisplayQuirkFieldProps,
-  className?: string,
-|}
+export interface ConfigCheckboxProps {
+  field: DisplayQuirkFieldProps
+  className?: string
+}
 
-export function ConfigCheckbox(props: ConfigCheckboxProps): React.Node {
+export function ConfigCheckbox(props: ConfigCheckboxProps): JSX.Element {
   const { field, className } = props
   const { name, displayName } = field
   const id = makeId(name)
   return (
     <ConfigFormRow label={displayName} labelFor={id}>
       <Field name={name} type="checkbox">
-        {fieldProps => (
+        {(fieldProps: FieldProps) => (
           <CheckboxField
             name={fieldProps.field.name}
             onChange={fieldProps.field.onChange}
@@ -123,12 +127,12 @@ export function ConfigCheckbox(props: ConfigCheckboxProps): React.Node {
   )
 }
 
-export type ConfigQuirkGroupProps = {|
-  groupLabel: string,
-  quirks: Array<DisplayQuirkFieldProps>,
-|}
+export interface ConfigQuirkGroupProps {
+  groupLabel: string
+  quirks: DisplayQuirkFieldProps[]
+}
 
-export function ConfigQuirkGroup(props: ConfigQuirkGroupProps): React.Node {
+export function ConfigQuirkGroup(props: ConfigQuirkGroupProps): JSX.Element {
   const { groupLabel, quirks } = props
   return (
     <FormGroup label={groupLabel} className={styles.form_group}>
diff --git a/app/src/organisms/ConfigurePipette/ConfigMessage.tsx b/app/src/organisms/ConfigurePipette/ConfigMessage.tsx
index 506ee9ccd57..ff13e44730c 100644
--- a/app/src/organisms/ConfigurePipette/ConfigMessage.tsx
+++ b/app/src/organisms/ConfigurePipette/ConfigMessage.tsx
@@ -1,9 +1,8 @@
-// @flow
 import * as React from 'react'
 import styles from './styles.css'
 
 // TODO (ka 2019-2-12): Add intercom onClick to assistance text
-export function ConfigMessage(): React.Node {
+export function ConfigMessage(): JSX.Element {
   return (
     <div className={styles.config_message}>
       <h3 className={styles.warning_title}>Warning:</h3>
diff --git a/app/src/organisms/ConfigurePipette/FormButtonBar.tsx b/app/src/organisms/ConfigurePipette/FormButtonBar.tsx
index f7e86c973ef..41536fc1b1b 100644
--- a/app/src/organisms/ConfigurePipette/FormButtonBar.tsx
+++ b/app/src/organisms/ConfigurePipette/FormButtonBar.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 
 import { BottomButtonBar } from '../../molecules/modals'
@@ -7,11 +6,12 @@ import styles from './styles.css'
 
 import type { ButtonProps } from '@opentrons/components'
 
-export type FormButtonBarProps = {|
-  buttons: Array<?ButtonProps>,
-|}
+type MaybeButtonProps = ButtonProps | null | undefined
+export interface FormButtonBarProps {
+  buttons: MaybeButtonProps[]
+}
 
-export function FormButtonBar(props: FormButtonBarProps): React.Node {
+export function FormButtonBar(props: FormButtonBarProps): JSX.Element {
   const className = styles.form_button
   const buttons = props.buttons.map(button => ({ ...button, className }))
 
diff --git a/app/src/organisms/ConfigurePipette/index.tsx b/app/src/organisms/ConfigurePipette/index.tsx
index 1217dbbd88a..df575f2c141 100644
--- a/app/src/organisms/ConfigurePipette/index.tsx
+++ b/app/src/organisms/ConfigurePipette/index.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { useSelector } from 'react-redux'
 import last from 'lodash/last'
@@ -34,13 +33,13 @@ const PIPETTE_SETTINGS = 'Pipette Settings'
 const AN_ERROR_OCCURRED_WHILE_UPDATING =
   "An error occurred while updating your pipette's settings. Please try again."
 
-type Props = {|
-  robotName: string,
-  mount: Mount,
-  closeModal: () => mixed,
-|}
+interface Props {
+  robotName: string
+  mount: Mount
+  closeModal: () => unknown
+}
 
-export function ConfigurePipette(props: Props): React.Node {
+export function ConfigurePipette(props: Props): JSX.Element {
   const { robotName, mount, closeModal } = props
   const [dispatchRequest, requestIds] = useDispatchApiRequest()
 
@@ -51,19 +50,21 @@ export function ConfigurePipette(props: Props): React.Node {
     (state: State) => getAttachedPipetteSettings(state, robotName)[mount]
   )
 
-  const updateSettings = (fields: PipetteSettingsFieldsUpdate) => {
+  const updateSettings = (fields: PipetteSettingsFieldsUpdate): void => {
     if (pipette) {
       dispatchRequest(updatePipetteSettings(robotName, pipette.id, fields))
     }
   }
 
   const updateRequest = useSelector((state: State) =>
+    // @ts-expect-error(sa, 2021-05-27): avoiding src code change, verify last(requestIds) is not undefined
     getRequestById(state, last(requestIds))
   )
 
   const updateError: string | null =
     updateRequest && updateRequest.status === FAILURE
-      ? updateRequest.error.message || AN_ERROR_OCCURRED_WHILE_UPDATING
+      ? // @ts-expect-error(sa, 2021-05-27): avoiding src code change, need to type narrow
+        updateRequest.error.message || AN_ERROR_OCCURRED_WHILE_UPDATING
       : null
 
   // TODO(mc, 2019-12-09): remove this feature flag
diff --git a/app/src/organisms/ProtocolModuleList/__tests__/ProtocolModuleList.test.tsx b/app/src/organisms/ProtocolModuleList/__tests__/ProtocolModuleList.test.tsx
index 1cc519c39f3..60f583590bb 100644
--- a/app/src/organisms/ProtocolModuleList/__tests__/ProtocolModuleList.test.tsx
+++ b/app/src/organisms/ProtocolModuleList/__tests__/ProtocolModuleList.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { StaticRouter } from 'react-router-dom'
 import { mountWithProviders } from '@opentrons/components/__utils__'
@@ -9,85 +8,84 @@ import { mockMagneticModule } from '../../../redux/modules/__fixtures__'
 import * as robotSelectors from '../../../redux/robot/selectors'
 import * as moduleSelectors from '../../../redux/modules/selectors'
 import { ProtocolModuleList } from '..'
-
-import type { State } from '../../../redux/types'
+import { ApiSessionModule } from '../../../redux/robot'
+import { MatchedModule } from '../../../redux/modules/types'
 
 jest.mock('../../../redux/robot/selectors')
 jest.mock('../../../redux/modules/selectors')
 
-const mockGetModules: JestMockFn<
-  [State],
-  $Call<typeof robotSelectors.getModules, State>
-> = robotSelectors.getModules
-
-const mockGetModulesByModel: JestMockFn<
-  [State],
-  $Call<typeof robotSelectors.getModulesByModel, State>
-> = robotSelectors.getModulesByModel
-
-const mockGetModulesByProtocolLoadOrder: JestMockFn<
-  [State],
-  $Call<typeof robotSelectors.getModulesByProtocolLoadOrder, State>
-> = robotSelectors.getModulesByProtocolLoadOrder
-
-const mockGetMatchedModules: JestMockFn<
-  [State],
-  $Call<typeof moduleSelectors.getMatchedModules, State>
-> = moduleSelectors.getMatchedModules
-
-const mockMagneticModule1 = {
-  model: 'magneticModuleV1',
-  slot: '1',
+const mockGetModules = robotSelectors.getModules as jest.MockedFunction<
+  typeof robotSelectors.getModules
+>
+
+const mockGetMatchedModules = moduleSelectors.getMatchedModules as jest.MockedFunction<
+  typeof moduleSelectors.getMatchedModules
+>
+const mockGetModulesByModel = robotSelectors.getModulesByModel as jest.MockedFunction<
+  typeof robotSelectors.getModulesByModel
+>
+const mockGetModulesByProtocolLoadOrder = robotSelectors.getModulesByProtocolLoadOrder as jest.MockedFunction<
+  typeof robotSelectors.getModulesByProtocolLoadOrder
+>
+
+type MockedModuleType = Pick<
+  ApiSessionModule,
+  'model' | 'slot' | '_id' | 'protocolLoadOrder'
+>
+
+const mockMagneticModule1: MockedModuleType = {
+  model: 'magneticModuleV1' as ApiSessionModule['model'],
+  slot: '1' as ApiSessionModule['slot'],
   _id: 1234,
   protocolLoadOrder: 0,
 }
 
-const mockMagneticModule2 = {
-  model: 'magneticModuleV2',
-  slot: '3',
+const mockMagneticModule2: MockedModuleType = {
+  model: 'magneticModuleV2' as ApiSessionModule['model'],
+  slot: '3' as ApiSessionModule['slot'],
   _id: 2345,
   protocolLoadOrder: 1,
 }
 
 const mockMagneticModuleV2 = {
-  model: 'magneticModuleV2',
-  slot: '1',
+  model: 'magneticModuleV2' as ApiSessionModule['model'],
+  slot: '1' as ApiSessionModule['slot'],
   _id: 1234,
   protocolLoadOrder: 0,
 }
 
-const mockMatchedModule1 = {
+const mockMatchedModule1: MatchedModule = {
   module: {
     ...mockMagneticModule,
     usbPort: { hub: null, port: 1 },
   },
-  slot: '1',
+  slot: '1' as ApiSessionModule['slot'],
 }
 
-const mockMatchedModule2 = {
+const mockMatchedModule2: MatchedModule = {
   module: {
     ...mockMagneticModule,
     usbPort: { hub: 2, port: 3 },
   },
-  slot: '3',
+  slot: '3' as ApiSessionModule['slot'],
 }
 
-const mockLegacyMatchedModule = {
+const mockLegacyMatchedModule: MatchedModule = {
   module: {
     ...mockMagneticModule,
     usbPort: { hub: null, port: null },
   },
-  slot: '3',
+  slot: '3' as ApiSessionModule['slot'],
 }
 
 const mockModules = [mockMagneticModule1, mockMagneticModule2]
 const mockModulesByModel = {
   magneticModuleV1: [mockMagneticModule1],
   magneticModuleV2: [mockMagneticModule2],
-}
+} as any
 
 describe('ModuleList', () => {
-  let render
+  let render: (location?: string) => ReturnType<typeof mountWithProviders>
 
   beforeEach(() => {
     mockGetModules.mockReturnValue(mockModules)
diff --git a/app/src/organisms/ProtocolModuleList/index.tsx b/app/src/organisms/ProtocolModuleList/index.tsx
index 3bc697fc5ca..c275f787dd9 100644
--- a/app/src/organisms/ProtocolModuleList/index.tsx
+++ b/app/src/organisms/ProtocolModuleList/index.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { useSelector } from 'react-redux'
 import { useTranslation } from 'react-i18next'
@@ -35,7 +34,7 @@ const USB_ORDER_STYLE = { width: '25%', paddingRight: '0.4rem' }
 const USB_PORT_STYLE = { width: '27%', paddingRight: '0.75rem' }
 const DECK_SLOT_STYLE = { width: '15%' }
 
-export function ProtocolModuleList(): React.Node {
+export function ProtocolModuleList(): JSX.Element | null {
   const { t } = useTranslation('protocol_calibration')
   const modulesRequired = useSelector((state: State) =>
     robotSelectors.getModules(state)
@@ -52,7 +51,7 @@ export function ProtocolModuleList(): React.Node {
   const moduleList = hasDuplicateModule ? modulesByLoadOrder : modulesRequired
   if (modulesRequired.length < 1) return null
   return (
-    <TitledList key={t('modules_title')} title={t('modules_title')}>
+    <TitledList key={t<string>('modules_title')} title={t('modules_title')}>
       {hasDuplicateModule && (
         <Text
           css={FONT_BODY_1_DARK}
@@ -69,6 +68,7 @@ export function ProtocolModuleList(): React.Node {
         textTransform={TEXT_TRANSFORM_UPPERCASE}
         marginY={SPACING_2}
         paddingX="0.875rem"
+        // @ts-expect-error(sa, 2021-05-27): avoiding src code change, pass undefined instead of null
         justifyContent={!hasDuplicateModule ? JUSTIFY_SPACE_BETWEEN : null}
       >
         <Text {...MODULE_STYLE}>{t('modules_module_title')}</Text>
@@ -90,6 +90,7 @@ export function ProtocolModuleList(): React.Node {
               key={m.slot}
               data-test={m.slot}
               padding="0.75rem"
+              // @ts-expect-error(sa, 2021-05-27): avoiding src code change, pass undefined instead of null
               justifyContent={
                 !hasDuplicateModule ? JUSTIFY_SPACE_BETWEEN : null
               }
@@ -112,11 +113,11 @@ export function ProtocolModuleList(): React.Node {
   )
 }
 
-type UsbPortInfoProps = {|
-  matchedModule: MatchedModule | null,
-|}
+interface UsbPortInfoProps {
+  matchedModule: MatchedModule | null
+}
 
-function UsbPortInfo(props: UsbPortInfoProps): React.Node {
+function UsbPortInfo(props: UsbPortInfoProps): JSX.Element | null {
   const [targetProps, tooltipProps] = useHoverTooltip()
   const { t } = useTranslation('protocol_calibration')
 
@@ -140,6 +141,7 @@ function UsbPortInfo(props: UsbPortInfoProps): React.Node {
             width={'15px'}
             paddingLeft={SPACING_1}
           />
+          {/* @ts-expect-error  TODO: this inline style will always be overwritten by tooltipProps, remove it? */}
           <Tooltip style={{ width: '2rem' }} {...tooltipProps}>
             {t('modules_update_software_tooltip')}
           </Tooltip>
diff --git a/app/src/organisms/SessionHeader/index.tsx b/app/src/organisms/SessionHeader/index.tsx
index 7e9b64ad92f..154008d8aba 100644
--- a/app/src/organisms/SessionHeader/index.tsx
+++ b/app/src/organisms/SessionHeader/index.tsx
@@ -1,26 +1,22 @@
-// @flow
 import * as React from 'react'
 import { connect } from 'react-redux'
 import { Link } from 'react-router-dom'
 
 import { getProtocolFilename } from '../../redux/protocol'
 
-import type { State, Dispatch } from '../../redux/types'
+import type { State } from '../../redux/types'
 
-type SP = {| sessionName: ?string |}
+interface SP {
+  sessionName: string | null | undefined
+}
 
-type Props = {| ...SP, dispatch: Dispatch |}
+type Props = SP
 
-export const SessionHeader: React.AbstractComponent<{||}> = connect<
-  Props,
-  {||},
-  _,
-  _,
-  _,
-  _
->(mapStateToProps)(SessionHeaderComponent)
+export const SessionHeader: React.ComponentType = connect(mapStateToProps)(
+  SessionHeaderComponent
+)
 
-function SessionHeaderComponent(props: Props) {
+function SessionHeaderComponent(props: Props): JSX.Element {
   return <Link to="/upload">{props.sessionName}</Link>
 }
 
diff --git a/app/src/organisms/UpdateAppModal/__tests__/UpdateAppModal.test.tsx b/app/src/organisms/UpdateAppModal/__tests__/UpdateAppModal.test.tsx
index 4735463b37c..705701ffed6 100644
--- a/app/src/organisms/UpdateAppModal/__tests__/UpdateAppModal.test.tsx
+++ b/app/src/organisms/UpdateAppModal/__tests__/UpdateAppModal.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { Link as InternalLink } from 'react-router-dom'
 import { mountWithStore } from '@opentrons/components/__utils__'
@@ -9,43 +8,48 @@ import { ErrorModal } from '../../../molecules/modals'
 import { ReleaseNotes } from '../../../molecules/ReleaseNotes'
 import { UpdateAppModal } from '..'
 
-import type { State } from '../../../redux/types'
-import type { ShellUpdateState, UpdateInfo } from '../../../redux/shell/types'
+import type { State, Action } from '../../../redux/types'
+import type { ShellUpdateState } from '../../../redux/shell/types'
 import type { UpdateAppModalProps } from '..'
+import type { HTMLAttributes, ReactWrapper } from 'enzyme'
 
 // TODO(mc, 2020-10-06): this is a partial mock because shell/update
 // needs some reorg to split actions and selectors
 jest.mock('../../../redux/shell/update', () => ({
-  ...jest.requireActual('../../../redux/shell/update'),
+  ...jest.requireActual<{}>('../../../redux/shell/update'),
   getShellUpdateState: jest.fn(),
 }))
 
 jest.mock('react-router-dom', () => ({ Link: () => <></> }))
 
-const getShellUpdateState: JestMockFn<[State], $Shape<ShellUpdateState>> =
-  Shell.getShellUpdateState
+const getShellUpdateState = Shell.getShellUpdateState as jest.MockedFunction<
+  typeof Shell.getShellUpdateState
+>
 
-const MOCK_STATE: State = ({ mockState: true }: any)
+const MOCK_STATE: State = { mockState: true } as any
 
 describe('UpdateAppModal', () => {
   const closeModal = jest.fn()
   const dismissAlert = jest.fn()
 
   const render = (props: UpdateAppModalProps) => {
-    return mountWithStore(<UpdateAppModal {...props} />, {
-      initialState: MOCK_STATE,
-    })
+    return mountWithStore<UpdateAppModalProps, State, Action>(
+      <UpdateAppModal {...props} />,
+      {
+        initialState: MOCK_STATE,
+      }
+    )
   }
 
   beforeEach(() => {
-    getShellUpdateState.mockImplementation(state => {
+    getShellUpdateState.mockImplementation((state: State) => {
       expect(state).toBe(MOCK_STATE)
       return {
-        info: ({
+        info: {
           version: '1.2.3',
           releaseNotes: 'this is a release',
-        }: $Shape<UpdateInfo>),
-      }
+        },
+      } as ShellUpdateState
     })
   })
 
@@ -74,10 +78,12 @@ describe('UpdateAppModal', () => {
     const { wrapper } = render({ closeModal })
     const notNowButton = wrapper
       .find('button')
-      .filterWhere(b => /not now/i.test(b.text()))
+      .filterWhere((b: ReactWrapper<HTMLAttributes>) =>
+        /not now/i.test(b.text())
+      )
 
     expect(closeModal).not.toHaveBeenCalled()
-    notNowButton.invoke('onClick')()
+    notNowButton.invoke('onClick')?.({} as React.MouseEvent)
     expect(closeModal).toHaveBeenCalled()
   })
 
@@ -85,19 +91,24 @@ describe('UpdateAppModal', () => {
     const { wrapper, store } = render({ closeModal })
     const downloadButton = wrapper
       .find('button')
-      .filterWhere(b => /download/i.test(b.text()))
+      .filterWhere((b: ReactWrapper) => /download/i.test(b.text()))
 
-    downloadButton.invoke('onClick')()
+    downloadButton.invoke('onClick')?.({} as React.MouseEvent)
 
     expect(store.dispatch).toHaveBeenCalledWith(Shell.downloadShellUpdate())
   })
 
   it('should render a spinner if update is downloading', () => {
-    getShellUpdateState.mockReturnValue({ downloading: true })
+    getShellUpdateState.mockReturnValue({
+      downloading: true,
+    } as ShellUpdateState)
     const { wrapper } = render({ closeModal })
     const spinner = wrapper
       .find(Icon)
-      .filterWhere(i => i.prop('name') === 'ot-spinner')
+      .filterWhere(
+        (i: ReactWrapper<React.ComponentProps<typeof Icon>>) =>
+          i.prop('name') === 'ot-spinner'
+      )
     const spinnerParent = spinner.closest(Flex)
 
     expect(spinnerParent.text()).toMatch(/download in progress/i)
@@ -106,11 +117,11 @@ describe('UpdateAppModal', () => {
   it('should render a instructional copy instead of release notes if update is downloaded', () => {
     getShellUpdateState.mockReturnValue({
       downloaded: true,
-      info: ({
+      info: {
         version: '1.2.3',
         releaseNotes: 'this is a release',
-      }: $Shape<UpdateInfo>),
-    })
+      },
+    } as ShellUpdateState)
 
     const { wrapper } = render({ closeModal })
     const title = wrapper.find('h2')
@@ -121,24 +132,32 @@ describe('UpdateAppModal', () => {
   })
 
   it('should render a "Restart App" button if update is downloaded', () => {
-    getShellUpdateState.mockReturnValue({ downloaded: true })
+    getShellUpdateState.mockReturnValue({
+      downloaded: true,
+    } as ShellUpdateState)
     const { wrapper, store } = render({ closeModal })
     const restartButton = wrapper
       .find('button')
-      .filterWhere(b => /restart/i.test(b.text()))
+      .filterWhere((b: ReactWrapper<HTMLAttributes>) =>
+        /restart/i.test(b.text())
+      )
 
-    restartButton.invoke('onClick')()
+    restartButton.invoke('onClick')?.({} as React.MouseEvent)
     expect(store.dispatch).toHaveBeenCalledWith(Shell.applyShellUpdate())
   })
 
   it('should render a "Not Now" button if update is downloaded', () => {
-    getShellUpdateState.mockReturnValue({ downloaded: true })
+    getShellUpdateState.mockReturnValue({
+      downloaded: true,
+    } as ShellUpdateState)
     const { wrapper } = render({ closeModal })
     const notNowButton = wrapper
       .find('button')
-      .filterWhere(b => /not now/i.test(b.text()))
+      .filterWhere((b: ReactWrapper<HTMLAttributes>) =>
+        /not now/i.test(b.text())
+      )
 
-    notNowButton.invoke('onClick')()
+    notNowButton.invoke('onClick')?.({} as React.MouseEvent)
     expect(closeModal).toHaveBeenCalled()
   })
 
@@ -148,7 +167,7 @@ describe('UpdateAppModal', () => {
         message: 'Could not get code signature for running application',
         name: 'Error',
       },
-    })
+    } as ShellUpdateState)
 
     const { wrapper } = render({ closeModal })
     const errorModal = wrapper.find(ErrorModal)
@@ -162,7 +181,7 @@ describe('UpdateAppModal', () => {
       name: 'Error',
     })
 
-    errorModal.invoke('close')()
+    errorModal.invoke('close')?.()
 
     expect(closeModal).toHaveBeenCalled()
   })
@@ -171,10 +190,12 @@ describe('UpdateAppModal', () => {
     const { wrapper } = render({ dismissAlert })
     const notNowButton = wrapper
       .find('button')
-      .filterWhere(b => /not now/i.test(b.text()))
+      .filterWhere((b: ReactWrapper<HTMLAttributes>) =>
+        /not now/i.test(b.text())
+      )
 
     expect(dismissAlert).not.toHaveBeenCalled()
-    notNowButton.invoke('onClick')()
+    notNowButton.invoke('onClick')?.({} as React.MouseEvent)
     expect(dismissAlert).toHaveBeenCalledWith(false)
   })
 
@@ -184,12 +205,12 @@ describe('UpdateAppModal', () => {
         message: 'Could not get code signature for running application',
         name: 'Error',
       },
-    })
+    } as ShellUpdateState)
 
     const { wrapper } = render({ dismissAlert })
     const errorModal = wrapper.find(ErrorModal)
 
-    errorModal.invoke('close')()
+    errorModal.invoke('close')?.()
 
     expect(dismissAlert).toHaveBeenCalledWith(false)
   })
@@ -198,9 +219,11 @@ describe('UpdateAppModal', () => {
     const { wrapper } = render({ dismissAlert })
     const ignoreButton = wrapper
       .find('button')
-      .filterWhere(b => /turn off update notifications/i.test(b.text()))
+      .filterWhere((b: ReactWrapper<HTMLAttributes>) =>
+        /turn off update notifications/i.test(b.text())
+      )
 
-    ignoreButton.invoke('onClick')()
+    ignoreButton.invoke('onClick')?.({} as React.MouseEvent)
 
     const title = wrapper.find('h2')
 
@@ -215,18 +238,24 @@ describe('UpdateAppModal', () => {
     const { wrapper } = render({ closeModal })
     const ignoreButton = wrapper
       .find('button')
-      .filterWhere(b => /turn off update notifications/i.test(b.text()))
+      .filterWhere((b: ReactWrapper<HTMLAttributes>) =>
+        /turn off update notifications/i.test(b.text())
+      )
 
     expect(ignoreButton.exists()).toBe(false)
   })
 
   it('should not show the "ignore" button if the user has proceeded with the update', () => {
-    getShellUpdateState.mockReturnValue({ downloaded: true })
+    getShellUpdateState.mockReturnValue({
+      downloaded: true,
+    } as ShellUpdateState)
 
     const { wrapper } = render({ dismissAlert })
     const ignoreButton = wrapper
       .find('button')
-      .filterWhere(b => /turn off update notifications/i.test(b.text()))
+      .filterWhere((b: ReactWrapper<HTMLAttributes>) =>
+        /turn off update notifications/i.test(b.text())
+      )
 
     expect(ignoreButton.exists()).toBe(false)
   })
@@ -236,13 +265,15 @@ describe('UpdateAppModal', () => {
 
     wrapper
       .find('button')
-      .filterWhere(b => /turn off update notifications/i.test(b.text()))
-      .invoke('onClick')()
+      .filterWhere((b: ReactWrapper<HTMLAttributes>) =>
+        /turn off update notifications/i.test(b.text())
+      )
+      .invoke('onClick')?.({} as React.MouseEvent)
 
     wrapper
       .find('button')
-      .filterWhere(b => /ok/i.test(b.text()))
-      .invoke('onClick')()
+      .filterWhere((b: ReactWrapper<HTMLAttributes>) => /ok/i.test(b.text()))
+      .invoke('onClick')?.({} as React.MouseEvent)
 
     expect(dismissAlert).toHaveBeenCalledWith(true)
   })
@@ -252,8 +283,10 @@ describe('UpdateAppModal', () => {
 
     wrapper
       .find('button')
-      .filterWhere(b => /turn off update notifications/i.test(b.text()))
-      .invoke('onClick')()
+      .filterWhere((b: ReactWrapper<HTMLAttributes>) =>
+        /turn off update notifications/i.test(b.text())
+      )
+      .invoke('onClick')?.({} as React.MouseEvent)
 
     wrapper.unmount()
 
@@ -265,13 +298,18 @@ describe('UpdateAppModal', () => {
 
     wrapper
       .find('button')
-      .filterWhere(b => /turn off update notifications/i.test(b.text()))
-      .invoke('onClick')()
+      .filterWhere((b: ReactWrapper<HTMLAttributes>) =>
+        /turn off update notifications/i.test(b.text())
+      )
+      .invoke('onClick')?.({} as React.MouseEvent)
 
     wrapper
       .find(InternalLink)
-      .filterWhere(b => b.prop('to') === '/more/app')
-      .invoke('onClick')()
+      .filterWhere(
+        (b: ReactWrapper<React.ComponentProps<typeof InternalLink>>) =>
+          b.prop('to') === '/more/app'
+      )
+      .invoke('onClick')?.({} as React.MouseEvent<HTMLAnchorElement>)
 
     expect(dismissAlert).toHaveBeenCalledWith(true)
   })
@@ -280,9 +318,11 @@ describe('UpdateAppModal', () => {
     const { wrapper } = render({ dismissAlert })
     const notNowButton = wrapper
       .find('button')
-      .filterWhere(b => /not now/i.test(b.text()))
+      .filterWhere((b: ReactWrapper<HTMLAttributes>) =>
+        /not now/i.test(b.text())
+      )
 
-    notNowButton.invoke('onClick')()
+    notNowButton.invoke('onClick')?.({} as React.MouseEvent)
     wrapper.unmount()
 
     expect(dismissAlert).toHaveBeenCalledTimes(1)
diff --git a/app/src/organisms/UpdateAppModal/index.tsx b/app/src/organisms/UpdateAppModal/index.tsx
index 661a205bf82..c7c164ab70a 100644
--- a/app/src/organisms/UpdateAppModal/index.tsx
+++ b/app/src/organisms/UpdateAppModal/index.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { useSelector, useDispatch } from 'react-redux'
 import { Link as InternalLink } from 'react-router-dom'
@@ -43,10 +42,10 @@ import { ReleaseNotes } from '../../molecules/ReleaseNotes'
 
 import type { Dispatch } from '../../redux/types'
 
-export type UpdateAppModalProps = {|
-  dismissAlert?: (remember: boolean) => mixed,
-  closeModal?: () => mixed,
-|}
+export interface UpdateAppModalProps {
+  dismissAlert?: (remember: boolean) => unknown
+  closeModal?: () => unknown
+}
 
 // TODO(mc, 2020-10-06): i18n
 const APP_VERSION = 'App Version'
@@ -106,7 +105,7 @@ const SPINNER = (
   </BaseModal>
 )
 
-export function UpdateAppModal(props: UpdateAppModalProps): React.Node {
+export function UpdateAppModal(props: UpdateAppModalProps): JSX.Element {
   const { dismissAlert, closeModal } = props
   const [updatesIgnored, setUpdatesIgnored] = React.useState(false)
   const dispatch = useDispatch<Dispatch>()
@@ -115,13 +114,13 @@ export function UpdateAppModal(props: UpdateAppModalProps): React.Node {
   const version = updateInfo?.version ?? ''
   const releaseNotes = updateInfo?.releaseNotes
 
-  const handleUpdateClick = () => {
+  const handleUpdateClick = (): void => {
     dispatch(downloaded ? applyShellUpdate() : downloadShellUpdate())
   }
 
   // ensure close handlers are called on close button click or on component
   // unmount (for safety), but not both
-  const latestHandleClose = React.useRef(null)
+  const latestHandleClose = React.useRef<(() => void) | null>(null)
 
   React.useEffect(() => {
     latestHandleClose.current = () => {
@@ -131,7 +130,7 @@ export function UpdateAppModal(props: UpdateAppModalProps): React.Node {
     }
   })
 
-  const handleCloseClick = () => {
+  const handleCloseClick = (): void => {
     latestHandleClose.current && latestHandleClose.current()
   }
 
diff --git a/app/src/pages/Calibrate/CalibrateLabware/CalibrationValues.tsx b/app/src/pages/Calibrate/CalibrateLabware/CalibrationValues.tsx
index 9fab0c61b5d..e8eabcee6d8 100644
--- a/app/src/pages/Calibrate/CalibrateLabware/CalibrationValues.tsx
+++ b/app/src/pages/Calibrate/CalibrateLabware/CalibrationValues.tsx
@@ -1,21 +1,22 @@
-// @flow
 import * as React from 'react'
 import { Text, FONT_WEIGHT_SEMIBOLD, SPACING_3 } from '@opentrons/components'
 
-type Props = {|
-  x: number | null,
-  y: number | null,
-  z: number | null,
-|}
-export const CalibrationValues = (props: Props): React.Node => (
+interface Props {
+  x: number | null
+  y: number | null
+  z: number | null
+}
+export const CalibrationValues = (props: Props): JSX.Element => (
   <span>
-    {['x', 'y', 'z'].map(key => (
+    {['x', 'y', 'z'].map((key: string) => (
       <React.Fragment key={key}>
         <Text as="span" fontWeight={FONT_WEIGHT_SEMIBOLD}>
           {key.toUpperCase()}
         </Text>{' '}
         <Text as="span" marginRight={SPACING_3}>
-          {props[key] != null ? props[key].toFixed(1) : null}
+          {props[key as keyof Props] != null
+            ? props[key as keyof Props]?.toFixed(1)
+            : null}
         </Text>
       </React.Fragment>
     ))}
diff --git a/app/src/pages/Calibrate/CalibrateLabware/ConfirmModal.tsx b/app/src/pages/Calibrate/CalibrateLabware/ConfirmModal.tsx
index 0f66f9c6ae4..724fd2b50b9 100644
--- a/app/src/pages/Calibrate/CalibrateLabware/ConfirmModal.tsx
+++ b/app/src/pages/Calibrate/CalibrateLabware/ConfirmModal.tsx
@@ -1,4 +1,3 @@
-// @flow
 // labware calibration controls modal
 import * as React from 'react'
 import cx from 'classnames'
@@ -10,13 +9,13 @@ import { ModalPage } from '@opentrons/components'
 import { ConfirmModalContents } from './ConfirmModalContents'
 import styles from './styles.css'
 
-export type ConfirmModalProps = {|
-  labware: Labware,
-  calibrateToBottom: boolean,
-  onBackClick: () => mixed,
-|}
+export interface ConfirmModalProps {
+  labware: Labware
+  calibrateToBottom: boolean
+  onBackClick: () => unknown
+}
 
-export function ConfirmModal(props: ConfirmModalProps): React.Node {
+export function ConfirmModal(props: ConfirmModalProps): JSX.Element {
   const { labware, onBackClick, calibrateToBottom } = props
 
   // disable back click if we're moving or if we've loaded up with tips
diff --git a/app/src/pages/Calibrate/CalibrateLabware/ConfirmModalContents.tsx b/app/src/pages/Calibrate/CalibrateLabware/ConfirmModalContents.tsx
index b9cf50864cd..3c5a44e73e7 100644
--- a/app/src/pages/Calibrate/CalibrateLabware/ConfirmModalContents.tsx
+++ b/app/src/pages/Calibrate/CalibrateLabware/ConfirmModalContents.tsx
@@ -1,4 +1,3 @@
-// @flow
 // contents container for ConfirmModal
 import * as React from 'react'
 import { connect } from 'react-redux'
@@ -9,25 +8,26 @@ import { ConfirmPositionContents } from './ConfirmPositionContents'
 import { ConfirmPickupContents } from './ConfirmPickupContents'
 import { InProgressContents } from './InProgressContents'
 
-import type { State, Dispatch } from '../../../redux/types'
+import type { State } from '../../../redux/types'
 import type { Pipette, Labware } from '../../../redux/robot/types'
 
-type OP = {| labware: Labware, calibrateToBottom: boolean |}
+interface OP {
+  labware: Labware
+  calibrateToBottom: boolean
+}
 
-type SP = {| calibrator: ?Pipette, useCenteredTroughs: boolean |}
+interface SP {
+  calibrator: Pipette | null | undefined
+  useCenteredTroughs: boolean
+}
 
-type Props = {| ...OP, ...SP, dispatch: Dispatch |}
+type Props = OP & SP
 
-export const ConfirmModalContents: React.AbstractComponent<OP> = connect<
-  Props,
-  OP,
-  SP,
-  {||},
-  _,
-  _
->(mapStateToProps)(ConfirmModalContentsComponent)
+export const ConfirmModalContents = connect(mapStateToProps)(
+  ConfirmModalContentsComponent
+)
 
-function ConfirmModalContentsComponent(props: Props) {
+function ConfirmModalContentsComponent(props: Props): JSX.Element | null {
   const { labware, calibrator, calibrateToBottom, useCenteredTroughs } = props
   if (!calibrator) return null
 
diff --git a/app/src/pages/Calibrate/CalibrateLabware/ConfirmPickupContents.ts b/app/src/pages/Calibrate/CalibrateLabware/ConfirmPickupContents.ts
index 71cd095959e..f9cef12f692 100644
--- a/app/src/pages/Calibrate/CalibrateLabware/ConfirmPickupContents.ts
+++ b/app/src/pages/Calibrate/CalibrateLabware/ConfirmPickupContents.ts
@@ -1,39 +1,23 @@
-// @flow
 // pickup confirmation contents container for ConfirmModal
-import * as React from 'react'
 import { connect } from 'react-redux'
 
 import { actions as robotActions } from '../../../redux/robot'
 import { ConfirmPickupPrompt } from './ConfirmPickupPrompt'
 
-import type { Dispatch } from '../../../redux/types'
+import type { MapDispatchToProps } from 'react-redux'
 import type { Labware, Pipette } from '../../../redux/robot'
 
-type OP = {|
-  labware: Labware,
-  calibrator: Pipette,
-|}
-
-type DP = {|
-  onNoClick: () => void,
-  onYesClick: () => void,
-|}
-
-type Props = {| ...OP, ...DP |}
+interface OP {
+  labware: Labware
+  calibrator: Pipette
+}
 
-export const ConfirmPickupContents: React.AbstractComponent<OP> = connect<
-  Props,
-  OP,
-  _,
-  _,
-  _,
-  _
->(
-  null,
-  mapDispatchToProps
-)(ConfirmPickupPrompt)
+interface DP {
+  onNoClick: () => void
+  onYesClick: () => void
+}
 
-function mapDispatchToProps(dispatch: Dispatch, ownProps: OP): DP {
+const mapDispatchToProps: MapDispatchToProps<DP, OP> = (dispatch, ownProps) => {
   const {
     labware: { slot },
     calibrator: { mount },
@@ -48,3 +32,8 @@ function mapDispatchToProps(dispatch: Dispatch, ownProps: OP): DP {
     },
   }
 }
+
+export const ConfirmPickupContents = connect(
+  null,
+  mapDispatchToProps
+)(ConfirmPickupPrompt)
diff --git a/app/src/pages/Calibrate/CalibrateLabware/ConfirmPickupPrompt.tsx b/app/src/pages/Calibrate/CalibrateLabware/ConfirmPickupPrompt.tsx
index 41b08baf244..894d7316303 100644
--- a/app/src/pages/Calibrate/CalibrateLabware/ConfirmPickupPrompt.tsx
+++ b/app/src/pages/Calibrate/CalibrateLabware/ConfirmPickupPrompt.tsx
@@ -1,4 +1,3 @@
-// @flow
 // pickup confirmation prompt component for ConfirmPickupContents
 import * as React from 'react'
 
@@ -7,16 +6,16 @@ import styles from './styles.css'
 
 import type { Labware, Pipette } from '../../../redux/robot/types'
 
-export type ConfirmPickupPromptProps = {|
-  labware: Labware,
-  calibrator: Pipette,
-  onNoClick: () => void,
-  onYesClick: () => void,
-|}
+export interface ConfirmPickupPromptProps {
+  labware: Labware
+  calibrator: Pipette
+  onNoClick: () => void
+  onYesClick: () => void
+}
 
 export function ConfirmPickupPrompt(
   props: ConfirmPickupPromptProps
-): React.Node {
+): JSX.Element {
   const {
     onNoClick,
     onYesClick,
diff --git a/app/src/pages/Calibrate/CalibrateLabware/ConfirmPositionContents.tsx b/app/src/pages/Calibrate/CalibrateLabware/ConfirmPositionContents.tsx
index 98adf5ebac0..889115452b3 100644
--- a/app/src/pages/Calibrate/CalibrateLabware/ConfirmPositionContents.tsx
+++ b/app/src/pages/Calibrate/CalibrateLabware/ConfirmPositionContents.tsx
@@ -1,9 +1,7 @@
-// @flow
 // container for position confirmation logic in ConfirmationModal
 import * as React from 'react'
 import { connect } from 'react-redux'
 
-import type { Dispatch } from '../../../redux/types'
 import type { Pipette, Labware } from '../../../redux/robot'
 
 import { actions as robotActions } from '../../../redux/robot'
@@ -11,35 +9,24 @@ import { PrimaryButton } from '@opentrons/components'
 import { ConfirmPositionDiagram } from './ConfirmPositionDiagram'
 import { JogControls } from '../../../molecules/JogControls'
 
+import type { MapDispatchToProps } from 'react-redux'
 import type { Jog } from '../../../molecules/JogControls'
 
-type OP = {|
-  labware: Labware,
-  calibrator: Pipette,
-  calibrateToBottom: boolean,
-  useCenteredTroughs: boolean,
-|}
-
-type DP = {|
-  onConfirmClick: () => mixed,
-  jog: Jog,
-|}
+interface OP {
+  labware: Labware
+  calibrator: Pipette
+  calibrateToBottom: boolean
+  useCenteredTroughs: boolean
+}
 
-type Props = {| ...OP, ...DP |}
+interface DP {
+  onConfirmClick: () => unknown
+  jog: Jog
+}
 
-export const ConfirmPositionContents: React.AbstractComponent<OP> = connect<
-  Props,
-  OP,
-  _,
-  _,
-  _,
-  _
->(
-  null,
-  mapDispatchToProps
-)(ConfirmPositionContentsComponent)
+type Props = OP & DP
 
-function ConfirmPositionContentsComponent(props: Props) {
+function ConfirmPositionContentsComponent(props: Props): JSX.Element {
   const {
     jog,
     onConfirmClick,
@@ -67,7 +54,7 @@ function ConfirmPositionContentsComponent(props: Props) {
   )
 }
 
-function mapDispatchToProps(dispatch: Dispatch, ownProps: OP): DP {
+const mapDispatchToProps: MapDispatchToProps<DP, OP> = (dispatch, ownProps) => {
   const { slot, isTiprack } = ownProps.labware
   const { mount } = ownProps.calibrator
 
@@ -82,3 +69,8 @@ function mapDispatchToProps(dispatch: Dispatch, ownProps: OP): DP {
     onConfirmClick: () => dispatch(onConfirmAction),
   }
 }
+
+export const ConfirmPositionContents = connect(
+  null,
+  mapDispatchToProps
+)(ConfirmPositionContentsComponent)
diff --git a/app/src/pages/Calibrate/CalibrateLabware/ConfirmPositionDiagram.tsx b/app/src/pages/Calibrate/CalibrateLabware/ConfirmPositionDiagram.tsx
index bc4235538dd..d2586006fa9 100644
--- a/app/src/pages/Calibrate/CalibrateLabware/ConfirmPositionDiagram.tsx
+++ b/app/src/pages/Calibrate/CalibrateLabware/ConfirmPositionDiagram.tsx
@@ -1,4 +1,3 @@
-// @flow
 // diagram and instructions for ConfirmPositionContents
 import * as React from 'react'
 import { ALIGN_STRETCH, Flex } from '@opentrons/components'
@@ -8,17 +7,17 @@ import type { Labware, Pipette } from '../../../redux/robot'
 import { InstructionStep } from '../../../molecules/InstructionStep'
 import { getInstructionsByType, getDiagramSrc } from './instructions-data'
 
-export type LabwareCalibrationProps = {|
-  labware: Labware,
-  calibrator: Pipette,
-  calibrateToBottom: boolean,
-  buttonText: string,
-  useCenteredTroughs: boolean,
-|}
+export interface LabwareCalibrationProps {
+  labware: Labware
+  calibrator: Pipette
+  calibrateToBottom: boolean
+  buttonText: string
+  useCenteredTroughs: boolean
+}
 
 export function ConfirmPositionDiagram(
   props: LabwareCalibrationProps
-): React.Node {
+): JSX.Element {
   const instructions = getInstructionsByType(props)
   const diagrams = getDiagramSrc(props)
 
diff --git a/app/src/pages/Calibrate/CalibrateLabware/InProgressContents.tsx b/app/src/pages/Calibrate/CalibrateLabware/InProgressContents.tsx
index cdd22a295c3..0aef01d50f2 100644
--- a/app/src/pages/Calibrate/CalibrateLabware/InProgressContents.tsx
+++ b/app/src/pages/Calibrate/CalibrateLabware/InProgressContents.tsx
@@ -1,10 +1,9 @@
-// @flow
 // in progress spinner for ConfirmModalContents
 import * as React from 'react'
 
 import { Icon } from '@opentrons/components'
 import styles from './styles.css'
 
-export function InProgressContents(): React.Node {
+export function InProgressContents(): JSX.Element {
   return <Icon className={styles.spinner} name="ot-spinner" spin />
 }
diff --git a/app/src/pages/Calibrate/CalibrateLabware/InfoBox.tsx b/app/src/pages/Calibrate/CalibrateLabware/InfoBox.tsx
index 4c797c0d5d3..60e5100a048 100644
--- a/app/src/pages/Calibrate/CalibrateLabware/InfoBox.tsx
+++ b/app/src/pages/Calibrate/CalibrateLabware/InfoBox.tsx
@@ -1,4 +1,3 @@
-// @flow
 // info panel for labware calibration page
 import * as React from 'react'
 import capitalize from 'lodash/capitalize'
@@ -11,14 +10,17 @@ import { selectors as robotSelectors } from '../../../redux/robot'
 import { InfoBoxButton } from './InfoBoxButton'
 
 import type { Labware, LabwareType } from '../../../redux/robot/types'
+import type { IconName } from '@opentrons/components'
 
-export type InfoBoxProps = {| labware: ?Labware |}
+export interface InfoBoxProps {
+  labware: Labware | null | undefined
+}
 
-export function InfoBox(props: InfoBoxProps): React.Node {
+export function InfoBox(props: InfoBoxProps): JSX.Element {
   const { labware } = props
 
   let title = 'No labware selected'
-  let iconName = 'checkbox-blank-circle-outline'
+  let iconName: IconName = 'checkbox-blank-circle-outline'
   let description = 'Please select labware to continue'
 
   if (labware) {
diff --git a/app/src/pages/Calibrate/CalibrateLabware/InfoBoxButton.tsx b/app/src/pages/Calibrate/CalibrateLabware/InfoBoxButton.tsx
index 7b843a1e8bf..96d5deed594 100644
--- a/app/src/pages/Calibrate/CalibrateLabware/InfoBoxButton.tsx
+++ b/app/src/pages/Calibrate/CalibrateLabware/InfoBoxButton.tsx
@@ -1,4 +1,3 @@
-// @flow
 // info panel for labware calibration page
 import * as React from 'react'
 import { useSelector, useDispatch } from 'react-redux'
@@ -17,9 +16,11 @@ import type { Dispatch } from '../../../redux/types'
 
 import { ProceedToRun } from './ProceedToRun'
 
-export type InfoBoxButtonProps = {| labware: ?Labware |}
+export interface InfoBoxButtonProps {
+  labware: Labware | null | undefined
+}
 
-export function InfoBoxButton(props: InfoBoxButtonProps): React.Node {
+export function InfoBoxButton(props: InfoBoxButtonProps): JSX.Element | null {
   const { labware } = props
   const dispatch = useDispatch<Dispatch>()
 
@@ -32,7 +33,7 @@ export function InfoBoxButton(props: InfoBoxButtonProps): React.Node {
   const buttonTargetIsNext =
     buttonTarget != null && buttonTarget === nextLabwareTarget
   const targetConfirmed = buttonTarget && buttonTarget.confirmed
-  const mountToUse: ?Mount =
+  const mountToUse: Mount | null | undefined =
     (buttonTarget && buttonTarget.calibratorMount) || robotCalibratorMount
 
   if (!buttonTarget || (labware && labware.isMoving) || !mountToUse) return null
diff --git a/app/src/pages/Calibrate/CalibrateLabware/ProceedToRun.tsx b/app/src/pages/Calibrate/CalibrateLabware/ProceedToRun.tsx
index d0d4cfdccb4..5b98b40d5b4 100644
--- a/app/src/pages/Calibrate/CalibrateLabware/ProceedToRun.tsx
+++ b/app/src/pages/Calibrate/CalibrateLabware/ProceedToRun.tsx
@@ -1,4 +1,3 @@
-// @flow
 // info panel for labware calibration page
 import * as React from 'react'
 import { useSelector, useDispatch } from 'react-redux'
@@ -15,11 +14,11 @@ import { THERMOCYCLER_MODULE_TYPE, getModuleType } from '../../../redux/modules'
 
 const IS_HOMING_MESSAGE = 'Returning tip and homing robot'
 
-export type ProceedToRunProps = {|
-  returnTip: () => mixed,
-|}
+export interface ProceedToRunProps {
+  returnTip: () => unknown
+}
 
-export function ProceedToRun(props: ProceedToRunProps): React.Node {
+export function ProceedToRun(props: ProceedToRunProps): JSX.Element {
   const { returnTip } = props
   const dispatch = useDispatch<Dispatch>()
   const sessionModules = useSelector(robotSelectors.getModules)
@@ -38,7 +37,7 @@ export function ProceedToRun(props: ProceedToRunProps): React.Node {
     }
   }, [sessionModules])
 
-  const handleClick = () => {
+  const handleClick = (): void => {
     returnTip()
     if (mustPrepForRun) {
       setRunPrepModalOpen(true)
diff --git a/app/src/pages/Calibrate/CalibrateLabware/index.tsx b/app/src/pages/Calibrate/CalibrateLabware/index.tsx
index 142779f4848..6e1f00989ec 100644
--- a/app/src/pages/Calibrate/CalibrateLabware/index.tsx
+++ b/app/src/pages/Calibrate/CalibrateLabware/index.tsx
@@ -1,4 +1,3 @@
-// @flow
 // info panel and controls for labware calibration page
 import * as React from 'react'
 import { withRouter } from 'react-router-dom'
@@ -7,16 +6,16 @@ import { DeckMap } from '../../../molecules/DeckMap'
 import { InfoBox } from './InfoBox'
 import styles from './styles.css'
 
-import type { ContextRouter } from 'react-router-dom'
+import type { RouteComponentProps } from 'react-router-dom'
 import type { Labware } from '../../../redux/robot/types'
 
-type Props = {| ...ContextRouter, labware: ?Labware |}
+interface Props extends RouteComponentProps<{ slot: string }> {
+  labware: Labware | null | undefined
+}
 
-export const CalibrateLabware: React.AbstractComponent<
-  $Diff<Props, ContextRouter>
-> = withRouter(CalibrateLabwareComponent)
+export const CalibrateLabware = withRouter(CalibrateLabwareComponent)
 
-function CalibrateLabwareComponent(props: Props) {
+function CalibrateLabwareComponent(props: Props): JSX.Element {
   return (
     <div className={styles.calibrate_labware_wrapper}>
       <InfoBox labware={props.labware} />
diff --git a/app/src/pages/Calibrate/CalibrateLabware/instructions-data.tsx b/app/src/pages/Calibrate/CalibrateLabware/instructions-data.tsx
index c3ccecce1f3..7bfc7b5426d 100644
--- a/app/src/pages/Calibrate/CalibrateLabware/instructions-data.tsx
+++ b/app/src/pages/Calibrate/CalibrateLabware/instructions-data.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import type { LabwareCalibrationProps } from './ConfirmPositionDiagram'
 
@@ -13,10 +12,7 @@ type TypeKey =
   | 'reservoir'
   | 'reservoirCentered'
 
-const DIAGRAMS: {
-  [TypeKey]: { [Channels]: { [Step]: string, ... }, ... },
-  ...
-} = {
+const DIAGRAMS: Record<TypeKey, Record<Channels, Record<Step, string>>> = {
   tiprack: {
     single: {
       one: require('./images/step-1-tiprack-single@3x.png'),
@@ -89,10 +85,10 @@ const DIAGRAMS: {
   },
 }
 
-const DIAGRAMS_BOTTOM: {
-  [TypeKey]: { [Channels]: { [Step]: string, ... }, ... },
-  ...
-} = {
+const DIAGRAMS_BOTTOM: Record<
+  TypeKey,
+  Record<Channels, Record<Step, string>>
+> = {
   tiprack: {
     single: {
       one: require('./images/step-1-tiprack-single@3x.png'),
@@ -165,10 +161,10 @@ const DIAGRAMS_BOTTOM: {
   },
 }
 
-const INSTRUCTIONS: {
-  [TypeKey]: { [Channels]: { [Step]: React.Node, ... }, ... },
-  ...
-} = {
+const INSTRUCTIONS: Record<
+  TypeKey,
+  Record<Channels, Record<Step, React.ReactNode>>
+> = {
   tiprack: {
     single: {
       one: 'Jog pipette until it is centered above tip A1.',
@@ -302,10 +298,10 @@ const INSTRUCTIONS: {
   },
 }
 
-const INSTRUCTIONS_BOTTOM: {
-  [TypeKey]: { [Channels]: { [Step]: React.Node, ... }, ... },
-  ...
-} = {
+const INSTRUCTIONS_BOTTOM: Record<
+  TypeKey,
+  Record<Channels, Record<Step, React.ReactNode>>
+> = {
   tiprack: {
     single: {
       one: 'Jog pipette until it is centered above tip A1.',
@@ -441,7 +437,7 @@ const INSTRUCTIONS_BOTTOM: {
 
 export function getDiagramSrc(
   props: LabwareCalibrationProps
-): { [Step]: string, ... } {
+): Record<Step, string> {
   const typeKey = getTypeKey(props)
   const channelsKey = getChannelsKey(props)
   if (props.calibrateToBottom) {
@@ -452,7 +448,7 @@ export function getDiagramSrc(
 
 export function getInstructionsByType(
   props: LabwareCalibrationProps
-): { [Step]: React.Node, ... } {
+): Record<Step, React.ReactNode> {
   const typeKey = getTypeKey(props)
   const channelsKey = getChannelsKey(props)
 
@@ -462,10 +458,10 @@ export function getInstructionsByType(
   return INSTRUCTIONS[typeKey][channelsKey]
 }
 
-function getTypeKey(props: LabwareCalibrationProps) {
+function getTypeKey(props: LabwareCalibrationProps): TypeKey {
   const { labware, useCenteredTroughs } = props
   const { type, isTiprack } = labware
-  let typeKey
+  let typeKey: TypeKey
   if (isTiprack) {
     typeKey = 'tiprack'
   } else if (type.includes('trough')) {
@@ -486,7 +482,7 @@ function getTypeKey(props: LabwareCalibrationProps) {
   return typeKey
 }
 
-function getChannelsKey(props: LabwareCalibrationProps) {
+function getChannelsKey(props: LabwareCalibrationProps): Channels {
   const { channels } = props.calibrator
   const channelsKey = channels === 8 ? 'multi' : 'single'
   return channelsKey
diff --git a/app/src/pages/Calibrate/CalibratePanel/CalibrationData.tsx b/app/src/pages/Calibrate/CalibratePanel/CalibrationData.tsx
index 2e5546e51c0..3ba10006bf7 100644
--- a/app/src/pages/Calibrate/CalibratePanel/CalibrationData.tsx
+++ b/app/src/pages/Calibrate/CalibratePanel/CalibrationData.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { useTranslation } from 'react-i18next'
 
@@ -6,11 +5,11 @@ import { Flex, Text, DIRECTION_COLUMN, SPACING_2 } from '@opentrons/components'
 import { CalibrationValues } from '../CalibrateLabware/CalibrationValues'
 import type { LabwareCalibrationData } from '../../../redux/calibration/labware/types'
 
-export function CalibrationData(props: {|
-  calibrationData: LabwareCalibrationData | null,
-  calibratedThisSession: boolean,
-  calDataAvailable: boolean,
-|}): React.Node {
+export function CalibrationData(props: {
+  calibrationData: LabwareCalibrationData | null
+  calibratedThisSession: boolean
+  calDataAvailable: boolean
+}): JSX.Element {
   const { calibrationData, calibratedThisSession, calDataAvailable } = props
 
   const { t } = useTranslation('protocol_calibration')
diff --git a/app/src/pages/Calibrate/CalibratePanel/LabwareGroup.tsx b/app/src/pages/Calibrate/CalibratePanel/LabwareGroup.tsx
index 226436e0b76..c59f7775eff 100644
--- a/app/src/pages/Calibrate/CalibratePanel/LabwareGroup.tsx
+++ b/app/src/pages/Calibrate/CalibratePanel/LabwareGroup.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { useSelector, useDispatch } from 'react-redux'
 import { useTranslation } from 'react-i18next'
@@ -13,13 +12,13 @@ import { LabwareListItem } from './LabwareListItem'
 import type { BaseProtocolLabware } from '../../../redux/calibration/types'
 import type { Dispatch } from '../../../redux/types'
 
-export type LabwareGroupProps = {|
-  robotName: string | null,
-  tipracks: Array<BaseProtocolLabware>,
-  otherLabware: Array<BaseProtocolLabware>,
-|}
+export interface LabwareGroupProps {
+  robotName: string | null
+  tipracks: BaseProtocolLabware[]
+  otherLabware: BaseProtocolLabware[]
+}
 
-export function LabwareGroup(props: LabwareGroupProps): React.Node {
+export function LabwareGroup(props: LabwareGroupProps): JSX.Element {
   const { robotName, tipracks, otherLabware } = props
 
   const { t } = useTranslation('protocol_calibration')
@@ -40,7 +39,7 @@ export function LabwareGroup(props: LabwareGroupProps): React.Node {
     robotName && dispatch(fetchLabwareCalibrations(robotName))
   }, [dispatch, robotName])
 
-  const setLabwareToCalibrate = (lw: BaseProtocolLabware) => {
+  const setLabwareToCalibrate = (lw: BaseProtocolLabware): void => {
     const calibrator = lw.calibratorMount || calibratorMount
     if (!!deckPopulated && calibrator) {
       dispatch(robotActions.moveTo(calibrator, lw.slot))
diff --git a/app/src/pages/Calibrate/CalibratePanel/LabwareListItem.tsx b/app/src/pages/Calibrate/CalibratePanel/LabwareListItem.tsx
index 10c32183cdc..a123965a341 100644
--- a/app/src/pages/Calibrate/CalibratePanel/LabwareListItem.tsx
+++ b/app/src/pages/Calibrate/CalibratePanel/LabwareListItem.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import cx from 'classnames'
 
@@ -21,13 +20,12 @@ import { CalibrationData } from './CalibrationData'
 import type { BaseProtocolLabware } from '../../../redux/calibration/labware/types'
 import styles from './styles.css'
 
-export type LabwareListItemProps = {|
-  ...BaseProtocolLabware,
-  isDisabled: boolean,
-  onClick: () => mixed,
-|}
+export interface LabwareListItemProps extends BaseProtocolLabware {
+  isDisabled: boolean
+  onClick: () => unknown
+}
 
-export function LabwareListItem(props: LabwareListItemProps): React.Node {
+export function LabwareListItem(props: LabwareListItemProps): JSX.Element {
   const {
     name,
     type,
diff --git a/app/src/pages/Calibrate/CalibratePanel/PipetteList.tsx b/app/src/pages/Calibrate/CalibratePanel/PipetteList.tsx
index 53162f00ba0..0a39a95ef70 100644
--- a/app/src/pages/Calibrate/CalibratePanel/PipetteList.tsx
+++ b/app/src/pages/Calibrate/CalibratePanel/PipetteList.tsx
@@ -1,8 +1,7 @@
-// @flow
 import * as React from 'react'
 import { useSelector, useDispatch } from 'react-redux'
 import { useTranslation } from 'react-i18next'
-import { withRouter } from 'react-router-dom'
+import { RouteComponentProps, withRouter } from 'react-router-dom'
 import uniqBy from 'lodash/uniqBy'
 
 import { selectors as robotSelectors } from '../../../redux/robot'
@@ -25,18 +24,17 @@ import { PipetteTiprackListItem } from './PipetteTiprackListItem'
 import type { BaseProtocolLabware } from '../../../redux/calibration/types'
 import type { Dispatch, State } from '../../../redux/types'
 
-export type PipetteListComponentProps = {|
-  robotName: string | null,
-  tipracks: Array<BaseProtocolLabware>,
-|}
+export interface PipetteListComponentProps extends RouteComponentProps {
+  robotName: string | null
+  tipracks: BaseProtocolLabware[]
+}
 
-export const PipetteList: React.AbstractComponent<PipetteListComponentProps> = withRouter(
-  PipetteListComponent
-)
+// TODO(bc, 2021-05-17): remove this withRouter? it seems unused
+export const PipetteList = withRouter(PipetteListComponent)
 
 export function PipetteListComponent(
   props: PipetteListComponentProps
-): React.Node {
+): JSX.Element {
   const { t } = useTranslation('protocol_calibration')
   const dispatch = useDispatch<Dispatch>()
 
@@ -53,7 +51,7 @@ export function PipetteListComponent(
 
   return (
     <TitledList
-      key={t('tip_length_cal_title')}
+      key={t<string>('tip_length_cal_title')}
       title={t('tip_length_cal_title')}
     >
       {PIPETTE_MOUNTS.map(mount => {
@@ -62,7 +60,7 @@ export function PipetteListComponent(
         const attachedPipette = attachedPipettes[mount]
         const displayName = protocolPipette?.modelSpecs?.displayName || 'N/A'
         const { disabledReason = null } = urlsByMount[mount].default
-        const pip_tipracks = uniqBy(
+        const pipTipracks = uniqBy(
           tipracks.filter(
             t =>
               t.calibratorMount === mount ||
@@ -75,7 +73,7 @@ export function PipetteListComponent(
         const calibratePathFor = (
           mount: 'left' | 'right',
           hash: string | null
-        ) => {
+        ): string => {
           const url =
             urlsByMount[mount][hash ?? 'default'] ??
             urlsByMount[mount]['default']
@@ -101,8 +99,8 @@ export function PipetteListComponent(
                 disabled={!!disabledReason}
               />
             </Flex>
-            {pip_tipracks?.length
-              ? pip_tipracks?.map(tr => {
+            {pipTipracks?.length
+              ? pipTipracks?.map(tr => {
                   return (
                     <PipetteTiprackListItem
                       {...tr}
diff --git a/app/src/pages/Calibrate/CalibratePanel/PipetteTiprackListItem.tsx b/app/src/pages/Calibrate/CalibratePanel/PipetteTiprackListItem.tsx
index b4d88725056..d65e7a42ca4 100644
--- a/app/src/pages/Calibrate/CalibratePanel/PipetteTiprackListItem.tsx
+++ b/app/src/pages/Calibrate/CalibratePanel/PipetteTiprackListItem.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { useSelector } from 'react-redux'
 
@@ -25,16 +24,15 @@ import { getTipLengthForPipetteAndTiprack } from '../../../redux/calibration'
 
 const MARGIN_LEFT_SIZE = '1.6rem'
 
-export type PipetteTiprackListItemProps = {|
-  ...BaseProtocolLabware,
-  robotName: string | null,
-  pipette: AttachedPipette | null,
-  calibrateUrl: string | null,
-|}
+export interface PipetteTiprackListItemProps extends BaseProtocolLabware {
+  robotName: string | null
+  pipette: AttachedPipette | null
+  calibrateUrl: string | null
+}
 
 export function PipetteTiprackListItem(
   props: PipetteTiprackListItemProps
-): React.Node {
+): JSX.Element {
   const {
     name,
     definition,
diff --git a/app/src/pages/Calibrate/CalibratePanel/TipLengthCalibrationData.tsx b/app/src/pages/Calibrate/CalibratePanel/TipLengthCalibrationData.tsx
index 730863211af..38eda417c54 100644
--- a/app/src/pages/Calibrate/CalibratePanel/TipLengthCalibrationData.tsx
+++ b/app/src/pages/Calibrate/CalibratePanel/TipLengthCalibrationData.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { useTranslation } from 'react-i18next'
 import {
@@ -10,14 +9,14 @@ import {
 } from '@opentrons/components'
 import type { TipLengthCalibration } from '../../../redux/calibration/api-types'
 
-export type TipLengthCalibrationDataProps = {|
-  calibrationData: TipLengthCalibration | null,
-  calDataAvailable: boolean,
-|}
+export interface TipLengthCalibrationDataProps {
+  calibrationData: TipLengthCalibration | null
+  calDataAvailable: boolean
+}
 
 export function TipLengthCalibrationData(
   props: TipLengthCalibrationDataProps
-): React.Node {
+): JSX.Element {
   const { calibrationData, calDataAvailable } = props
   const { t } = useTranslation('protocol_calibration')
 
diff --git a/app/src/pages/Calibrate/CalibratePanel/__tests__/CalibrationData.test.tsx b/app/src/pages/Calibrate/CalibratePanel/__tests__/CalibrationData.test.tsx
index eb03005dfa4..56e5c0b4c0d 100644
--- a/app/src/pages/Calibrate/CalibratePanel/__tests__/CalibrationData.test.tsx
+++ b/app/src/pages/Calibrate/CalibratePanel/__tests__/CalibrationData.test.tsx
@@ -1,12 +1,15 @@
-// @flow
 import * as React from 'react'
 import { mountWithProviders } from '@opentrons/components/__utils__'
 
 import { i18n } from '../../../../i18n'
 import { CalibrationData } from '../CalibrationData'
 
+import type { WrapperWithStore } from '@opentrons/components/__utils__'
+
 describe('CalibrationData', () => {
-  let render
+  let render: (
+    props?: Partial<React.ComponentProps<typeof CalibrationData>>
+  ) => WrapperWithStore<React.ComponentProps<typeof CalibrationData>>
 
   beforeEach(() => {
     render = (props = {}) => {
diff --git a/app/src/pages/Calibrate/CalibratePanel/__tests__/LabwareGroup.test.tsx b/app/src/pages/Calibrate/CalibratePanel/__tests__/LabwareGroup.test.tsx
index 969d3ae982a..7addfb91c34 100644
--- a/app/src/pages/Calibrate/CalibratePanel/__tests__/LabwareGroup.test.tsx
+++ b/app/src/pages/Calibrate/CalibratePanel/__tests__/LabwareGroup.test.tsx
@@ -1,11 +1,9 @@
-// @flow
 import * as React from 'react'
 import { mountWithProviders } from '@opentrons/components/__utils__'
 
 import { i18n } from '../../../../i18n'
 import wellPlate96Def from '@opentrons/shared-data/labware/fixtures/2/fixture_96_plate.json'
 import tiprack300Def from '@opentrons/shared-data/labware/fixtures/2/fixture_tiprack_300_ul.json'
-import type { State } from '../../../../redux/types'
 import type { BaseProtocolLabware } from '../../../../redux/calibration/labware/types'
 import { selectors as robotSelectors } from '../../../../redux/robot'
 import { fetchLabwareCalibrations } from '../../../../redux/calibration/labware'
@@ -14,38 +12,32 @@ import { LabwareGroup } from '../LabwareGroup'
 jest.mock('../../../../redux/robot/selectors')
 jest.mock('../../../../redux/calibration/labware/selectors')
 
-const mockGetCalibratorMount: JestMockFn<
-  [State],
-  $Call<typeof robotSelectors.getCalibratorMount, State>
-> = robotSelectors.getCalibratorMount
-
-const mockGetDeckPopulated: JestMockFn<
-  [State],
-  $Call<typeof robotSelectors.getDeckPopulated, State>
-> = robotSelectors.getDeckPopulated
-
-const mockGetTipracksConfirmed: JestMockFn<
-  [State],
-  $Call<typeof robotSelectors.getTipracksConfirmed, State>
-> = robotSelectors.getTipracksConfirmed
-
-const mockGetIsRunning: JestMockFn<
-  [State],
-  $Call<typeof robotSelectors.getIsRunning, State>
-> = robotSelectors.getIsRunning
-
-const mockGetConnectedRobotName: JestMockFn<
-  [State],
-  $Call<typeof robotSelectors.getConnectedRobotName, State>
-> = robotSelectors.getConnectedRobotName
-
-const mockGetModulesBySlot: JestMockFn<
-  [State],
-  $Call<typeof robotSelectors.getModulesBySlot, State>
-> = robotSelectors.getModulesBySlot
-
-const stubTipRacks = [
-  ({
+const mockGetCalibratorMount = robotSelectors.getCalibratorMount as jest.MockedFunction<
+  typeof robotSelectors.getCalibratorMount
+>
+
+const mockGetDeckPopulated = robotSelectors.getDeckPopulated as jest.MockedFunction<
+  typeof robotSelectors.getDeckPopulated
+>
+
+const mockGetTipracksConfirmed = robotSelectors.getTipracksConfirmed as jest.MockedFunction<
+  typeof robotSelectors.getTipracksConfirmed
+>
+
+const mockGetIsRunning = robotSelectors.getIsRunning as jest.MockedFunction<
+  typeof robotSelectors.getIsRunning
+>
+
+const mockGetConnectedRobotName = robotSelectors.getConnectedRobotName as jest.MockedFunction<
+  typeof robotSelectors.getConnectedRobotName
+>
+
+const mockGetModulesBySlot = robotSelectors.getModulesBySlot as jest.MockedFunction<
+  typeof robotSelectors.getModulesBySlot
+>
+
+const stubTipRacks: BaseProtocolLabware[] = [
+  {
     type: 'some_tiprack',
     definition: tiprack300Def,
     slot: '3',
@@ -55,8 +47,8 @@ const stubTipRacks = [
     confirmed: true,
     parent: null,
     calibrationData: null,
-  }: $Shape<BaseProtocolLabware>),
-  ({
+  } as any,
+  {
     type: 'some_other_tiprack',
     definition: null,
     slot: '1',
@@ -66,11 +58,11 @@ const stubTipRacks = [
     confirmed: true,
     parent: null,
     calibrationData: null,
-  }: $Shape<BaseProtocolLabware>),
+  } as any,
 ]
 
-const stubOtherLabware = [
-  ({
+const stubOtherLabware: BaseProtocolLabware[] = [
+  {
     type: 'some_wellplate',
     definition: wellPlate96Def,
     slot: '4',
@@ -80,8 +72,8 @@ const stubOtherLabware = [
     confirmed: true,
     parent: null,
     calibrationData: null,
-  }: $Shape<BaseProtocolLabware>),
-  ({
+  } as any,
+  {
     type: 'some_other_wellplate',
     definition: wellPlate96Def,
     slot: '7',
@@ -91,11 +83,13 @@ const stubOtherLabware = [
     confirmed: true,
     parent: null,
     calibrationData: null,
-  }: $Shape<BaseProtocolLabware>),
+  } as any,
 ]
 
 describe('LabwareGroup', () => {
-  let render
+  let render: (
+    props?: Partial<React.ComponentProps<typeof LabwareGroup>>
+  ) => ReturnType<typeof mountWithProviders>
 
   beforeEach(() => {
     mockGetConnectedRobotName.mockReturnValue('robotName')
diff --git a/app/src/pages/Calibrate/CalibratePanel/__tests__/PipetteList.test.tsx b/app/src/pages/Calibrate/CalibratePanel/__tests__/PipetteList.test.tsx
index c646b017f8d..53aec58ddd3 100644
--- a/app/src/pages/Calibrate/CalibratePanel/__tests__/PipetteList.test.tsx
+++ b/app/src/pages/Calibrate/CalibratePanel/__tests__/PipetteList.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { StaticRouter } from 'react-router-dom'
 import { mountWithProviders } from '@opentrons/components/__utils__'
@@ -11,29 +10,25 @@ import * as calibrateSelectors from '../../../../redux/nav/calibrate-selectors'
 import type { BaseProtocolLabware } from '../../../../redux/calibration/types'
 import tiprack300Def from '@opentrons/shared-data/labware/fixtures/2/fixture_tiprack_300_ul.json'
 import { fetchTipLengthCalibrations } from '../../../../redux/calibration/'
-import {
-  PipetteListComponent,
-  type PipetteListComponentProps,
-} from '../PipetteList'
+import { PipetteListComponent } from '../PipetteList'
 
-import type { State } from '../../../../redux/types'
+import type { PipetteListComponentProps } from '../PipetteList'
 
 jest.mock('../../../../redux/robot/selectors')
 jest.mock('../../../../redux/nav/calibrate-selectors')
 jest.mock('../../../../redux/pipettes/selectors')
 
-const mockGetProtocolPipettes: JestMockFn<
-  [State],
-  $Call<typeof robotSelectors.getPipettes, State>
-> = robotSelectors.getPipettes
+const mockGetProtocolPipettes = robotSelectors.getPipettes as jest.MockedFunction<
+  typeof robotSelectors.getPipettes
+>
 
-const mockGetCalibratePipetteLocations: JestMockFn<
-  [State],
-  $Call<typeof calibrateSelectors.getCalibratePipettesLocations, State>
-> = calibrateSelectors.getCalibratePipettesLocations
+const mockGetCalibratePipetteLocations = calibrateSelectors.getCalibratePipettesLocations as jest.MockedFunction<
+  typeof calibrateSelectors.getCalibratePipettesLocations
+>
 
-const mockGetAttachedPipettes: JestMockFn<[any, string], mixed> =
-  PipettesSelectors.getAttachedPipettes
+const mockGetAttachedPipettes = PipettesSelectors.getAttachedPipettes as jest.MockedFunction<
+  typeof PipettesSelectors.getAttachedPipettes
+>
 
 const mockLeftSpecs: any = {
   displayName: 'Left Pipette',
@@ -47,8 +42,8 @@ const mockLeftProtoPipette: any = {
   modelSpecs: mockLeftSpecs,
 }
 
-const stubTipRacks = [
-  ({
+const stubTipRacks: BaseProtocolLabware[] = [
+  {
     type: 'some_tiprack',
     definition: tiprack300Def,
     slot: '3',
@@ -58,8 +53,8 @@ const stubTipRacks = [
     confirmed: true,
     parent: null,
     calibrationData: null,
-  }: $Shape<BaseProtocolLabware>),
-  ({
+  } as any,
+  {
     type: 'some_other_tiprack',
     definition: null,
     slot: '1',
@@ -69,7 +64,7 @@ const stubTipRacks = [
     confirmed: true,
     parent: null,
     calibrationData: null,
-  }: $Shape<BaseProtocolLabware>),
+  } as any,
 ]
 
 const mockPipetteLocations = {
@@ -103,20 +98,25 @@ const mockPipetteLocations = {
   },
 }
 
-const mockAttachedPipettes = {
+const mockAttachedPipettes: ReturnType<
+  typeof PipettesSelectors.getAttachedPipettes
+> = {
   left: { model: 'p300_single_v2.0' },
   right: null,
-}
+} as any
 
 describe('PipetteListComponent', () => {
-  let render
+  let render: (
+    props: PipetteListComponentProps,
+    location?: string | undefined
+  ) => ReturnType<typeof mountWithProviders>
 
   beforeEach(() => {
     mockGetProtocolPipettes.mockReturnValue([mockLeftProtoPipette])
     mockGetCalibratePipetteLocations.mockReturnValue(mockPipetteLocations)
     mockGetAttachedPipettes.mockReturnValue(mockAttachedPipettes)
 
-    render = (props: PipetteListComponentProps, location: string = '/') => {
+    render = (props, location = '/') => {
       return mountWithProviders(
         <StaticRouter context={{}} location={location}>
           <PipetteListComponent {...props} />,
@@ -134,7 +134,7 @@ describe('PipetteListComponent', () => {
     const { store } = render({
       robotName: 'robotName',
       tipracks: stubTipRacks,
-    })
+    } as any)
 
     expect(store.dispatch).toHaveBeenCalledWith(
       fetchTipLengthCalibrations('robotName')
@@ -145,7 +145,7 @@ describe('PipetteListComponent', () => {
     const { wrapper } = render({
       robotName: 'robotName',
       tipracks: stubTipRacks,
-    })
+    } as any)
     const component = wrapper.find(PipetteListComponent)
 
     expect(
diff --git a/app/src/pages/Calibrate/CalibratePanel/__tests__/TipLengthCalibrationData.test.tsx b/app/src/pages/Calibrate/CalibratePanel/__tests__/TipLengthCalibrationData.test.tsx
index 3f04a9978cc..a849cb7892a 100644
--- a/app/src/pages/Calibrate/CalibratePanel/__tests__/TipLengthCalibrationData.test.tsx
+++ b/app/src/pages/Calibrate/CalibratePanel/__tests__/TipLengthCalibrationData.test.tsx
@@ -1,12 +1,15 @@
-// @flow
 import * as React from 'react'
 import { mountWithProviders } from '@opentrons/components/__utils__'
 
 import { i18n } from '../../../../i18n'
 import { TipLengthCalibrationData } from '../TipLengthCalibrationData'
 
+import type { WrapperWithStore } from '@opentrons/components/__utils__'
+
 describe('TipLengthCalibrationData', () => {
-  let render
+  let render: (
+    props?: Partial<React.ComponentProps<typeof TipLengthCalibrationData>>
+  ) => WrapperWithStore<React.ComponentProps<typeof TipLengthCalibrationData>>
 
   beforeEach(() => {
     render = (props = {}) => {
diff --git a/app/src/pages/Calibrate/CalibratePanel/index.tsx b/app/src/pages/Calibrate/CalibratePanel/index.tsx
index baabf8c7675..6d8cdcf7adb 100644
--- a/app/src/pages/Calibrate/CalibratePanel/index.tsx
+++ b/app/src/pages/Calibrate/CalibratePanel/index.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { useSelector } from 'react-redux'
 import partition from 'lodash/partition'
@@ -14,7 +13,7 @@ import styles from './styles.css'
 
 import type { State } from '../../../redux/types'
 
-export function CalibratePanel(): React.Node {
+export function CalibratePanel(): JSX.Element {
   const { t } = useTranslation('protocol_calibration')
   const robotName = useSelector(robotSelectors.getConnectedRobotName)
 
diff --git a/app/src/pages/Calibrate/CalibrateTipLengthControl.tsx b/app/src/pages/Calibrate/CalibrateTipLengthControl.tsx
index 0ec1071a32b..1531520857f 100644
--- a/app/src/pages/Calibrate/CalibrateTipLengthControl.tsx
+++ b/app/src/pages/Calibrate/CalibrateTipLengthControl.tsx
@@ -1,15 +1,7 @@
-// @flow
 import * as React from 'react'
 import { useSelector, useDispatch } from 'react-redux'
-import {
-  type Mount,
-  useConditionalConfirm,
-  SpinnerModalPage,
-} from '@opentrons/components'
-import {
-  getLabwareDisplayName,
-  type LabwareDefinition2,
-} from '@opentrons/shared-data'
+import { useConditionalConfirm, SpinnerModalPage } from '@opentrons/components'
+import { getLabwareDisplayName } from '@opentrons/shared-data'
 import * as RobotApi from '../../redux/robot-api'
 import * as Sessions from '../../redux/sessions'
 import * as Config from '../../redux/config'
@@ -42,20 +34,22 @@ import type {
 } from '../../redux/sessions/types'
 import type { RequestState } from '../../redux/robot-api/types'
 import type { TipracksByMountMap } from '../../redux/robot'
+import type { Mount } from '@opentrons/components'
+import type { LabwareDefinition2 } from '@opentrons/shared-data'
 
 const TIP_LENGTH_CALIBRATION = 'tip length calibration'
 const EXIT = 'exit'
 
-export type CalibrateTipLengthControlProps = {|
-  robotName: string,
-  hasCalibrated: boolean,
-  mount: Mount,
-  tipRackDefinition: LabwareDefinition2,
-  isExtendedPipOffset: boolean,
-|}
+export interface CalibrateTipLengthControlProps {
+  robotName: string
+  hasCalibrated: boolean
+  mount: Mount
+  tipRackDefinition: LabwareDefinition2
+  isExtendedPipOffset: boolean
+}
 
 // tip length calibration commands for which the full page spinner should not appear
-const spinnerCommandBlockList: Array<SessionCommandString> = [
+const spinnerCommandBlockList: SessionCommandString[] = [
   Sessions.sharedCalCommands.JOG,
 ]
 
@@ -65,7 +59,7 @@ export function CalibrateTipLengthControl({
   mount,
   tipRackDefinition,
   isExtendedPipOffset,
-}: CalibrateTipLengthControlProps): React.Node {
+}: CalibrateTipLengthControlProps): JSX.Element {
   const createRequestId = React.useRef<string | null>(null)
   const trackedRequestId = React.useRef<string | null>(null)
   const jogRequestId = React.useRef<string | null>(null)
@@ -107,12 +101,14 @@ export function CalibrateTipLengthControl({
         dispatchedAction.type === Sessions.ENSURE_SESSION &&
         dispatchedAction.payload.sessionType === sessionType
       ) {
+        // @ts-expect-error TODO: account for possible absence of requestId on meta
         createRequestId.current = dispatchedAction.meta.requestId
       } else if (
         dispatchedAction.type === Sessions.CREATE_SESSION_COMMAND &&
         dispatchedAction.payload.command.command ===
           Sessions.sharedCalCommands.JOG
       ) {
+        // @ts-expect-error TODO: account for possible absence of requestId on meta
         jogRequestId.current = dispatchedAction.meta.requestId
       } else if (
         dispatchedAction.type !== Sessions.CREATE_SESSION_COMMAND ||
@@ -120,6 +116,7 @@ export function CalibrateTipLengthControl({
           dispatchedAction.payload.command.command
         )
       ) {
+        // @ts-expect-error TODO: account for possible absence of meta on action, requestId on meta
         trackedRequestId.current = dispatchedAction.meta.requestId
       }
     }
@@ -139,7 +136,7 @@ export function CalibrateTipLengthControl({
   const configHasCalibrationBlock = useSelector(Config.getHasCalibrationBlock)
   const [showCalBlockModal, setShowCalBlockModal] = React.useState(false)
 
-  const handleStart = (hasBlockModalResponse: boolean | null = null) => {
+  const handleStart = (hasBlockModalResponse: boolean | null = null): void => {
     if (hasBlockModalResponse === null && configHasCalibrationBlock === null) {
       setShowCalBlockModal(true)
     } else {
@@ -180,9 +177,11 @@ export function CalibrateTipLengthControl({
         : null
     )?.status === RobotApi.PENDING
 
-  const uncalibratedTipracksByMount: TipracksByMountMap = useSelector(state => {
-    return getUncalibratedTipracksByMount(state, robotName)
-  })
+  const uncalibratedTipracksByMount: TipracksByMountMap = useSelector(
+    (state: State) => {
+      return getUncalibratedTipracksByMount(state, robotName)
+    }
+  )
 
   const { confirm, showConfirmation, cancel } = useConditionalConfirm(
     handleStart,
diff --git a/app/src/pages/Calibrate/ConnectModules/Prompt.tsx b/app/src/pages/Calibrate/ConnectModules/Prompt.tsx
index ce9f46bb9c8..19512fbb6ea 100644
--- a/app/src/pages/Calibrate/ConnectModules/Prompt.tsx
+++ b/app/src/pages/Calibrate/ConnectModules/Prompt.tsx
@@ -1,4 +1,3 @@
-// @flow
 // prompt for ReviewModulesModal of labware calibration page
 import * as React from 'react'
 import { useSelector, useDispatch } from 'react-redux'
@@ -33,13 +32,13 @@ import type { Dispatch } from '../../../redux/types'
 const SUPPORT_PAGE =
   'https://support.opentrons.com/en/articles/5167312-using-modules-of-the-same-type-on-the-ot-2'
 
-export type PromptProps = {|
-  modulesMissing: boolean,
-  onPromptClick: () => mixed,
-  hasDuplicateModules: boolean,
-|}
+export interface PromptProps {
+  modulesMissing: boolean
+  onPromptClick: () => unknown
+  hasDuplicateModules: boolean
+}
 
-export function Prompt(props: PromptProps): React.Node {
+export function Prompt(props: PromptProps): JSX.Element {
   const { modulesMissing, onPromptClick, hasDuplicateModules } = props
   const { t } = useTranslation('protocol_calibration')
   const [targetProps, tooltipProps] = useHoverTooltip()
diff --git a/app/src/pages/Calibrate/ConnectModules/index.tsx b/app/src/pages/Calibrate/ConnectModules/index.tsx
index 8438d80cf70..1aa868cf688 100644
--- a/app/src/pages/Calibrate/ConnectModules/index.tsx
+++ b/app/src/pages/Calibrate/ConnectModules/index.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { connect } from 'react-redux'
 
@@ -12,33 +11,27 @@ import { DeckMap } from '../../../molecules/DeckMap'
 import { Prompt } from './Prompt'
 import styles from './styles.css'
 
-import type { State, Dispatch } from '../../../redux/types'
+import type { MapDispatchToProps } from 'react-redux'
+import type { State } from '../../../redux/types'
 
-type OP = {| robotName: string |}
+interface OP {
+  robotName: string
+}
 
-type SP = {|
-  modulesRequired: boolean,
-  modulesMissing: boolean,
-  hasDuplicateModules: boolean,
-|}
+interface SP {
+  modulesRequired: boolean
+  modulesMissing: boolean
+  hasDuplicateModules: boolean
+}
 
-type DP = {| setReviewed: () => mixed, fetchModules: () => mixed |}
+interface DP {
+  setReviewed: () => unknown
+  fetchModules: () => unknown
+}
 
-type Props = {| ...OP, ...SP, ...DP |}
+type Props = OP & SP & DP
 
-export const ConnectModules: React.AbstractComponent<OP> = connect<
-  Props,
-  OP,
-  SP,
-  DP,
-  State,
-  Dispatch
->(
-  mapStateToProps,
-  mapDispatchToProps
-)(ConnectModulesComponent)
-
-function ConnectModulesComponent(props: Props) {
+function ConnectModulesComponent(props: Props): JSX.Element | null {
   if (!props.modulesRequired) return null
 
   const {
@@ -75,9 +68,14 @@ function mapStateToProps(state: State, ownProps: OP): SP {
   }
 }
 
-function mapDispatchToProps(dispatch: Dispatch, ownProps: OP): DP {
+const mapDispatchToProps: MapDispatchToProps<DP, OP> = (dispatch, ownProps) => {
   return {
     setReviewed: () => dispatch(robotActions.setModulesReviewed(true)),
     fetchModules: () => dispatch(fetchModules(ownProps.robotName)),
   }
 }
+
+export const ConnectModules = connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(ConnectModulesComponent)
diff --git a/app/src/pages/Calibrate/Labware.tsx b/app/src/pages/Calibrate/Labware.tsx
index e99c6cefa52..2cdec50350c 100644
--- a/app/src/pages/Calibrate/Labware.tsx
+++ b/app/src/pages/Calibrate/Labware.tsx
@@ -1,4 +1,3 @@
-// @flow
 // setup labware page
 import * as React from 'react'
 import { connect } from 'react-redux'
@@ -16,31 +15,27 @@ import { ConfirmModal } from './CalibrateLabware/ConfirmModal'
 import { ConnectModules } from './ConnectModules'
 import { PrepareModules } from './PrepareModules'
 
-import type { ContextRouter } from 'react-router-dom'
-import type { State, Dispatch } from '../../redux/types'
+import type { RouteComponentProps } from 'react-router-dom'
+import type { State } from '../../redux/types'
 import type { Labware as RobotLabware } from '../../redux/robot/types'
 import type { AttachedModule } from '../../redux/modules/types'
 
-type OP = ContextRouter
+type OP = RouteComponentProps<{ slot: string }>
 
-type SP = {|
-  deckPopulated: boolean,
-  labware: ?RobotLabware,
-  calibrateToBottom: boolean,
-  robotName: string | null,
-  hasModulesLeftToReview: ?boolean,
-  unpreparedModules: Array<AttachedModule>,
-|}
+interface SP {
+  deckPopulated: boolean
+  labware?: RobotLabware | null
+  calibrateToBottom: boolean
+  robotName: string | null
+  hasModulesLeftToReview: boolean | null | undefined
+  unpreparedModules: AttachedModule[]
+}
 
-type Props = {| ...OP, ...SP, dispatch: Dispatch |}
+type Props = OP & SP
 
-export const Labware: React.AbstractComponent<
-  $Diff<OP, ContextRouter>
-> = withRouter(
-  connect<Props, OP, SP, _, _, _>(mapStateToProps)(LabwareComponent)
-)
+export const Labware = withRouter(connect(mapStateToProps)(LabwareComponent))
 
-function LabwareComponent(props: Props) {
+function LabwareComponent(props: Props): JSX.Element {
   const {
     robotName,
     calibrateToBottom,
@@ -58,7 +53,7 @@ function LabwareComponent(props: Props) {
     return <Redirect to="/" />
   }
 
-  const renderPage = () => {
+  const renderPage = (): JSX.Element => {
     if (hasModulesLeftToReview) {
       return <ConnectModules robotName={robotName} />
     } else if (unpreparedModules.length > 0) {
diff --git a/app/src/pages/Calibrate/Modules.tsx b/app/src/pages/Calibrate/Modules.tsx
index 2a859d3d8a8..ebfe784937c 100644
--- a/app/src/pages/Calibrate/Modules.tsx
+++ b/app/src/pages/Calibrate/Modules.tsx
@@ -1,4 +1,3 @@
-// @flow
 // setup modules page
 import * as React from 'react'
 import { useSelector } from 'react-redux'
@@ -9,7 +8,7 @@ import { SessionHeader } from '../../organisms/SessionHeader'
 
 import { Page } from '../../atoms/Page'
 
-export function Modules(): React.Node {
+export function Modules(): JSX.Element | null {
   const robot = useSelector(getConnectedRobot)
   const robotName = robot?.name || null
 
diff --git a/app/src/pages/Calibrate/Pipettes/PipetteTabs.tsx b/app/src/pages/Calibrate/Pipettes/PipetteTabs.tsx
index 9a1385f8c08..2a7a8e14c86 100644
--- a/app/src/pages/Calibrate/Pipettes/PipetteTabs.tsx
+++ b/app/src/pages/Calibrate/Pipettes/PipetteTabs.tsx
@@ -1,4 +1,3 @@
-// @flow
 // instrument tabs bar container
 // used for left/right pipette selection during pipette calibration
 import * as React from 'react'
@@ -8,11 +7,11 @@ import { getCalibratePipettesLocations } from '../../../redux/nav'
 import { PIPETTE_MOUNTS } from '../../../redux/pipettes'
 import { PageTabs } from '@opentrons/components'
 
-export type PipetteTabsProps = {|
-  currentMount: ?string,
-|}
+export interface PipetteTabsProps {
+  currentMount: string | null | undefined
+}
 
-export function PipetteTabs(props: PipetteTabsProps): React.Node {
+export function PipetteTabs(props: PipetteTabsProps): JSX.Element {
   const { currentMount } = props
   const pagesByMount = useSelector(getCalibratePipettesLocations)
 
diff --git a/app/src/pages/Calibrate/Pipettes/PipettesContents.tsx b/app/src/pages/Calibrate/Pipettes/PipettesContents.tsx
index ac7c57569af..0c832073f35 100644
--- a/app/src/pages/Calibrate/Pipettes/PipettesContents.tsx
+++ b/app/src/pages/Calibrate/Pipettes/PipettesContents.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import cx from 'classnames'
 
@@ -10,22 +9,20 @@ import type { InstrumentInfoProps } from '@opentrons/components'
 import type { Pipette, Labware } from '../../../redux/robot/types'
 import type { Mount } from '../../../redux/pipettes/types'
 
-export type PipettesContentsProps = {|
-  currentMount: Mount | null,
-  pipettes: Array<Pipette>,
-  activeTipracks: {| left: Labware | null, right: Labware | null |},
-  changePipetteUrl: string,
-|}
+export interface PipettesContentsProps {
+  currentMount: Mount | null
+  pipettes: Pipette[]
+  activeTipracks: { left: Labware | null; right: Labware | null }
+  changePipetteUrl: string
+}
 
-export function PipettesContents(props: PipettesContentsProps): React.Node {
+export function PipettesContents(props: PipettesContentsProps): JSX.Element {
   const { currentMount, pipettes, activeTipracks } = props
 
-  const infoByMount = PIPETTE_MOUNTS.reduce<
-    $Shape<{|
-      left?: InstrumentInfoProps,
-      right?: InstrumentInfoProps,
-    |}>
-  >((result, mount) => {
+  const infoByMount = PIPETTE_MOUNTS.reduce<{
+    left?: InstrumentInfoProps
+    right?: InstrumentInfoProps
+  }>((result, mount) => {
     const pipette = pipettes.find(p => p.mount === mount)
     const tiprack = activeTipracks[mount]
     const pipetteConfig = pipette?.modelSpecs
diff --git a/app/src/pages/Calibrate/Pipettes/index.tsx b/app/src/pages/Calibrate/Pipettes/index.tsx
index e746face66e..9bf3db72496 100644
--- a/app/src/pages/Calibrate/Pipettes/index.tsx
+++ b/app/src/pages/Calibrate/Pipettes/index.tsx
@@ -1,4 +1,3 @@
-// @flow
 // setup pipettes component
 import * as React from 'react'
 import { useSelector, useDispatch } from 'react-redux'
@@ -22,22 +21,22 @@ import { SessionHeader } from '../../../organisms/SessionHeader'
 import { PipetteTabs } from './PipetteTabs'
 import { PipettesContents } from './PipettesContents'
 
-import type { ContextRouter } from 'react-router-dom'
+import type { RouteComponentProps } from 'react-router-dom'
 import type { State, Dispatch } from '../../../redux/types'
 import type { Mount } from '../../../redux/pipettes/types'
-import type { Labware } from '../../../redux/robot/types'
+import type { Labware, Pipette } from '../../../redux/robot/types'
 import { CalibrateTipLengthControl } from '../CalibrateTipLengthControl'
 
-type Props = ContextRouter
+type Props = RouteComponentProps<{ mount: string; definitionHash: string }>
 
-export function Pipettes(props: Props): React.Node {
+export function Pipettes(props: Props): JSX.Element {
   const { mount, definitionHash } = props.match.params
   const dispatch = useDispatch<Dispatch>()
   const robot = useSelector(getConnectedRobot)
   const robotName = robot?.name || null
   const tipracksByMount = useSelector(robotSelectors.getTipracksByMount)
-  const pipettes = useSelector(
-    state => robotName && getProtocolPipettesInfo(state, robotName)
+  const pipettes = useSelector((state: State) =>
+    robotName ? getProtocolPipettesInfo(state, robotName) : null
   )
 
   const changePipetteUrl =
@@ -52,10 +51,9 @@ export function Pipettes(props: Props): React.Node {
 
   const currentPipette = currentMount && pipettes && pipettes[currentMount]
 
-  const activeTipracks = PIPETTE_MOUNTS.reduce<{|
-    left: Labware | null,
-    right: Labware | null,
-  |}>(
+  const activeTipracks = PIPETTE_MOUNTS.reduce<
+    { [m in Mount]: Labware | null }
+  >(
     (mapToBuild, m) => {
       const tipracksForMount = tipracksByMount[m]
       if (m === mount) {
@@ -81,7 +79,7 @@ export function Pipettes(props: Props): React.Node {
 
   const activeTipRackDef = activeTipRack?.definition
 
-  const tipLengthDataForActivePipette = useSelector(state => {
+  const tipLengthDataForActivePipette = useSelector((state: State) => {
     return (
       robotName &&
       currentPipette?.actual?.id &&
@@ -111,7 +109,8 @@ export function Pipettes(props: Props): React.Node {
       : null
   )
 
-  const protoPipettes = [
+  // @ts-expect-error TODO: reconcile the expected Pipette type with the one given here
+  const protoPipettes: Pipette[] = [
     pipettes?.left?.protocol
       ? omit(pipettes.left.protocol, 'displayName')
       : null,
diff --git a/app/src/pages/Calibrate/PrepareModules/index.tsx b/app/src/pages/Calibrate/PrepareModules/index.tsx
index b34671c2652..17223a718c1 100644
--- a/app/src/pages/Calibrate/PrepareModules/index.tsx
+++ b/app/src/pages/Calibrate/PrepareModules/index.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { useDispatch } from 'react-redux'
 import {
@@ -21,9 +20,12 @@ import type { Dispatch } from '../../../redux/types'
 import type { AttachedModule } from '../../../redux/modules/types'
 
 const LID_OPEN_DELAY_MS = 30 * 1000
-type Props = {| robotName: string, modules: Array<AttachedModule> |}
+interface Props {
+  robotName: string
+  modules: AttachedModule[]
+}
 
-export function PrepareModules(props: Props): React.Node {
+export function PrepareModules(props: Props): JSX.Element {
   const { modules, robotName } = props
   const dispatch = useDispatch<Dispatch>()
   const [isHandling, setIsHandling] = React.useState(false)
@@ -38,7 +40,7 @@ export function PrepareModules(props: Props): React.Node {
 
   useTimeout(() => setIsHandling(false), isHandling ? LID_OPEN_DELAY_MS : null)
 
-  const handleOpenLidClick = () => {
+  const handleOpenLidClick = (): void => {
     modules
       .filter(mod => getModuleType(mod.model) === THERMOCYCLER_MODULE_TYPE)
       .forEach(mod =>
diff --git a/app/src/pages/Calibrate/ReviewDeck/Prompt.tsx b/app/src/pages/Calibrate/ReviewDeck/Prompt.tsx
index 690e84d2c5f..b5c71288d7b 100644
--- a/app/src/pages/Calibrate/ReviewDeck/Prompt.tsx
+++ b/app/src/pages/Calibrate/ReviewDeck/Prompt.tsx
@@ -1,23 +1,24 @@
-// @flow
 // prompt for ReviewDeck of labware calibration page
 import * as React from 'react'
 
 import { getLabwareDisplayName } from '@opentrons/shared-data'
 import { OutlineButton } from '@opentrons/components'
-import { selectors as robotSelectors, type Labware } from '../../../redux/robot'
+import { selectors as robotSelectors } from '../../../redux/robot'
+import type { Labware } from '../../../redux/robot'
 
 import styles from './styles.css'
 
-export type PromptProps = {|
-  ...Labware,
-  onClick: () => void,
-|}
+export interface PromptProps extends Labware {
+  onClick: () => void
+}
 
-export function Prompt(props: PromptProps): React.Node {
+export function Prompt(props: PromptProps): JSX.Element {
   const { onClick, ...labware } = props
   const { name, definition, slot } = labware
   const labwareType = robotSelectors.labwareType(labware)
-  const labwareTitle = definition ? getLabwareDisplayName(definition) : name
+  const labwareTitle: string = definition
+    ? getLabwareDisplayName(definition)
+    : name
 
   return (
     <div className={styles.prompt}>
diff --git a/app/src/pages/Calibrate/ReviewDeck/index.tsx b/app/src/pages/Calibrate/ReviewDeck/index.tsx
index 4f484f11a44..308a868e63b 100644
--- a/app/src/pages/Calibrate/ReviewDeck/index.tsx
+++ b/app/src/pages/Calibrate/ReviewDeck/index.tsx
@@ -1,4 +1,3 @@
-// @flow
 // deck review modal for labware calibration page
 import * as React from 'react'
 import { useDispatch, useSelector } from 'react-redux'
@@ -19,9 +18,11 @@ import styles from './styles.css'
 
 import type { Dispatch } from '../../../redux/types'
 
-export type ReviewDeckProps = {| slot: ?string |}
+export interface ReviewDeckProps {
+  slot: string | null | undefined
+}
 
-export function ReviewDeck(props: ReviewDeckProps): React.Node {
+export function ReviewDeck(props: ReviewDeckProps): JSX.Element {
   const { slot } = props
 
   const dispatch = useDispatch<Dispatch>()
@@ -40,13 +41,13 @@ export function ReviewDeck(props: ReviewDeckProps): React.Node {
 
   const currentLabware = allLabware.find(lw => lw.slot === slot)
 
-  const continueToCalibrate = () => {
+  const continueToCalibrate = (): void => {
     if (currentLabware && calibratorMount) {
       const mountToUse = currentLabware.calibratorMount || calibratorMount
       dispatch(robotActions.moveTo(mountToUse, currentLabware.slot))
     }
   }
-  const handleClick = () => {
+  const handleClick = (): void => {
     if (mustPrepNestedLabware) {
       setIsPrepNestedLabwareOpen(true)
     } else {
diff --git a/app/src/pages/Calibrate/UncalibratedInfo.tsx b/app/src/pages/Calibrate/UncalibratedInfo.tsx
index 1f01c85ccd2..1c89f48135c 100644
--- a/app/src/pages/Calibrate/UncalibratedInfo.tsx
+++ b/app/src/pages/Calibrate/UncalibratedInfo.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { useSelector, useDispatch } from 'react-redux'
 import { push } from 'connected-react-router'
@@ -11,7 +10,6 @@ import {
   Box,
   Text,
   SPACING_2,
-  type Mount,
   SPACING_3,
   FONT_BODY_2_DARK,
 } from '@opentrons/components'
@@ -21,6 +19,7 @@ import { selectors as robotSelectors } from '../../redux/robot'
 
 import type { TipracksByMountMap } from '../../redux/robot'
 import type { Dispatch } from '../../redux/types'
+import type { Mount, StyleProps } from '@opentrons/components'
 
 const IS_CALIBRATED = 'Pipette tip length is calibrated.'
 const IS_NOT_CALIBRATED = 'Pipette tip length is not calibrated.'
@@ -33,12 +32,12 @@ const CONTINUE_TO_MODULE_SETUP = 'Continue to module setup'
 
 const BTN_WIDTH = '23rem'
 
-type CalibrateButtonProps = {
-  hasCalibrated: boolean,
-  ...
+interface CalibrateButtonProps
+  extends React.PropsWithChildren<StyleProps & React.HTMLAttributes<any>> {
+  hasCalibrated: boolean
 }
 
-function CalibrateButton(props: CalibrateButtonProps) {
+function CalibrateButton(props: CalibrateButtonProps): JSX.Element {
   const { hasCalibrated, ...otherProps } = props
   if (hasCalibrated) {
     return <SecondaryBtn {...otherProps} />
@@ -47,15 +46,15 @@ function CalibrateButton(props: CalibrateButtonProps) {
   }
 }
 
-type UncalibratedInfoProps = {|
-  uncalibratedTipracksByMount: TipracksByMountMap,
-  mount: Mount,
-  hasCalibrated: boolean,
-  handleStart: () => mixed,
-  showSpinner: boolean,
-|}
+interface UncalibratedInfoProps {
+  uncalibratedTipracksByMount: TipracksByMountMap
+  mount: Mount
+  hasCalibrated: boolean
+  handleStart: () => unknown
+  showSpinner: boolean
+}
 
-export function UncalibratedInfo(props: UncalibratedInfoProps): React.Node {
+export function UncalibratedInfo(props: UncalibratedInfoProps): JSX.Element {
   const {
     uncalibratedTipracksByMount,
     mount,
@@ -84,7 +83,7 @@ export function UncalibratedInfo(props: UncalibratedInfoProps): React.Node {
 
   let continueText
   let defHash
-  let continueButtonOnClick
+  let continueButtonOnClick: string
   if (uncalibratedTipracksByMount?.[mount].length) {
     continueText = CONTINUE_TO_NEXT_TIP_TYPE
     defHash = uncalibratedTipracksByMount[mount][0].definitionHash || ''
diff --git a/app/src/pages/Calibrate/__tests__/CalibrateTipLengthControl.test.tsx b/app/src/pages/Calibrate/__tests__/CalibrateTipLengthControl.test.tsx
index e377043de8b..6941aa2cce1 100644
--- a/app/src/pages/Calibrate/__tests__/CalibrateTipLengthControl.test.tsx
+++ b/app/src/pages/Calibrate/__tests__/CalibrateTipLengthControl.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { mountWithStore } from '@opentrons/components/__utils__'
 
@@ -16,6 +15,8 @@ import * as Analytics from '../../../redux/analytics/actions'
 
 import type { Labware } from '../../../redux/robot/types'
 import type { State } from '../../../redux/types'
+import type { DispatchApiRequestType } from '../../../redux/robot-api'
+import type { WrapperWithStore } from '@opentrons/components/__utils__'
 
 jest.mock('../../../redux/robot-api')
 jest.mock('../../../redux/robot/selectors')
@@ -24,31 +25,27 @@ jest.mock('../../../redux/config/selectors')
 jest.mock('../../../redux/pipettes/selectors')
 jest.mock('../../../redux/analytics/actions')
 
-const mockGetUncalibratedTipracksByMount: JestMockFn<
-  [State, string],
-  $Call<typeof getUncalibratedTipracksByMount, State, string>
-> = getUncalibratedTipracksByMount
+const mockGetUncalibratedTipracksByMount = getUncalibratedTipracksByMount as jest.MockedFunction<
+  typeof getUncalibratedTipracksByMount
+>
 
-const mockGetUnconfirmedLabware: JestMockFn<
-  [State],
-  $Call<typeof robotSelectors.getUnconfirmedLabware, State>
-> = robotSelectors.getUnconfirmedLabware
+const mockGetUnconfirmedLabware = robotSelectors.getUnconfirmedLabware as jest.MockedFunction<
+  typeof robotSelectors.getUnconfirmedLabware
+>
 
-const mockUseDispatchApiRequests: JestMockFn<
-  [() => void],
-  [() => void, Array<string>]
-> = useDispatchApiRequests
+const mockUseDispatchApiRequests = useDispatchApiRequests as jest.MockedFunction<
+  typeof useDispatchApiRequests
+>
 
-const mockGetHasCalibrationBlock: JestMockFn<
-  [State],
-  $Call<typeof getHasCalibrationBlock, State>
-> = getHasCalibrationBlock
+const mockGetHasCalibrationBlock = getHasCalibrationBlock as jest.MockedFunction<
+  typeof getHasCalibrationBlock
+>
 
-const threehundredtiprack: LabwareDefinition2 = tiprack300Def
-const MOCK_STATE: State = ({ mockState: true }: any)
+const threehundredtiprack: LabwareDefinition2 = tiprack300Def as any
+const MOCK_STATE: State = { mockState: true } as any
 
-const stubUnconfirmedLabware = [
-  ({
+const stubUnconfirmedLabware: Labware[] = [
+  {
     _id: 123,
     type: 'some_wellplate',
     slot: '4',
@@ -62,12 +59,14 @@ const stubUnconfirmedLabware = [
     calibration: 'unconfirmed',
     isMoving: false,
     definition: wellPlate96Def,
-  }: $Shape<Labware>),
+  } as Labware,
 ]
 
 describe('Testing calibrate tip length control', () => {
-  let dispatchApiRequests
-  let render
+  let dispatchApiRequests: DispatchApiRequestType
+  let render: (
+    props?: Partial<React.ComponentProps<typeof CalibrateTipLengthControl>>
+  ) => WrapperWithStore<React.ComponentProps<typeof CalibrateTipLengthControl>>
   const fakeRobot = 'fakerobot'
   const fakeMount = 'right'
 
@@ -77,15 +76,15 @@ describe('Testing calibrate tip length control', () => {
     mockGetUncalibratedTipracksByMount.mockReturnValue({ left: [], right: [] })
     mockGetUnconfirmedLabware.mockReturnValue(stubUnconfirmedLabware)
     mockGetHasCalibrationBlock.mockReturnValue(true)
-    render = (
-      props: $Shape<React.ElementProps<typeof CalibrateTipLengthControl>> = {}
-    ) => {
+    render = (props = {}) => {
       const {
         isExtendedPipOffset = false,
         hasCalibrated = true,
         tipRackDefinition = threehundredtiprack,
       } = props
-      return mountWithStore(
+      return mountWithStore<
+        React.ComponentProps<typeof CalibrateTipLengthControl>
+      >(
         <CalibrateTipLengthControl
           robotName={fakeRobot}
           hasCalibrated={hasCalibrated}
@@ -108,13 +107,13 @@ describe('Testing calibrate tip length control', () => {
     const { wrapper, store } = render()
     const { dispatch } = store
     const beginButton = wrapper.find('UncalibratedInfo').find('button').at(0)
-    beginButton.invoke('onClick')()
+    beginButton.invoke('onClick')?.({} as React.MouseEvent)
     wrapper.update()
     const continueButton = wrapper
       .find('ConfirmRecalibrationModal')
       .find('button')
       .at(0)
-    continueButton.invoke('onClick')()
+    continueButton.invoke('onClick')?.({} as React.MouseEvent)
     wrapper.update()
     expect(dispatchApiRequests).toHaveBeenCalledWith(
       Sessions.ensureSession(
@@ -141,13 +140,13 @@ describe('Testing calibrate tip length control', () => {
     const { wrapper, store } = render({ isExtendedPipOffset: true })
     const { dispatch } = store
     const beginButton = wrapper.find('UncalibratedInfo').find('button').at(0)
-    beginButton.invoke('onClick')()
+    beginButton.invoke('onClick')?.({} as React.MouseEvent)
     wrapper.update()
     const continueButton = wrapper
       .find('ConfirmRecalibrationModal')
       .find('button')
       .at(0)
-    continueButton.invoke('onClick')()
+    continueButton.invoke('onClick')?.({} as React.MouseEvent)
     wrapper.update()
     expect(dispatchApiRequests).toHaveBeenCalledWith(
       Sessions.ensureSession(
diff --git a/app/src/pages/Calibrate/__tests__/UncalibratedInfo.test.tsx b/app/src/pages/Calibrate/__tests__/UncalibratedInfo.test.tsx
index 921fda151cb..da295b78298 100644
--- a/app/src/pages/Calibrate/__tests__/UncalibratedInfo.test.tsx
+++ b/app/src/pages/Calibrate/__tests__/UncalibratedInfo.test.tsx
@@ -1,8 +1,6 @@
-// @flow
 import React from 'react'
 import { mount } from 'enzyme'
 import { Provider } from 'react-redux'
-import type { State } from '../../../redux/types'
 
 import wellPlate96Def from '@opentrons/shared-data/labware/fixtures/2/fixture_96_plate.json'
 import tiprack300Def from '@opentrons/shared-data/labware/fixtures/2/fixture_tiprack_300_ul.json'
@@ -10,15 +8,15 @@ import { UncalibratedInfo } from '../UncalibratedInfo'
 import { selectors as robotSelectors } from '../../../redux/robot'
 
 import type { TipracksByMountMap, Labware } from '../../../redux/robot/types'
+import type { Mount } from '@opentrons/components'
 
 jest.mock('../../../redux/robot/selectors')
 
-const mockGetUnconfirmedLabware: JestMockFn<
-  [State],
-  $Call<typeof robotSelectors.getUnconfirmedLabware, State>
-> = robotSelectors.getUnconfirmedLabware
+const mockGetUnconfirmedLabware = robotSelectors.getUnconfirmedLabware as jest.MockedFunction<
+  typeof robotSelectors.getUnconfirmedLabware
+>
 
-const leftTiprack = ({
+const leftTiprack: Labware = {
   type: 'some_tiprack',
   definition: tiprack300Def,
   slot: '3',
@@ -26,9 +24,9 @@ const leftTiprack = ({
   calibratorMount: 'left',
   isTiprack: true,
   confirmed: true,
-}: $Shape<Labware>)
+} as any
 
-const rightTiprack = ({
+const rightTiprack: Labware = {
   type: 'some_tiprack',
   definition: tiprack300Def,
   slot: '3',
@@ -36,10 +34,10 @@ const rightTiprack = ({
   calibratorMount: 'right',
   isTiprack: true,
   confirmed: true,
-}: $Shape<Labware>)
+} as any
 
-const stubUnconfirmedLabware = [
-  ({
+const stubUnconfirmedLabware: Labware[] = [
+  {
     _id: 123,
     type: 'some_wellplate',
     slot: '4',
@@ -52,13 +50,17 @@ const stubUnconfirmedLabware = [
     definitionHash: 'some_hash',
     calibration: 'unconfirmed',
     isMoving: false,
-    definition: wellPlate96Def,
-  }: $Shape<Labware>),
+    definition: wellPlate96Def as any,
+  },
 ]
 
 describe('UncalibratedInfo', () => {
-  let render
-  let mockStore
+  let render: (
+    props?: Partial<
+      React.ComponentProps<typeof UncalibratedInfo> & { currentMount: Mount }
+    >
+  ) => ReturnType<typeof mount>
+  let mockStore: any
   let dispatch
   let mockUncalibratedInfo: TipracksByMountMap = { left: [], right: [] }
 
diff --git a/app/src/pages/Calibrate/index.tsx b/app/src/pages/Calibrate/index.tsx
index 58738f25bf4..9ca093007d4 100644
--- a/app/src/pages/Calibrate/index.tsx
+++ b/app/src/pages/Calibrate/index.tsx
@@ -1,10 +1,9 @@
-// @flow
 // calibrate page routes
 import * as React from 'react'
 import { connect } from 'react-redux'
 import { useRouteMatch, Switch, Route, Redirect } from 'react-router-dom'
 
-import type { State, Dispatch } from '../../redux/types'
+import type { State } from '../../redux/types'
 import type {
   Pipette,
   Labware,
@@ -20,29 +19,20 @@ import { Pipettes as CalibratePipettes } from './Pipettes'
 import { Labware as CalibrateLabware } from './Labware'
 import { Modules as ConnectModules } from './Modules'
 
-type OP = {||}
-
-type SP = {|
-  nextPipette: Pipette | null,
-  labware: Array<Labware>,
-  nextLabware: Labware | void,
-  isTipsProbed: boolean,
-  nextPipetteTiprack: NextTiprackPipetteInfo | null,
-  modules: Array<SessionModule>,
-|}
+interface SP {
+  nextPipette: Pipette | null
+  labware: Labware[]
+  nextLabware: Labware | null | undefined
+  isTipsProbed: boolean
+  nextPipetteTiprack: NextTiprackPipetteInfo | null
+  modules: SessionModule[]
+}
 
-type Props = {| ...OP, ...SP, dispatch: Dispatch |}
+type Props = SP
 
-export const Calibrate: React.AbstractComponent<OP> = connect<
-  Props,
-  OP,
-  SP,
-  _,
-  _,
-  _
->(mapStateToProps)(CalibrateComponent)
+export const Calibrate = connect(mapStateToProps)(CalibrateComponent)
 
-function CalibrateComponent(props: Props) {
+function CalibrateComponent(props: Props): JSX.Element {
   const { path } = useRouteMatch()
 
   return (
diff --git a/app/src/pages/More/AddLabwareCard/AddLabware.tsx b/app/src/pages/More/AddLabwareCard/AddLabware.tsx
index 042fd7ba223..2dfce11fa52 100644
--- a/app/src/pages/More/AddLabwareCard/AddLabware.tsx
+++ b/app/src/pages/More/AddLabwareCard/AddLabware.tsx
@@ -1,5 +1,3 @@
-// @flow
-
 import * as React from 'react'
 
 import { LabeledButton } from '@opentrons/components'
@@ -18,11 +16,11 @@ const LABWARE_CREATOR_HREF = 'https://labware.opentrons.com/create'
 
 export const ADD_LABWARE_NAME = 'add-labware'
 
-export type AddLabwareProps = {|
-  onAddLabware: () => mixed,
-|}
+export interface AddLabwareProps {
+  onAddLabware: () => unknown
+}
 
-export function AddLabware(props: AddLabwareProps): React.Node {
+export function AddLabware(props: AddLabwareProps): JSX.Element {
   const { onAddLabware } = props
 
   return (
diff --git a/app/src/pages/More/AddLabwareCard/AddLabwareFailureModal.tsx b/app/src/pages/More/AddLabwareCard/AddLabwareFailureModal.tsx
index 80f29f9f353..fbcd44cc8b5 100644
--- a/app/src/pages/More/AddLabwareCard/AddLabwareFailureModal.tsx
+++ b/app/src/pages/More/AddLabwareCard/AddLabwareFailureModal.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 
 import { AlertModal } from '@opentrons/components'
@@ -45,28 +44,30 @@ const DISPLAY_NAME = 'Name: '
 const API_NAME = 'API name: '
 const FILENAME = 'File name: '
 
-export type AddLabwareFailureModalProps = {|
-  file: FailedLabwareFile | null,
-  errorMessage: string | null,
-  directory: string,
-  onCancel: () => mixed,
-  onOverwrite: (file: DuplicateLabwareFile) => mixed,
-|}
+export interface AddLabwareFailureModalProps {
+  file: FailedLabwareFile | null
+  errorMessage: string | null
+  directory: string
+  onCancel: () => unknown
+  onOverwrite: (file: DuplicateLabwareFile) => unknown
+}
 
-const renderFilename = file => (
+const renderFilename = (file: FailedLabwareFile): JSX.Element => (
   <span className={styles.code}>{file.filename}</span>
 )
 
-const renderDetails = file => (
+const renderDetails = (file: FailedLabwareFile): JSX.Element => (
   <>
     <ul className={styles.details_list}>
       <li className={styles.list_item}>
         <span className={styles.list_item_title}>{DISPLAY_NAME}</span>
+        {/* @ts-expect-error TODO: file.definition does not exist if failed file is of type InvalidLabwareFile */}
         <span>{file.definition.metadata.displayName}</span>
       </li>
       <li className={styles.list_item}>
         <span className={styles.list_item_title}>{API_NAME}</span>
         <span className={styles.code}>
+          {/* @ts-expect-error TODO: file.definition does not exist if failed file is of type InvalidLabwareFile */}
           {file.definition.parameters.loadName}
         </span>
       </li>
@@ -80,7 +81,7 @@ const renderDetails = file => (
 
 export function AddLabwareFailureModalTemplate(
   props: AddLabwareFailureModalProps
-): React.Node {
+): JSX.Element {
   const { file, errorMessage, directory, onCancel, onOverwrite } = props
   let buttons = [
     { onClick: onCancel, children: CANCEL, className: styles.button },
@@ -144,7 +145,7 @@ export function AddLabwareFailureModalTemplate(
 
 export function AddLabwareFailureModal(
   props: AddLabwareFailureModalProps
-): React.Node {
+): JSX.Element {
   return (
     <Portal>
       <AddLabwareFailureModalTemplate {...props} />
diff --git a/app/src/pages/More/AddLabwareCard/ConfirmResetPathModal.tsx b/app/src/pages/More/AddLabwareCard/ConfirmResetPathModal.tsx
index 416d678f9da..5441533e0eb 100644
--- a/app/src/pages/More/AddLabwareCard/ConfirmResetPathModal.tsx
+++ b/app/src/pages/More/AddLabwareCard/ConfirmResetPathModal.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 
 import { AlertModal } from '@opentrons/components'
@@ -23,15 +22,15 @@ const LABWARE_FILES_IN_YOUR_CURRENT_DIRECTORY_WILL_NOT_BE_MOVED =
 export const CANCEL_NAME = 'cancel'
 export const RESET_SOURCE_NAME = 'reset-source'
 
-export type ConfirmResetPathModalProps = {|
-  onCancel: () => mixed,
-  onConfirm: () => mixed,
-|}
+export interface ConfirmResetPathModalProps {
+  onCancel: () => unknown
+  onConfirm: () => unknown
+}
 
 export const ConfirmResetPathModalTemplate = ({
   onCancel,
   onConfirm,
-}: ConfirmResetPathModalProps): React.Node => (
+}: ConfirmResetPathModalProps): JSX.Element => (
   <AlertModal
     alertOverlay
     heading={RESET_CUSTOM_LABWARE_SOURCE}
@@ -47,7 +46,7 @@ export const ConfirmResetPathModalTemplate = ({
 
 export const ConfirmResetPathModal = (
   props: ConfirmResetPathModalProps
-): React.Node => (
+): JSX.Element => (
   <Portal>
     <ConfirmResetPathModalTemplate {...props} />
   </Portal>
diff --git a/app/src/pages/More/AddLabwareCard/IconCta.tsx b/app/src/pages/More/AddLabwareCard/IconCta.tsx
index 0c5e0829e75..c34e70243ab 100644
--- a/app/src/pages/More/AddLabwareCard/IconCta.tsx
+++ b/app/src/pages/More/AddLabwareCard/IconCta.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import cx from 'classnames'
 
@@ -6,13 +5,13 @@ import { Icon } from '@opentrons/components'
 import styles from './styles.css'
 import type { IconName } from '@opentrons/components'
 
-export type IconCtaProps = {|
-  name: string,
-  iconName: IconName,
-  text: string,
-  className?: string,
-  onClick: () => mixed,
-|}
+export interface IconCtaProps {
+  name: string
+  iconName: IconName
+  text: string
+  className?: string
+  onClick: () => unknown
+}
 
 export const IconCta = ({
   name,
@@ -20,7 +19,7 @@ export const IconCta = ({
   text,
   className,
   onClick,
-}: IconCtaProps): React.Node => (
+}: IconCtaProps): JSX.Element => (
   <button
     name={name}
     onClick={onClick}
diff --git a/app/src/pages/More/AddLabwareCard/ManagePath.tsx b/app/src/pages/More/AddLabwareCard/ManagePath.tsx
index 1a652bfa05a..7e3a5eacd9b 100644
--- a/app/src/pages/More/AddLabwareCard/ManagePath.tsx
+++ b/app/src/pages/More/AddLabwareCard/ManagePath.tsx
@@ -1,5 +1,3 @@
-// @flow
-
 import * as React from 'react'
 
 import { LabeledButton, InputField } from '@opentrons/components'
@@ -18,24 +16,24 @@ export const OPEN_SOURCE_NAME = 'open-source'
 export const CHANGE_SOURCE_NAME = 'change-source'
 export const RESET_SOURCE_NAME = 'reset-source'
 
-export type ManagePathProps = {|
-  path: string,
-  onChangePath: () => mixed,
-  onResetPath: () => mixed,
-  onOpenPath: () => mixed,
-|}
+export interface ManagePathProps {
+  path: string
+  onChangePath: () => unknown
+  onResetPath: () => unknown
+  onOpenPath: () => unknown
+}
 
-const handleFocus = (e: SyntheticFocusEvent<HTMLInputElement>) => {
+const handleFocus = (e: React.FocusEvent<HTMLInputElement>): void => {
   e.currentTarget.select()
 }
 
-export function ManagePath(props: ManagePathProps): React.Node {
+export function ManagePath(props: ManagePathProps): JSX.Element {
   const { path, onChangePath, onResetPath, onOpenPath } = props
   const [confirmResetIsOpen, toggleConfirmResetIsOpen] = React.useReducer(
     open => !open,
     false
   )
-  const handleResetPath = () => {
+  const handleResetPath = (): void => {
     toggleConfirmResetIsOpen()
     onResetPath()
   }
diff --git a/app/src/pages/More/AddLabwareCard/__tests__/AddLabware.test.tsx b/app/src/pages/More/AddLabwareCard/__tests__/AddLabware.test.tsx
index 966a9006866..ea2d1467369 100644
--- a/app/src/pages/More/AddLabwareCard/__tests__/AddLabware.test.tsx
+++ b/app/src/pages/More/AddLabwareCard/__tests__/AddLabware.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { mount } from 'enzyme'
 
@@ -15,7 +14,9 @@ describe('AddLabware', () => {
     const wrapper = mount(<AddLabware onAddLabware={mockOnAddLabware} />)
 
     expect(mockOnAddLabware).toHaveBeenCalledTimes(0)
-    wrapper.find(`button[name="${ADD_LABWARE_NAME}"]`).invoke('onClick')()
+    wrapper.find(`button[name="${ADD_LABWARE_NAME}"]`).invoke('onClick')?.(
+      {} as React.MouseEvent
+    )
     expect(mockOnAddLabware).toHaveBeenCalledTimes(1)
   })
 })
diff --git a/app/src/pages/More/AddLabwareCard/__tests__/AddLabwareCard.test.tsx b/app/src/pages/More/AddLabwareCard/__tests__/AddLabwareCard.test.tsx
index fb7fec1fcec..c2c9d3a4d73 100644
--- a/app/src/pages/More/AddLabwareCard/__tests__/AddLabwareCard.test.tsx
+++ b/app/src/pages/More/AddLabwareCard/__tests__/AddLabwareCard.test.tsx
@@ -1,7 +1,5 @@
-// @flow
 import * as React from 'react'
-import { Provider } from 'react-redux'
-import { mount } from 'enzyme'
+import { mountWithStore } from '@opentrons/components/__utils__'
 
 import * as CustomLabware from '../../../../redux/custom-labware'
 import * as CustomLabwareFixtures from '../../../../redux/custom-labware/__fixtures__'
@@ -10,41 +8,33 @@ import { ManagePath } from '../ManagePath'
 import { AddLabware } from '../AddLabware'
 import { AddLabwareFailureModal } from '../AddLabwareFailureModal'
 
-import type { State } from '../../../../redux/types'
-import type { FailedLabwareFile } from '../../../../redux/custom-labware/types'
+import type { WrapperWithStore } from '@opentrons/components/__utils__'
+import type { State, Action } from '../../../../redux/types'
 
 jest.mock('../../../../redux/custom-labware/selectors')
 
-const mockGetCustomLabwareDirectory: JestMockFn<[State], string> =
-  CustomLabware.getCustomLabwareDirectory
+const mockGetCustomLabwareDirectory = CustomLabware.getCustomLabwareDirectory as jest.MockedFunction<
+  typeof CustomLabware.getCustomLabwareDirectory
+>
 
-const mockGetAddLabwareFailure: JestMockFn<
-  [State],
-  {| file: FailedLabwareFile | null, errorMessage: string | null |}
-> = CustomLabware.getAddLabwareFailure
+const mockGetAddLabwareFailure = CustomLabware.getAddLabwareFailure as jest.MockedFunction<
+  typeof CustomLabware.getAddLabwareFailure
+>
 
 const mockLabwarePath = '/path/to/labware'
+const mockState = ({ state: true } as unknown) as State
 
 describe('AddLabwareCard', () => {
-  let mockStore
-  let render
+  let render: () => WrapperWithStore<typeof AddLabwareCard, State, Action>
 
   beforeEach(() => {
     mockGetCustomLabwareDirectory.mockReturnValue(mockLabwarePath)
     mockGetAddLabwareFailure.mockReturnValue({ file: null, errorMessage: null })
 
-    mockStore = {
-      subscribe: () => {},
-      getState: () => ({ state: true }),
-      dispatch: jest.fn(),
-    }
-
     render = () =>
-      mount(
-        <Provider store={mockStore}>
-          <AddLabwareCard />
-        </Provider>
-      )
+      mountWithStore<typeof AddLabwareCard, State, Action>(<AddLabwareCard />, {
+        initialState: mockState,
+      })
   })
 
   afterEach(() => {
@@ -52,7 +42,7 @@ describe('AddLabwareCard', () => {
   })
 
   it('passes labware directory to ManagePath', () => {
-    const wrapper = render()
+    const { wrapper } = render()
     const detail = wrapper.find(ManagePath)
 
     expect(mockGetCustomLabwareDirectory).toHaveBeenCalledWith({ state: true })
@@ -60,43 +50,43 @@ describe('AddLabwareCard', () => {
   })
 
   it('passes change path function to ManagePath', () => {
-    const wrapper = render()
+    const { wrapper, store } = render()
     const control = wrapper.find(ManagePath)
     const expectedChangeAction = CustomLabware.changeCustomLabwareDirectory()
 
-    expect(mockStore.dispatch).toHaveBeenCalledTimes(0)
-    control.invoke('onChangePath')()
-    expect(mockStore.dispatch).toHaveBeenCalledWith(expectedChangeAction)
+    expect(store.dispatch).toHaveBeenCalledTimes(0)
+    control.invoke('onChangePath')?.()
+    expect(store.dispatch).toHaveBeenCalledWith(expectedChangeAction)
   })
 
   it('passes open path function to ManagePath', () => {
-    const wrapper = render()
+    const { wrapper, store } = render()
     const control = wrapper.find(ManagePath)
     const expectedOpenAction = CustomLabware.openCustomLabwareDirectory()
 
-    expect(mockStore.dispatch).toHaveBeenCalledTimes(0)
-    control.invoke('onOpenPath')()
-    expect(mockStore.dispatch).toHaveBeenCalledWith(expectedOpenAction)
+    expect(store.dispatch).toHaveBeenCalledTimes(0)
+    control.invoke('onOpenPath')?.()
+    expect(store.dispatch).toHaveBeenCalledWith(expectedOpenAction)
   })
 
   it('passes reset path function to ManagePath', () => {
-    const wrapper = render()
+    const { wrapper, store } = render()
     const control = wrapper.find(ManagePath)
     const expectedOpenAction = CustomLabware.resetCustomLabwareDirectory()
 
-    expect(mockStore.dispatch).toHaveBeenCalledTimes(0)
-    control.invoke('onResetPath')()
-    expect(mockStore.dispatch).toHaveBeenCalledWith(expectedOpenAction)
+    expect(store.dispatch).toHaveBeenCalledTimes(0)
+    control.invoke('onResetPath')?.()
+    expect(store.dispatch).toHaveBeenCalledWith(expectedOpenAction)
   })
 
   it('passes dispatch function to AddLabware', () => {
-    const wrapper = render()
+    const { wrapper, store } = render()
     const control = wrapper.find(AddLabware)
     const expectedAction = CustomLabware.addCustomLabware()
 
-    expect(mockStore.dispatch).toHaveBeenCalledTimes(0)
-    control.invoke('onAddLabware')()
-    expect(mockStore.dispatch).toHaveBeenCalledWith(expectedAction)
+    expect(store.dispatch).toHaveBeenCalledTimes(0)
+    control.invoke('onAddLabware')?.()
+    expect(store.dispatch).toHaveBeenCalledWith(expectedAction)
   })
 
   it('renders an AddLabwareFailureModal if add labware fails', () => {
@@ -105,7 +95,7 @@ describe('AddLabwareCard', () => {
       errorMessage: 'AH',
     })
 
-    const wrapper = render()
+    const { wrapper } = render()
     const modal = wrapper.find(AddLabwareFailureModal)
 
     expect(modal.props()).toEqual({
@@ -122,16 +112,16 @@ describe('AddLabwareCard', () => {
 
     mockGetAddLabwareFailure.mockReturnValue({ file, errorMessage: null })
 
-    const wrapper = render()
+    const { wrapper, store } = render()
     const modal = wrapper.find(AddLabwareFailureModal)
 
-    modal.invoke('onCancel')()
-    expect(mockStore.dispatch).toHaveBeenCalledWith(
+    modal.invoke('onCancel')?.()
+    expect(store.dispatch).toHaveBeenCalledWith(
       CustomLabware.clearAddCustomLabwareFailure()
     )
 
-    modal.invoke('onOverwrite')(file)
-    expect(mockStore.dispatch).toHaveBeenCalledWith(
+    modal.invoke('onOverwrite')?.(file)
+    expect(store.dispatch).toHaveBeenCalledWith(
       CustomLabware.addCustomLabware(file)
     )
   })
diff --git a/app/src/pages/More/AddLabwareCard/__tests__/AddLabwareFailureModal.test.tsx b/app/src/pages/More/AddLabwareCard/__tests__/AddLabwareFailureModal.test.tsx
index f781f491e0e..db6f243f555 100644
--- a/app/src/pages/More/AddLabwareCard/__tests__/AddLabwareFailureModal.test.tsx
+++ b/app/src/pages/More/AddLabwareCard/__tests__/AddLabwareFailureModal.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { shallow, mount } from 'enzyme'
 
@@ -47,7 +46,7 @@ describe('AddLabwareFailureModal', () => {
       c => c.type() === 'button' && c.text().toLowerCase() === 'cancel'
     )
 
-    button.invoke('onClick')()
+    button.invoke('onClick')?.({} as React.MouseEvent)
     expect(mockOnCancel).toHaveBeenCalled()
   })
 
@@ -65,7 +64,9 @@ describe('AddLabwareFailureModal', () => {
   })
 
   describe('invalid files', () => {
-    const render = file => {
+    const render = (
+      file: React.ComponentProps<typeof AddLabwareFailureModalTemplate>['file']
+    ) => {
       return mount(
         <AddLabwareFailureModalTemplate {...emptyProps} file={file} />
       )
@@ -120,7 +121,7 @@ describe('AddLabwareFailureModal', () => {
         c => c.type() === 'button' && /overwrite/i.test(c.text())
       )
 
-      button.invoke('onClick')()
+      button.invoke('onClick')?.({} as React.MouseEvent)
       expect(mockOnOverwrite).toHaveBeenCalledWith(file)
     })
   })
diff --git a/app/src/pages/More/AddLabwareCard/__tests__/ConfirmResetPathModal.test.tsx b/app/src/pages/More/AddLabwareCard/__tests__/ConfirmResetPathModal.test.tsx
index 290eacd8109..e519755e164 100644
--- a/app/src/pages/More/AddLabwareCard/__tests__/ConfirmResetPathModal.test.tsx
+++ b/app/src/pages/More/AddLabwareCard/__tests__/ConfirmResetPathModal.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { shallow, mount } from 'enzyme'
 
@@ -41,7 +40,7 @@ describe('ConfirmResetPathModal', () => {
     const wrapper = mount(<ConfirmResetPathModalTemplate {...props} />)
     const button = wrapper.find(`button[name="${CANCEL_NAME}"]`)
 
-    button.invoke('onClick')()
+    button.invoke('onClick')?.({} as React.MouseEvent)
     expect(mockOnCancel).toHaveBeenCalled()
   })
 
@@ -49,7 +48,7 @@ describe('ConfirmResetPathModal', () => {
     const wrapper = mount(<ConfirmResetPathModalTemplate {...props} />)
     const button = wrapper.find(`button[name="${RESET_SOURCE_NAME}"]`)
 
-    button.invoke('onClick')()
+    button.invoke('onClick')?.({} as React.MouseEvent)
     expect(mockOnConfirm).toHaveBeenCalled()
   })
 })
diff --git a/app/src/pages/More/AddLabwareCard/__tests__/IconCta.test.tsx b/app/src/pages/More/AddLabwareCard/__tests__/IconCta.test.tsx
index 59c63227144..42b77ee18f9 100644
--- a/app/src/pages/More/AddLabwareCard/__tests__/IconCta.test.tsx
+++ b/app/src/pages/More/AddLabwareCard/__tests__/IconCta.test.tsx
@@ -1,16 +1,17 @@
-// @flow
 import * as React from 'react'
 import { mount } from 'enzyme'
 import { Icon } from '@opentrons/components'
 import { IconCta } from '../IconCta'
 
+import type { ReactWrapper } from 'enzyme'
+
 const NAME = 'some-call-to-action'
 const ICON_NAME = 'flask-outline'
 const TEXT = 'some text'
 
 describe('IconCta', () => {
   const mockHandleClick = jest.fn()
-  let wrapper
+  let wrapper: ReactWrapper<React.ComponentProps<typeof IconCta>>
 
   beforeEach(() => {
     wrapper = mount(
@@ -42,7 +43,7 @@ describe('IconCta', () => {
 
   it('is clickable', () => {
     expect(mockHandleClick).toHaveBeenCalledTimes(0)
-    wrapper.find('button').invoke('onClick')()
+    wrapper.find('button').invoke('onClick')?.({} as React.MouseEvent)
     expect(mockHandleClick).toHaveBeenCalledTimes(1)
   })
 })
diff --git a/app/src/pages/More/AddLabwareCard/__tests__/ManagePath.test.tsx b/app/src/pages/More/AddLabwareCard/__tests__/ManagePath.test.tsx
index 3d218105938..d1c0d60584f 100644
--- a/app/src/pages/More/AddLabwareCard/__tests__/ManagePath.test.tsx
+++ b/app/src/pages/More/AddLabwareCard/__tests__/ManagePath.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { act } from 'react-dom/test-utils'
 import { mount } from 'enzyme'
@@ -11,12 +10,14 @@ import {
   RESET_SOURCE_NAME,
 } from '../ManagePath'
 
+import type { ReactWrapper } from 'enzyme'
+
 describe('ManagePath', () => {
   const mockPath = '/path/to/a/place'
   const mockOnChangePath = jest.fn()
   const mockOnOpenPath = jest.fn()
   const mockOnResetPath = jest.fn()
-  let wrapper
+  let wrapper: ReactWrapper<React.ComponentProps<typeof ManagePath>>
 
   beforeEach(() => {
     wrapper = mount(
@@ -41,13 +42,15 @@ describe('ManagePath', () => {
     expect(mockOnOpenPath).toHaveBeenCalledTimes(0)
     wrapper
       .find(`OutlineButton[name="${OPEN_SOURCE_NAME}"]`)
-      .invoke('onClick')()
+      .invoke('onClick')?.({} as React.MouseEvent)
     expect(mockOnOpenPath).toHaveBeenCalledTimes(1)
   })
 
   it('has an IconCta that calls onChangePath on click', () => {
     expect(mockOnChangePath).toHaveBeenCalledTimes(0)
-    wrapper.find(`IconCta[name="${CHANGE_SOURCE_NAME}"]`).invoke('onClick')()
+    wrapper.find(`IconCta[name="${CHANGE_SOURCE_NAME}"]`).invoke('onClick')?.(
+      {} as React.MouseEvent
+    )
     expect(mockOnChangePath).toHaveBeenCalledTimes(1)
   })
 
@@ -56,7 +59,9 @@ describe('ManagePath', () => {
       expect(wrapper.exists(ConfirmResetPathModal)).toBe(false)
 
       act(() => {
-        wrapper.find(`IconCta[name="${RESET_SOURCE_NAME}"]`).invoke('onClick')()
+        wrapper
+          .find(`IconCta[name="${RESET_SOURCE_NAME}"]`)
+          .invoke('onClick')?.({} as React.MouseEvent)
       })
 
       wrapper.update()
@@ -68,7 +73,7 @@ describe('ManagePath', () => {
 
     it('ConfirmResetPathModal::onCancel closes modal without resetting path', () => {
       act(() => {
-        wrapper.find(ConfirmResetPathModal).invoke('onCancel')()
+        wrapper.find(ConfirmResetPathModal).invoke('onCancel')?.()
       })
 
       wrapper.update()
@@ -79,7 +84,7 @@ describe('ManagePath', () => {
     it('ConfirmResetPathModal::onConfirm calls onResetPath and closes modal', () => {
       expect(mockOnResetPath).toHaveBeenCalledTimes(0)
       act(() => {
-        wrapper.find(ConfirmResetPathModal).invoke('onConfirm')()
+        wrapper.find(ConfirmResetPathModal).invoke('onConfirm')?.()
       })
 
       wrapper.update()
diff --git a/app/src/pages/More/AddLabwareCard/index.tsx b/app/src/pages/More/AddLabwareCard/index.tsx
index 4d7b8c0594c..bf9dcd5b853 100644
--- a/app/src/pages/More/AddLabwareCard/index.tsx
+++ b/app/src/pages/More/AddLabwareCard/index.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { useDispatch, useSelector } from 'react-redux'
 import { Card } from '@opentrons/components'
@@ -25,14 +24,15 @@ const LABWARE_MANAGEMENT = 'Labware Management'
 const MANAGE_CUSTOM_LABWARE_DEFINITIONS =
   'Manage custom labware definitions for use in your Python Protocol API Version 2 protocols.'
 
-export function AddLabwareCard(): React.Node {
+export function AddLabwareCard(): JSX.Element {
   const dispatch = useDispatch<Dispatch>()
   const labwarePath = useSelector(getCustomLabwareDirectory)
   const addFailure = useSelector(getAddLabwareFailure)
-  const handleOpenPath = () => dispatch(openCustomLabwareDirectory())
-  const handleResetPath = () => dispatch(resetCustomLabwareDirectory())
-  const handleChangePath = () => dispatch(changeCustomLabwareDirectory())
-  const handleAddLabware = () => dispatch(addCustomLabware())
+  const handleOpenPath = (): unknown => dispatch(openCustomLabwareDirectory())
+  const handleResetPath = (): unknown => dispatch(resetCustomLabwareDirectory())
+  const handleChangePath = (): unknown =>
+    dispatch(changeCustomLabwareDirectory())
+  const handleAddLabware = (): unknown => dispatch(addCustomLabware())
   const showAddFailure = addFailure.file || addFailure.errorMessage !== null
 
   return (
diff --git a/app/src/pages/More/AppSettings/AnalyticsSettingsCard.tsx b/app/src/pages/More/AppSettings/AnalyticsSettingsCard.tsx
index ffe6d7edfc9..8908469d071 100644
--- a/app/src/pages/More/AppSettings/AnalyticsSettingsCard.tsx
+++ b/app/src/pages/More/AppSettings/AnalyticsSettingsCard.tsx
@@ -1,4 +1,3 @@
-// @flow
 // info on analytics data collected and toggle to opt in/out
 import * as React from 'react'
 
@@ -7,7 +6,7 @@ import { AnalyticsToggle } from '../../../organisms/AnalyticsSettingsModal/Analy
 
 const TITLE = 'Privacy Settings'
 
-export function AnalyticsSettingsCard(): React.Node {
+export function AnalyticsSettingsCard(): JSX.Element {
   return (
     <Card title={TITLE}>
       <AnalyticsToggle />
diff --git a/app/src/pages/More/AppSettings/AppAdvancedSettingsCard.tsx b/app/src/pages/More/AppSettings/AppAdvancedSettingsCard.tsx
index 9343c17ad28..77c29ac44d4 100644
--- a/app/src/pages/More/AppSettings/AppAdvancedSettingsCard.tsx
+++ b/app/src/pages/More/AppSettings/AppAdvancedSettingsCard.tsx
@@ -1,4 +1,3 @@
-// @flow
 // app info card with version and updated
 import * as React from 'react'
 import { useSelector, useDispatch } from 'react-redux'
@@ -16,7 +15,7 @@ import * as Calibration from '../../../redux/calibration'
 
 import type { DropdownOption } from '@opentrons/components'
 import type { DevInternalFlag } from '../../../redux/config/types'
-import type { Dispatch } from '../../../redux/types'
+import type { State, Dispatch } from '../../../redux/types'
 
 const TITLE = 'Advanced Settings'
 
@@ -46,19 +45,19 @@ const ENABLE_DEV_TOOLS_BODY =
 
 const DEV_TITLE = 'Developer Only (unstable)'
 
-export function AppAdvancedSettingsCard(): React.Node {
-  const useTrashSurfaceForTipCal = useSelector(state =>
+export function AppAdvancedSettingsCard(): JSX.Element {
+  const useTrashSurfaceForTipCal = useSelector((state: State) =>
     Config.getUseTrashSurfaceForTipCal(state)
   )
   const devToolsOn = useSelector(Config.getDevtoolsEnabled)
   const devInternalFlags = useSelector(Config.getFeatureFlags)
   const channel = useSelector(Config.getUpdateChannel)
-  const channelOptions: Array<DropdownOption> = useSelector(
+  const channelOptions: DropdownOption[] = useSelector(
     Config.getUpdateChannelOptions
   )
   const dispatch = useDispatch<Dispatch>()
 
-  const handleUseTrashSelection: BlockSelection => void = selection => {
+  const handleUseTrashSelection = (selection: BlockSelection): void => {
     switch (selection) {
       case ALWAYS_PROMPT:
         dispatch(Calibration.resetUseTrashSurfaceForTipCal())
@@ -71,10 +70,10 @@ export function AppAdvancedSettingsCard(): React.Node {
         break
     }
   }
-  const toggleDevtools = () => dispatch(Config.toggleDevtools())
-  const toggleDevInternalFlag = (flag: DevInternalFlag) =>
+  const toggleDevtools = (): unknown => dispatch(Config.toggleDevtools())
+  const toggleDevInternalFlag = (flag: DevInternalFlag): unknown =>
     dispatch(Config.toggleDevInternalFlag(flag))
-  const handleChannel = event =>
+  const handleChannel: React.ChangeEventHandler<HTMLSelectElement> = event =>
     dispatch(Config.updateConfigValue('update.channel', event.target.value))
   return (
     <>
@@ -89,14 +88,12 @@ export function AppAdvancedSettingsCard(): React.Node {
               ? ALWAYS_BLOCK
               : ALWAYS_PROMPT
           }
-          onChange={event => {
+          onChange={(event: React.ChangeEvent<HTMLInputElement>) => {
             // you know this is a limited-selection field whose values are only
             // the elements of BlockSelection; i know this is a limited-selection
             // field whose values are only the elements of BlockSelection; but sadly,
             // neither of us can get Flow to know it
-            handleUseTrashSelection(
-              ((event.currentTarget.value: any): BlockSelection)
-            )
+            handleUseTrashSelection(event.currentTarget.value as BlockSelection)
           }}
           options={[
             { name: ALWAYS_USE_BLOCK_LABEL, value: ALWAYS_BLOCK },
diff --git a/app/src/pages/More/AppSettings/AppSoftwareSettingsCard.tsx b/app/src/pages/More/AppSettings/AppSoftwareSettingsCard.tsx
index e41e2a55973..e1f6af0b5ac 100644
--- a/app/src/pages/More/AppSettings/AppSoftwareSettingsCard.tsx
+++ b/app/src/pages/More/AppSettings/AppSoftwareSettingsCard.tsx
@@ -1,4 +1,3 @@
-// @flow
 // app info card with version and updated
 import * as React from 'react'
 import { useSelector, useDispatch } from 'react-redux'
@@ -34,7 +33,7 @@ const VERSION_LABEL = 'Software Version'
 const UPDATE_AVAILABLE = 'view available update'
 const UPDATE_NOT_AVAILABLE = 'up to date'
 
-export function AppSoftwareSettingsCard(): React.Node {
+export function AppSoftwareSettingsCard(): JSX.Element {
   const dispatch = useDispatch<Dispatch>()
   const [showUpdateModal, setShowUpdateModal] = React.useState(false)
   const updateAvailable = Boolean(useSelector(getAvailableShellUpdate))
diff --git a/app/src/pages/More/AppSettings/DowngradeAppControl.tsx b/app/src/pages/More/AppSettings/DowngradeAppControl.tsx
index ac7228d40e8..0247eb48920 100644
--- a/app/src/pages/More/AppSettings/DowngradeAppControl.tsx
+++ b/app/src/pages/More/AppSettings/DowngradeAppControl.tsx
@@ -1,5 +1,3 @@
-// @flow
-
 import * as React from 'react'
 import { C_BLUE, SPACING_2, Link, Text } from '@opentrons/components'
 import { TitledControl } from '../../../atoms/TitledControl'
@@ -37,7 +35,7 @@ const PERFORM_A_FULL_UNINSTALL = (
   </>
 )
 
-export function DowngradeAppControl(props: StyleProps): React.Node {
+export function DowngradeAppControl(props: StyleProps): JSX.Element {
   return (
     <TitledControl
       {...props}
diff --git a/app/src/pages/More/AppSettings/UpdateNotificationsControl.tsx b/app/src/pages/More/AppSettings/UpdateNotificationsControl.tsx
index 4e88bd7aafc..95f66f69de8 100644
--- a/app/src/pages/More/AppSettings/UpdateNotificationsControl.tsx
+++ b/app/src/pages/More/AppSettings/UpdateNotificationsControl.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { useDispatch, useSelector } from 'react-redux'
 
@@ -27,7 +26,7 @@ const ENABLE_APP_UPDATE_NOTIFICATIONS = 'Enable app update notifications'
 
 const EVENT_APP_UPDATE_NOTIFICATIONS_TOGGLED = 'appUpdateNotificationsToggled'
 
-export function UpdateNotificationsControl(props: StyleProps): React.Node {
+export function UpdateNotificationsControl(props: StyleProps): JSX.Element {
   const dispatch = useDispatch<Dispatch>()
   const trackEvent = useTrackEvent()
 
@@ -37,7 +36,7 @@ export function UpdateNotificationsControl(props: StyleProps): React.Node {
     return ignored !== null ? !ignored : null
   })
 
-  const handleToggle = () => {
+  const handleToggle = (): void => {
     if (enabled !== null) {
       dispatch(
         enabled
diff --git a/app/src/pages/More/AppSettings/__tests__/AppAdvancedSettingsCard.test.tsx b/app/src/pages/More/AppSettings/__tests__/AppAdvancedSettingsCard.test.tsx
index 4b02c1a8bb5..01d82a10212 100644
--- a/app/src/pages/More/AppSettings/__tests__/AppAdvancedSettingsCard.test.tsx
+++ b/app/src/pages/More/AppSettings/__tests__/AppAdvancedSettingsCard.test.tsx
@@ -1,56 +1,61 @@
-// @flow
 import * as React from 'react'
 import { mountWithStore } from '@opentrons/components/__utils__'
 import * as Config from '../../../../redux/config'
 import { AppAdvancedSettingsCard } from '../AppAdvancedSettingsCard'
 
-import type { State } from '../../../../redux/types'
+import type { State, Action } from '../../../../redux/types'
+import type { HTMLAttributes, ReactWrapper } from 'enzyme'
 
 jest.mock('../../../../redux/config/selectors')
 
-const getUseTrashSurfaceForTipCal: JestMockFn<
-  [State],
-  $Call<typeof Config.getUseTrashSurfaceForTipCal, State>
-> = Config.getUseTrashSurfaceForTipCal
+const getUseTrashSurfaceForTipCal = Config.getUseTrashSurfaceForTipCal as jest.MockedFunction<
+  typeof Config.getUseTrashSurfaceForTipCal
+>
 
-const getDevtoolsEnabled: JestMockFn<
-  [State],
-  $Call<typeof Config.getDevtoolsEnabled, State>
-> = Config.getDevtoolsEnabled
+const getDevtoolsEnabled = Config.getDevtoolsEnabled as jest.MockedFunction<
+  typeof Config.getDevtoolsEnabled
+>
 
-const getFeatureFlags: JestMockFn<
-  [State],
-  $Call<typeof Config.getFeatureFlags, State>
-> = Config.getFeatureFlags
+const getFeatureFlags = Config.getFeatureFlags as jest.MockedFunction<
+  typeof Config.getFeatureFlags
+>
 
-const getUpdateChannel: JestMockFn<
-  [State],
-  $Call<typeof Config.getUpdateChannel, State>
-> = Config.getUpdateChannel
+const getUpdateChannel = Config.getUpdateChannel as jest.MockedFunction<
+  typeof Config.getUpdateChannel
+>
 
-const getUpdateChannelOptions: JestMockFn<
-  [State],
-  $Call<typeof Config.getUpdateChannelOptions, State>
-> = Config.getUpdateChannelOptions
+const getUpdateChannelOptions = Config.getUpdateChannelOptions as jest.MockedFunction<
+  typeof Config.getUpdateChannelOptions
+>
 
-const MOCK_STATE: $Shape<State> = { robotApi: {} }
+const MOCK_STATE: State = { robotApi: {} } as any
 
 describe('AppAdvancedSettingsCard', () => {
   const render = () => {
-    return mountWithStore(<AppAdvancedSettingsCard />, {
+    return mountWithStore<
+      React.ComponentProps<typeof AppAdvancedSettingsCard>,
+      State,
+      Action
+    >(<AppAdvancedSettingsCard />, {
       initialState: MOCK_STATE,
     })
   }
 
-  const getUseTrashForTipCalRadioGroup = wrapper =>
+  const getUseTrashForTipCalRadioGroup = (
+    wrapper: ReactWrapper<React.ComponentProps<typeof AppAdvancedSettingsCard>>
+  ): ReactWrapper =>
     wrapper.find(
       'LabeledRadioGroup[data-test="useTrashSurfaceForTipCalRadioGroup"]'
     )
 
-  const getDevtoolsToggle = wrapper =>
+  const getDevtoolsToggle = (
+    wrapper: ReactWrapper<React.ComponentProps<typeof AppAdvancedSettingsCard>>
+  ): ReactWrapper<HTMLAttributes> =>
     wrapper.find('LabeledToggle[data-test="enableDevToolsToggle"]')
 
-  const getUpdateChannelSelect = wrapper =>
+  const getUpdateChannelSelect = (
+    wrapper: ReactWrapper<React.ComponentProps<typeof AppAdvancedSettingsCard>>
+  ): ReactWrapper<HTMLAttributes> =>
     wrapper.find('LabeledSelect[data-test="updateChannelSetting"]')
 
   beforeEach(() => {
@@ -77,12 +82,12 @@ describe('AppAdvancedSettingsCard', () => {
     expect(getDevtoolsToggle(wrapper).exists()).toBe(true)
   })
 
-  const SPECS: Array<{|
-    originalSettingValue: boolean | null,
-    originalRadioValue: 'always-trash' | 'always-block' | 'always-prompt',
-    newSettingValue: boolean | null,
-    newRadioValue: 'always-trash' | 'always-block' | 'always-prompt',
-  |}> = [
+  const SPECS: Array<{
+    originalSettingValue: boolean | null
+    originalRadioValue: 'always-trash' | 'always-block' | 'always-prompt'
+    newSettingValue: boolean | null
+    newRadioValue: 'always-trash' | 'always-block' | 'always-prompt'
+  }> = [
     {
       originalSettingValue: true,
       originalRadioValue: 'always-trash',
@@ -155,7 +160,7 @@ describe('AppAdvancedSettingsCard', () => {
 
       getUseTrashSurfaceForTipCal.mockReturnValue(spec.newSettingValue)
 
-      refresh({ state: 'value' })
+      refresh({ state: 'value' } as any)
       expect(
         getUseTrashForTipCalRadioGroup(wrapper)
           .find(`input[value="${spec.newRadioValue}"]`)
@@ -179,15 +184,15 @@ describe('AppAdvancedSettingsCard', () => {
 
   it('switching toggles dispatches toggle action', () => {
     const { wrapper, store } = render()
-    getDevtoolsToggle(wrapper).invoke('onClick')()
+    getDevtoolsToggle(wrapper).invoke('onClick')?.({} as React.MouseEvent)
     wrapper.update()
     expect(store.dispatch).toHaveBeenCalledWith(
       expect.objectContaining(Config.toggleConfigValue('devtools'))
     )
 
-    getUpdateChannelSelect(wrapper).invoke('onChange')({
+    getUpdateChannelSelect(wrapper).invoke('onChange')?.({
       target: { value: 'alpha' },
-    })
+    } as any)
     wrapper.update()
     expect(store.dispatch).toHaveBeenCalledWith(
       Config.updateConfigValue('update.channel', 'alpha')
diff --git a/app/src/pages/More/AppSettings/__tests__/AppSoftwareSettingsCard.test.tsx b/app/src/pages/More/AppSettings/__tests__/AppSoftwareSettingsCard.test.tsx
index ee3710ee14f..74758881bfc 100644
--- a/app/src/pages/More/AppSettings/__tests__/AppSoftwareSettingsCard.test.tsx
+++ b/app/src/pages/More/AppSettings/__tests__/AppSoftwareSettingsCard.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 // tests for the AppSoftwareSettingsCard
 import * as React from 'react'
 
@@ -11,12 +10,13 @@ import { AppSoftwareSettingsCard } from '../AppSoftwareSettingsCard'
 import { UpdateAppModal } from '../../../../organisms/UpdateAppModal'
 import { UpdateNotificationsControl } from '../UpdateNotificationsControl'
 
-import type { State } from '../../../../redux/types'
+import type { State, Action } from '../../../../redux/types'
+import { ReactWrapper } from 'enzyme'
 
 // TODO(mc, 2020-10-08): this is a partial mock because shell/update
 // needs some reorg to split actions and selectors
 jest.mock('../../../../redux/shell/update', () => ({
-  ...jest.requireActual('../../../../redux/shell/update'),
+  ...jest.requireActual<{}>('../../../../redux/shell/update'),
   getAvailableShellUpdate: jest.fn(),
 }))
 
@@ -24,14 +24,19 @@ jest.mock('../../../../organisms/UpdateAppModal', () => ({
   UpdateAppModal: () => null,
 }))
 
-const getAvailableShellUpdate: JestMockFn<[State], string | null> =
-  Shell.getAvailableShellUpdate
+const getAvailableShellUpdate = Shell.getAvailableShellUpdate as jest.MockedFunction<
+  typeof Shell.getAvailableShellUpdate
+>
 
-const MOCK_STATE: $Shape<State> = {}
+const MOCK_STATE: State = {} as any
 
 describe('AppSoftwareSettingsCard', () => {
   const render = () => {
-    return mountWithStore(<AppSoftwareSettingsCard />, {
+    return mountWithStore<
+      React.ComponentProps<typeof AppSoftwareSettingsCard>,
+      State,
+      Action
+    >(<AppSoftwareSettingsCard />, {
       initialState: MOCK_STATE,
     })
   }
@@ -86,7 +91,7 @@ describe('AppSoftwareSettingsCard', () => {
     expect(button.prop('disabled')).toBe(false)
     expect(wrapper.exists(UpdateAppModal)).toBe(false)
 
-    button.invoke('onClick')()
+    button.invoke('onClick')?.({} as React.MouseEvent)
 
     expect(wrapper.find(Portal).exists(UpdateAppModal)).toBe(true)
   })
@@ -96,8 +101,8 @@ describe('AppSoftwareSettingsCard', () => {
 
     const { wrapper } = render()
 
-    wrapper.find(SecondaryBtn).invoke('onClick')()
-    wrapper.find(UpdateAppModal).invoke('closeModal')()
+    wrapper.find(SecondaryBtn).invoke('onClick')?.({} as React.MouseEvent)
+    wrapper.find(UpdateAppModal).invoke('closeModal')?.()
 
     expect(wrapper.exists(UpdateAppModal)).toBe(false)
   })
@@ -112,20 +117,21 @@ describe('AppSoftwareSettingsCard', () => {
     const section = wrapper
       .find(TitledControl)
       .filterWhere(
-        t => t.prop('title') === 'Restore Different Software Version'
+        (t: ReactWrapper<React.ComponentProps<typeof TitledControl>>) =>
+          t.prop('title') === 'Restore Different Software Version'
       )
 
     const releasesLink = section
       .find(Link)
       .filterWhere(
-        a =>
+        (a: ReactWrapper) =>
           a.prop('href') === 'https://github.com/Opentrons/opentrons/releases'
       )
 
     const articleLink = section
       .find(Link)
       .filterWhere(
-        a =>
+        (a: ReactWrapper) =>
           a.prop('href') ===
           'https://support.opentrons.com/articles/2393514-uninstall-the-opentrons-app'
       )
diff --git a/app/src/pages/More/AppSettings/__tests__/UpdateNotificationsControl.test.tsx b/app/src/pages/More/AppSettings/__tests__/UpdateNotificationsControl.test.tsx
index 79fac01e1b7..88e731dba7a 100644
--- a/app/src/pages/More/AppSettings/__tests__/UpdateNotificationsControl.test.tsx
+++ b/app/src/pages/More/AppSettings/__tests__/UpdateNotificationsControl.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { mountWithStore } from '@opentrons/components/__utils__'
 
@@ -10,28 +9,31 @@ import { ToggleBtn } from '../../../../atoms/ToggleBtn'
 import { UpdateNotificationsControl } from '../UpdateNotificationsControl'
 
 import type { StyleProps } from '@opentrons/components'
-import type { State } from '../../../../redux/types'
-import type { AlertId } from '../../../../redux/alerts/types'
-import type { AnalyticsEvent } from '../../../../redux/analytics/types'
+import type { State, Action } from '../../../../redux/types'
+import { AnalyticsEvent } from '../../../../redux/analytics/types'
 
 jest.mock('../../../../redux/alerts/selectors')
 jest.mock('../../../../redux/analytics/hooks')
 
-const getAlertIsPermanentlyIgnored: JestMockFn<
-  [State, AlertId],
-  boolean | null
-> = Alerts.getAlertIsPermanentlyIgnored
+const getAlertIsPermanentlyIgnored = Alerts.getAlertIsPermanentlyIgnored as jest.MockedFunction<
+  typeof Alerts.getAlertIsPermanentlyIgnored
+>
 
-const useTrackEvent: JestMockFn<[], JestMockFn<[AnalyticsEvent], void>> =
-  Analytics.useTrackEvent
+const useTrackEvent = Analytics.useTrackEvent as jest.MockedFunction<
+  typeof Analytics.useTrackEvent
+>
 
-const MOCK_STATE: $Shape<State> = {}
+const MOCK_STATE: State = {} as any
 
 describe('UpdateNotificationsControl', () => {
-  const trackEvent = jest.fn()
-
-  const render = (styleProps: $Shape<StyleProps> = {}) => {
-    return mountWithStore(<UpdateNotificationsControl {...styleProps} />, {
+  const trackEvent: (e: AnalyticsEvent) => void = jest.fn() as any
+
+  const render = (styleProps: Partial<StyleProps> = {}) => {
+    return mountWithStore<
+      React.ComponentProps<typeof UpdateNotificationsControl>,
+      State,
+      Action
+    >(<UpdateNotificationsControl {...styleProps} />, {
       initialState: MOCK_STATE,
     })
   }
@@ -91,7 +93,7 @@ describe('UpdateNotificationsControl', () => {
     const { wrapper, store } = render()
     const toggle = wrapper.find(ToggleBtn)
 
-    toggle.invoke('onClick')()
+    toggle.invoke('onClick')?.({} as React.MouseEvent)
 
     expect(store.dispatch).toHaveBeenCalledWith(
       Alerts.alertUnignored(Alerts.ALERT_APP_UPDATE_AVAILABLE)
@@ -105,7 +107,7 @@ describe('UpdateNotificationsControl', () => {
     const { wrapper, store } = render()
     const toggle = wrapper.find(ToggleBtn)
 
-    toggle.invoke('onClick')()
+    toggle.invoke('onClick')?.({} as React.MouseEvent)
 
     expect(store.dispatch).toHaveBeenCalledWith(
       Alerts.alertPermanentlyIgnored(Alerts.ALERT_APP_UPDATE_AVAILABLE)
@@ -119,7 +121,7 @@ describe('UpdateNotificationsControl', () => {
     const { wrapper } = render()
     const toggle = wrapper.find(ToggleBtn)
 
-    toggle.invoke('onClick')()
+    toggle.invoke('onClick')?.({} as React.MouseEvent)
 
     expect(trackEvent).toHaveBeenCalledWith({
       name: 'appUpdateNotificationsToggled',
@@ -134,7 +136,7 @@ describe('UpdateNotificationsControl', () => {
     const { wrapper } = render()
     const toggle = wrapper.find(ToggleBtn)
 
-    toggle.invoke('onClick')()
+    toggle.invoke('onClick')?.({} as React.MouseEvent)
 
     expect(trackEvent).toHaveBeenCalledWith({
       name: 'appUpdateNotificationsToggled',
diff --git a/app/src/pages/More/AppSettings/index.tsx b/app/src/pages/More/AppSettings/index.tsx
index fc503b0e539..4ef55ebef9f 100644
--- a/app/src/pages/More/AppSettings/index.tsx
+++ b/app/src/pages/More/AppSettings/index.tsx
@@ -1,4 +1,3 @@
-// @flow
 // view info about the app and update
 import * as React from 'react'
 
@@ -8,7 +7,7 @@ import { AnalyticsSettingsCard } from './AnalyticsSettingsCard'
 import { AppSoftwareSettingsCard } from './AppSoftwareSettingsCard'
 import { AppAdvancedSettingsCard } from './AppAdvancedSettingsCard'
 
-export function AppSettings(): React.Node {
+export function AppSettings(): JSX.Element {
   return (
     <Page titleBarProps={{ title: 'App' }}>
       <Box margin={SPACING_3}>
diff --git a/app/src/pages/More/CustomLabware.tsx b/app/src/pages/More/CustomLabware.tsx
index 38675419782..dc038f63a91 100644
--- a/app/src/pages/More/CustomLabware.tsx
+++ b/app/src/pages/More/CustomLabware.tsx
@@ -1,17 +1,17 @@
-// @flow
 // custom labware page
 import * as React from 'react'
-import type { ContextRouter } from 'react-router-dom'
 
 import { Page } from '../../atoms/Page'
 import { CardContainer, CardRow } from '../../atoms/layout'
 import { AddLabwareCard } from './AddLabwareCard'
 import { ListLabwareCard } from './ListLabwareCard'
 
+import type { RouteComponentProps } from 'react-router-dom'
+
 // TODO(mc, 2019-10-17): i18n
 const CUSTOM_LABWARE_PAGE_TITLE = 'Custom Labware'
 
-export function CustomLabware(props: ContextRouter): React.Node {
+export function CustomLabware(props: RouteComponentProps): JSX.Element {
   return (
     <Page titleBarProps={{ title: CUSTOM_LABWARE_PAGE_TITLE }}>
       <CardContainer>
diff --git a/app/src/pages/More/ListLabwareCard/LabwareItem.tsx b/app/src/pages/More/ListLabwareCard/LabwareItem.tsx
index 6d4e7c9b7b3..1d1b247c32d 100644
--- a/app/src/pages/More/ListLabwareCard/LabwareItem.tsx
+++ b/app/src/pages/More/ListLabwareCard/LabwareItem.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import cx from 'classnames'
 import startCase from 'lodash/startCase'
@@ -30,12 +29,13 @@ const THIS_FILE_CONFLICTS_WITH_ANOTHER_DEFINITION =
 const THIS_FILE_CONFLICTS_WITH_AN_OPENTRONS_DEFINITION =
   'This file conflicts with an Opentrons standard labware definition. If you are trying to create a definition based on an Opentrons definition, please contact support'
 
-export type LabwareItemProps = {|
-  file: CheckedLabwareFile,
-|}
+export interface LabwareItemProps {
+  file: CheckedLabwareFile
+}
 
-export function LabwareItem(props: LabwareItemProps): React.Node {
+export function LabwareItem(props: LabwareItemProps): JSX.Element {
   const { file } = props
+  // @ts-expect-error TODO: use other means to separate out InvalidLabwareFile than defualt value here
   const { type, filename, modified, definition = null } = file
   const apiName = definition?.parameters.loadName || NA
   const displayName = definition?.metadata.displayName || NA
@@ -43,7 +43,7 @@ export function LabwareItem(props: LabwareItemProps): React.Node {
     ? startCase(definition.metadata.displayCategory)
     : NA
 
-  let warning = null
+  let warning: string | null = null
 
   if (type === INVALID_LABWARE_FILE) {
     warning = THIS_FILE_IS_NOT_A_VALID_DEFINITION
@@ -54,7 +54,7 @@ export function LabwareItem(props: LabwareItemProps): React.Node {
   }
 
   return (
-    <li className={cx(styles.item, { [styles.invalid]: warning })}>
+    <li className={cx(styles.item, { [styles.invalid]: Boolean(warning) })}>
       <p className={styles.item_category_column}>{displayCategory}</p>
       <div className={styles.item_name_column}>
         <p className={styles.item_primary_name}>{displayName}</p>
diff --git a/app/src/pages/More/ListLabwareCard/LabwareList.tsx b/app/src/pages/More/ListLabwareCard/LabwareList.tsx
index 44bde597502..69dd645628d 100644
--- a/app/src/pages/More/ListLabwareCard/LabwareList.tsx
+++ b/app/src/pages/More/ListLabwareCard/LabwareList.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 
 import { LabwareItem } from './LabwareItem'
@@ -23,12 +22,12 @@ const NO_LABWARE_DEFINITIONS_FOUND = 'No labware definitions found'
 const PLEASE_ADD_CUSTOM_LABWARE =
   'Please add custom labware via the Labware Management options above'
 
-export type LabwareListProps = {|
-  labware: Array<CheckedLabwareFile>,
-  errorMessage: string | null,
-|}
+export interface LabwareListProps {
+  labware: CheckedLabwareFile[]
+  errorMessage: string | null
+}
 
-export function LabwareList(props: LabwareListProps): React.Node {
+export function LabwareList(props: LabwareListProps): JSX.Element {
   const { labware, errorMessage } = props
   let children = null
 
diff --git a/app/src/pages/More/ListLabwareCard/Warning.tsx b/app/src/pages/More/ListLabwareCard/Warning.tsx
index 0edd4599cc8..b1f8ff06695 100644
--- a/app/src/pages/More/ListLabwareCard/Warning.tsx
+++ b/app/src/pages/More/ListLabwareCard/Warning.tsx
@@ -1,14 +1,13 @@
-// @flow
 import * as React from 'react'
 
 import { Icon } from '@opentrons/components'
 import styles from './styles.css'
 
-export type WarningProps = {|
-  children: React.Node,
-|}
+export interface WarningProps {
+  children: React.ReactNode
+}
 
-export function Warning(props: WarningProps): React.Node {
+export function Warning(props: WarningProps): JSX.Element {
   const { children } = props
 
   return (
diff --git a/app/src/pages/More/ListLabwareCard/__tests__/LabwareItem.test.tsx b/app/src/pages/More/ListLabwareCard/__tests__/LabwareItem.test.tsx
index 9589fa8099b..048d426cd0b 100644
--- a/app/src/pages/More/ListLabwareCard/__tests__/LabwareItem.test.tsx
+++ b/app/src/pages/More/ListLabwareCard/__tests__/LabwareItem.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { shallow, mount } from 'enzyme'
 
diff --git a/app/src/pages/More/ListLabwareCard/__tests__/LabwareList.test.tsx b/app/src/pages/More/ListLabwareCard/__tests__/LabwareList.test.tsx
index 556417c5e5f..e195ad77903 100644
--- a/app/src/pages/More/ListLabwareCard/__tests__/LabwareList.test.tsx
+++ b/app/src/pages/More/ListLabwareCard/__tests__/LabwareList.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { shallow, mount } from 'enzyme'
 
diff --git a/app/src/pages/More/ListLabwareCard/__tests__/ListLabwareCard.test.tsx b/app/src/pages/More/ListLabwareCard/__tests__/ListLabwareCard.test.tsx
index 617ea70e685..280fc17df46 100644
--- a/app/src/pages/More/ListLabwareCard/__tests__/ListLabwareCard.test.tsx
+++ b/app/src/pages/More/ListLabwareCard/__tests__/ListLabwareCard.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { Provider } from 'react-redux'
 import { mount } from 'enzyme'
@@ -9,21 +8,19 @@ import * as LabwareFixtures from '../../../../redux/custom-labware/__fixtures__'
 import * as LabwareSelectors from '../../../../redux/custom-labware/selectors'
 import * as LabwareActions from '../../../../redux/custom-labware/actions'
 
-import type { State } from '../../../../redux/types'
-
 jest.mock('../../../../redux/custom-labware/selectors')
 
-const mockGetCustomLabware: JestMockFn<
-  [State],
-  $Call<typeof LabwareSelectors.getCustomLabware, State>
-> = LabwareSelectors.getCustomLabware
+const mockGetCustomLabware = LabwareSelectors.getCustomLabware as jest.MockedFunction<
+  typeof LabwareSelectors.getCustomLabware
+>
 
-const mockGetListLabwareErrorMessage: JestMockFn<[State], string | null> =
-  LabwareSelectors.getListLabwareErrorMessage
+const mockGetListLabwareErrorMessage = LabwareSelectors.getListLabwareErrorMessage as jest.MockedFunction<
+  typeof LabwareSelectors.getListLabwareErrorMessage
+>
 
 describe('ListLabwareCard', () => {
-  let mockStore
-  let render
+  let mockStore: any
+  let render: () => ReturnType<typeof mount>
 
   beforeEach(() => {
     jest.useFakeTimers()
diff --git a/app/src/pages/More/ListLabwareCard/__tests__/Warning.test.tsx b/app/src/pages/More/ListLabwareCard/__tests__/Warning.test.tsx
index 5f91c159bdf..5505f88114b 100644
--- a/app/src/pages/More/ListLabwareCard/__tests__/Warning.test.tsx
+++ b/app/src/pages/More/ListLabwareCard/__tests__/Warning.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { shallow } from 'enzyme'
 
diff --git a/app/src/pages/More/ListLabwareCard/__tests__/__snapshots__/LabwareItem.test.js.snap b/app/src/pages/More/ListLabwareCard/__tests__/__snapshots__/LabwareItem.test.tsx.snap
similarity index 100%
rename from app/src/pages/More/ListLabwareCard/__tests__/__snapshots__/LabwareItem.test.js.snap
rename to app/src/pages/More/ListLabwareCard/__tests__/__snapshots__/LabwareItem.test.tsx.snap
diff --git a/app/src/pages/More/ListLabwareCard/__tests__/__snapshots__/LabwareList.test.js.snap b/app/src/pages/More/ListLabwareCard/__tests__/__snapshots__/LabwareList.test.tsx.snap
similarity index 100%
rename from app/src/pages/More/ListLabwareCard/__tests__/__snapshots__/LabwareList.test.js.snap
rename to app/src/pages/More/ListLabwareCard/__tests__/__snapshots__/LabwareList.test.tsx.snap
diff --git a/app/src/pages/More/ListLabwareCard/__tests__/__snapshots__/Warning.test.js.snap b/app/src/pages/More/ListLabwareCard/__tests__/__snapshots__/Warning.test.tsx.snap
similarity index 100%
rename from app/src/pages/More/ListLabwareCard/__tests__/__snapshots__/Warning.test.js.snap
rename to app/src/pages/More/ListLabwareCard/__tests__/__snapshots__/Warning.test.tsx.snap
diff --git a/app/src/pages/More/ListLabwareCard/index.tsx b/app/src/pages/More/ListLabwareCard/index.tsx
index d49a4966d56..ffa68a813a0 100644
--- a/app/src/pages/More/ListLabwareCard/index.tsx
+++ b/app/src/pages/More/ListLabwareCard/index.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { useDispatch, useSelector } from 'react-redux'
 import { Card, useInterval } from '@opentrons/components'
@@ -17,7 +16,7 @@ const LABWARE_REFRESH_INTERVAL_MS = 5000
 // TODO(mc, 2019-11-21): i18n
 const CUSTOM_LABWARE_LIST = 'Custom Labware List'
 
-export function ListLabwareCard(): React.Node {
+export function ListLabwareCard(): JSX.Element {
   const dispatch = useDispatch<Dispatch>()
   const labware = useSelector(getCustomLabware)
   const listLabwareError = useSelector(getListLabwareErrorMessage)
diff --git a/app/src/pages/More/MorePanel/index.tsx b/app/src/pages/More/MorePanel/index.tsx
index a719fa8a326..c270a605581 100644
--- a/app/src/pages/More/MorePanel/index.tsx
+++ b/app/src/pages/More/MorePanel/index.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { SidePanel, ListItem, Icon } from '@opentrons/components'
 
@@ -13,7 +12,7 @@ const ITEMS = [
   { label: 'Resources', url: '/more/resources' },
 ]
 
-export function MorePanel(): React.Node {
+export function MorePanel(): JSX.Element {
   return (
     <SidePanel title={MORE}>
       <div className={styles.menu_panel}>
diff --git a/app/src/pages/More/NetworkAndSystem.tsx b/app/src/pages/More/NetworkAndSystem.tsx
index 67807be1acd..68ab1349ab4 100644
--- a/app/src/pages/More/NetworkAndSystem.tsx
+++ b/app/src/pages/More/NetworkAndSystem.tsx
@@ -1,4 +1,3 @@
-// @flow
 // Page for /more/network-and-system
 import * as React from 'react'
 import { css } from 'styled-components'
@@ -18,7 +17,7 @@ const CARD_GRID_STYLE = css`
   }
 `
 
-export const NetworkAndSystem = (): React.Node => (
+export const NetworkAndSystem = (): JSX.Element => (
   <Page titleBarProps={{ title: NETWORK_AND_SYSTEM }}>
     <div css={CARD_GRID_STYLE}>
       <NetworkSettingsCard />
diff --git a/app/src/pages/More/NetworkSettingsCard/AddManualIp/AddManualIpModal.tsx b/app/src/pages/More/NetworkSettingsCard/AddManualIp/AddManualIpModal.tsx
index 461f2ae818b..4fad9dd513b 100644
--- a/app/src/pages/More/NetworkSettingsCard/AddManualIp/AddManualIpModal.tsx
+++ b/app/src/pages/More/NetworkSettingsCard/AddManualIp/AddManualIpModal.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 
 import { AlertModal } from '@opentrons/components'
@@ -6,11 +5,11 @@ import { Portal } from '../../../../App/portal'
 import { ManualIpForm } from './ManualIpForm'
 import { IpList } from './IpList'
 
-export type AddManualIpProps = {|
-  closeModal: () => mixed,
-|}
+export interface AddManualIpProps {
+  closeModal: () => unknown
+}
 
-export function AddManualIpModal(props: AddManualIpProps): React.Node {
+export function AddManualIpModal(props: AddManualIpProps): JSX.Element {
   return (
     <Portal>
       <AlertModal
diff --git a/app/src/pages/More/NetworkSettingsCard/AddManualIp/IpField.tsx b/app/src/pages/More/NetworkSettingsCard/AddManualIp/IpField.tsx
index 231a2f456b9..0070d9f007b 100644
--- a/app/src/pages/More/NetworkSettingsCard/AddManualIp/IpField.tsx
+++ b/app/src/pages/More/NetworkSettingsCard/AddManualIp/IpField.tsx
@@ -1,15 +1,14 @@
-// @flow
 import * as React from 'react'
 import { IconButton } from '@opentrons/components'
 import styles from './styles.css'
 
-export type IpFieldProps = {|
-  field: any,
-  form: any,
-  inputRef: { current: null | HTMLInputElement },
-|}
+export interface IpFieldProps {
+  field: any
+  form: any
+  inputRef: { current: null | HTMLInputElement }
+}
 
-export function IpField(props: IpFieldProps): React.Node {
+export function IpField(props: IpFieldProps): JSX.Element {
   const {
     field,
     form: { submitForm, dirty },
diff --git a/app/src/pages/More/NetworkSettingsCard/AddManualIp/IpItem.tsx b/app/src/pages/More/NetworkSettingsCard/AddManualIp/IpItem.tsx
index b00f23d996b..4b9525b56e5 100644
--- a/app/src/pages/More/NetworkSettingsCard/AddManualIp/IpItem.tsx
+++ b/app/src/pages/More/NetworkSettingsCard/AddManualIp/IpItem.tsx
@@ -1,20 +1,19 @@
-// @flow
 import * as React from 'react'
 import { IconButton, Icon } from '@opentrons/components'
 import styles from './styles.css'
 
 import type { IconName } from '@opentrons/components'
 
-export type IpItemProps = {|
-  candidate: string,
-  discovered: boolean,
-  removeIp: (ip: string) => mixed,
-|}
+export interface IpItemProps {
+  candidate: string
+  discovered: boolean
+  removeIp: (ip: string) => unknown
+}
 
 export class IpItem extends React.Component<IpItemProps> {
-  remove: () => mixed = () => this.props.removeIp(this.props.candidate)
+  remove: () => unknown = () => this.props.removeIp(this.props.candidate)
 
-  render(): React.Node {
+  render(): JSX.Element {
     const iconName = this.props.discovered ? 'check' : 'ot-spinner'
     return (
       <div className={styles.ip_item_group}>
@@ -30,11 +29,11 @@ export class IpItem extends React.Component<IpItemProps> {
   }
 }
 
-type DiscoveryIconProps = {|
-  iconName: IconName,
-|}
+interface DiscoveryIconProps {
+  iconName: IconName
+}
 
-function DiscoveryIcon(props: DiscoveryIconProps) {
+function DiscoveryIcon(props: DiscoveryIconProps): JSX.Element {
   const spin = props.iconName === 'ot-spinner'
   return (
     <div className={styles.discovery_icon}>
diff --git a/app/src/pages/More/NetworkSettingsCard/AddManualIp/IpList.tsx b/app/src/pages/More/NetworkSettingsCard/AddManualIp/IpList.tsx
index 035009c1fa1..db5dd4d6848 100644
--- a/app/src/pages/More/NetworkSettingsCard/AddManualIp/IpList.tsx
+++ b/app/src/pages/More/NetworkSettingsCard/AddManualIp/IpList.tsx
@@ -1,30 +1,28 @@
-// @flow
 import * as React from 'react'
-import { connect } from 'react-redux'
+import { connect, MapDispatchToProps } from 'react-redux'
 import { getConfig, removeManualIp } from '../../../../redux/config'
 import { getViewableRobots } from '../../../../redux/discovery'
 import { IpItem } from './IpItem'
 
-import type { State, Dispatch } from '../../../../redux/types'
+import type { State } from '../../../../redux/types'
 import type { DiscoveryCandidates } from '../../../../redux/config/types'
 import type { Robot, ReachableRobot } from '../../../../redux/discovery/types'
 
-type OP = {||}
-
-type SP = {|
-  robots: Array<Robot | ReachableRobot>,
-  candidates: DiscoveryCandidates,
-|}
+interface SP {
+  robots: Array<Robot | ReachableRobot>
+  candidates: DiscoveryCandidates
+}
 
-type DP = {|
-  removeManualIp: (ip: string) => mixed,
-|}
+interface DP {
+  removeManualIp: (ip: string) => unknown
+}
 
-type Props = {| ...SP, ...DP |}
+type Props = SP & DP
 
-function IpListComponent(props: Props) {
+function IpListComponent(props: Props): JSX.Element {
   const { candidates, removeManualIp, robots } = props
-  const candidateList: Array<string> = [].concat(candidates)
+  // @ts-expect-error TODO: candidates is expected to be string[] here, but type allows for string as well
+  const candidateList: string[] = [].concat(candidates)
 
   return (
     <div>
@@ -51,20 +49,13 @@ function mapStateToProps(state: State): SP {
   }
 }
 
-function mapDispatchToProps(dispatch: Dispatch): DP {
+const mapDispatchToProps: MapDispatchToProps<DP, {}> = dispatch => {
   return {
     removeManualIp: ip => dispatch(removeManualIp(ip)),
   }
 }
 
-export const IpList: React.AbstractComponent<OP> = connect<
-  Props,
-  OP,
-  SP,
-  DP,
-  State,
-  Dispatch
->(
+export const IpList = connect(
   mapStateToProps,
   mapDispatchToProps
 )(IpListComponent)
diff --git a/app/src/pages/More/NetworkSettingsCard/AddManualIp/ManualIpForm.tsx b/app/src/pages/More/NetworkSettingsCard/AddManualIp/ManualIpForm.tsx
index dd13f67461a..3844b8d4e97 100644
--- a/app/src/pages/More/NetworkSettingsCard/AddManualIp/ManualIpForm.tsx
+++ b/app/src/pages/More/NetworkSettingsCard/AddManualIp/ManualIpForm.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { connect } from 'react-redux'
 import { getConfig, addManualIp } from '../../../../redux/config'
@@ -7,16 +6,19 @@ import { startDiscovery } from '../../../../redux/discovery'
 import { Formik, Form, Field } from 'formik'
 import { IpField } from './IpField'
 
-import type { State, Dispatch } from '../../../../redux/types'
+import type { MapDispatchToProps } from 'react-redux'
+import type { State } from '../../../../redux/types'
 import type { DiscoveryCandidates } from '../../../../redux/config/types'
 
-type OP = {||}
-
-type SP = {| candidates: DiscoveryCandidates |}
+interface SP {
+  candidates: DiscoveryCandidates
+}
 
-type DP = {| addManualIp: (ip: string) => mixed |}
+interface DP {
+  addManualIp: (ip: string) => unknown
+}
 
-type Props = {| ...SP, ...DP |}
+type Props = SP & DP
 
 class ManualIpFormComponent extends React.Component<Props> {
   inputRef: { current: null | HTMLInputElement }
@@ -26,7 +28,7 @@ class ManualIpFormComponent extends React.Component<Props> {
     this.inputRef = React.createRef()
   }
 
-  render(): React.Node {
+  render(): JSX.Element {
     return (
       <Formik
         initialValues={{ ip: '' }}
@@ -58,7 +60,7 @@ function mapStateToProps(state: State): SP {
   }
 }
 
-function mapDispatchToProps(dispatch: Dispatch): DP {
+const mapDispatchToProps: MapDispatchToProps<DP, {}> = dispatch => {
   return {
     addManualIp: ip => {
       dispatch(addManualIp(ip))
@@ -67,14 +69,7 @@ function mapDispatchToProps(dispatch: Dispatch): DP {
   }
 }
 
-export const ManualIpForm: React.AbstractComponent<OP> = connect<
-  Props,
-  OP,
-  _,
-  _,
-  _,
-  _
->(
+export const ManualIpForm = connect(
   mapStateToProps,
   mapDispatchToProps
 )(ManualIpFormComponent)
diff --git a/app/src/pages/More/NetworkSettingsCard/AddManualIp/__tests__/AddManualIp.test.tsx b/app/src/pages/More/NetworkSettingsCard/AddManualIp/__tests__/AddManualIp.test.tsx
index 00dc36fb222..615c7bc5065 100644
--- a/app/src/pages/More/NetworkSettingsCard/AddManualIp/__tests__/AddManualIp.test.tsx
+++ b/app/src/pages/More/NetworkSettingsCard/AddManualIp/__tests__/AddManualIp.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { act } from 'react-dom/test-utils'
 import { mount } from 'enzyme'
@@ -30,7 +29,7 @@ describe('AddManualIp setting component', () => {
 
     expect(wrapper.find(AddManualIpModal)).toHaveLength(0)
     act(() => {
-      button.prop('buttonProps').onClick()
+      button.prop('buttonProps').onClick?.({} as React.MouseEvent)
     })
     wrapper.update()
 
@@ -42,12 +41,12 @@ describe('AddManualIp setting component', () => {
     const button = wrapper.find(LabeledButton)
 
     act(() => {
-      button.prop('buttonProps').onClick()
+      button.prop('buttonProps').onClick?.({} as React.MouseEvent)
     })
     wrapper.update()
 
     act(() => {
-      wrapper.find(AddManualIpModal).invoke('closeModal')()
+      wrapper.find(AddManualIpModal).invoke('closeModal')?.()
     })
     wrapper.update()
 
diff --git a/app/src/pages/More/NetworkSettingsCard/AddManualIp/index.tsx b/app/src/pages/More/NetworkSettingsCard/AddManualIp/index.tsx
index efc92f48d3e..467b185c84f 100644
--- a/app/src/pages/More/NetworkSettingsCard/AddManualIp/index.tsx
+++ b/app/src/pages/More/NetworkSettingsCard/AddManualIp/index.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 
 import { LabeledButton } from '@opentrons/components'
@@ -10,7 +9,7 @@ const ADD_IP_TITLE = 'Manually Add Robot Network Addresses'
 const ADD_IP_DESCRIPTION =
   'If your app is unable to automatically discover your robot, you can manually add its IP address or hostname here'
 
-export function AddManualIp(): React.Node {
+export function AddManualIp(): JSX.Element {
   const [modalOpen, setModalOpen] = React.useState(false)
 
   return (
diff --git a/app/src/pages/More/NetworkSettingsCard/ClearDiscoveryCache.tsx b/app/src/pages/More/NetworkSettingsCard/ClearDiscoveryCache.tsx
index 2231b0ce5db..03f2203dacb 100644
--- a/app/src/pages/More/NetworkSettingsCard/ClearDiscoveryCache.tsx
+++ b/app/src/pages/More/NetworkSettingsCard/ClearDiscoveryCache.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { useDispatch } from 'react-redux'
 import { clearDiscoveryCache } from '../../../redux/discovery'
@@ -11,7 +10,7 @@ const CLEAR_ROBOTS_TITLE = 'Clear Discovered Robots List'
 const CLEAR_ROBOTS_DESCRIPTION =
   'If your app has unused robots in its list, click to clear the cache & remove them.'
 
-export function ClearDiscoveryCache(): React.Node {
+export function ClearDiscoveryCache(): JSX.Element {
   const dispatch = useDispatch<Dispatch>()
   return (
     <LabeledButton
diff --git a/app/src/pages/More/NetworkSettingsCard/DisableDiscoveryCache.tsx b/app/src/pages/More/NetworkSettingsCard/DisableDiscoveryCache.tsx
index d6ea051d697..6d3a2b4f974 100644
--- a/app/src/pages/More/NetworkSettingsCard/DisableDiscoveryCache.tsx
+++ b/app/src/pages/More/NetworkSettingsCard/DisableDiscoveryCache.tsx
@@ -1,11 +1,10 @@
-// @flow
 import * as React from 'react'
 import { useSelector, useDispatch } from 'react-redux'
 import { LabeledToggle } from '@opentrons/components'
 import type { State, Dispatch } from '../../../redux/types'
 import { getConfig, toggleConfigValue } from '../../../redux/config'
 
-export const DisableDiscoveryCache = (): React.Node => {
+export const DisableDiscoveryCache = (): JSX.Element => {
   const dispatch = useDispatch<Dispatch>()
   const cacheDisabled = useSelector((state: State) => {
     return getConfig(state)?.discovery.disableCache ?? false
diff --git a/app/src/pages/More/NetworkSettingsCard/__tests__/ClearDiscoveryCache.test.tsx b/app/src/pages/More/NetworkSettingsCard/__tests__/ClearDiscoveryCache.test.tsx
index b5b3bb9806d..4530c188ca8 100644
--- a/app/src/pages/More/NetworkSettingsCard/__tests__/ClearDiscoveryCache.test.tsx
+++ b/app/src/pages/More/NetworkSettingsCard/__tests__/ClearDiscoveryCache.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { Provider } from 'react-redux'
 import { mount } from 'enzyme'
@@ -36,7 +35,7 @@ describe('ClearDiscoveryCache', () => {
   it('dispatches a ClearDiscoveryCache Action', () => {
     const wrapper = render()
     const buttonProps = wrapper.find(LabeledButton).prop('buttonProps')
-    buttonProps.onClick()
+    buttonProps.onClick?.({} as React.MouseEvent)
     expect(dispatch).toHaveBeenCalledWith(clearDiscoveryCache())
   })
 })
diff --git a/app/src/pages/More/NetworkSettingsCard/__tests__/DisableDiscoveryCache.test.tsx b/app/src/pages/More/NetworkSettingsCard/__tests__/DisableDiscoveryCache.test.tsx
index 4a7ccba10f5..d7c5f653185 100644
--- a/app/src/pages/More/NetworkSettingsCard/__tests__/DisableDiscoveryCache.test.tsx
+++ b/app/src/pages/More/NetworkSettingsCard/__tests__/DisableDiscoveryCache.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { Provider } from 'react-redux'
 import { mount } from 'enzyme'
@@ -9,15 +8,17 @@ import { LabeledToggle } from '@opentrons/components'
 import { DisableDiscoveryCache } from '../DisableDiscoveryCache'
 
 import type { State } from '../../../../redux/types'
-import type { Config } from '../../../../redux/config/types'
 
 jest.mock('../../../../redux/config/selectors')
 
-const MOCK_STATE: State = ({ mockState: true }: any)
+const MOCK_STATE: State = { mockState: true } as any
 
-const getConfig: JestMockFn<[State], $Shape<Config> | null> = Cfg.getConfig
+const getConfig = Cfg.getConfig as jest.MockedFunction<typeof Cfg.getConfig>
 
-function stubSelector<R>(mock: JestMockFn<[State], R>, rVal: R) {
+function stubSelector<R>(
+  mock: jest.MockedFunction<(s: State) => R>,
+  rVal: R
+): void {
   mock.mockImplementation(state => {
     expect(state).toBe(MOCK_STATE)
     return rVal
@@ -32,7 +33,7 @@ describe('DisableDiscoveryCache', () => {
     getState: () => MOCK_STATE,
   }
 
-  const render = () => {
+  const render = (): ReturnType<typeof mount> => {
     return mount(<DisableDiscoveryCache />, {
       wrappingComponent: Provider,
       wrappingComponentProps: { store: MOCK_STORE },
@@ -42,7 +43,7 @@ describe('DisableDiscoveryCache', () => {
   beforeEach(() => {
     stubSelector(getConfig, {
       discovery: { candidates: [], disableCache: false },
-    })
+    } as any)
   })
 
   afterEach(() => {
@@ -66,14 +67,14 @@ describe('DisableDiscoveryCache', () => {
   it('updates the toggle status according to disableCache config', () => {
     stubSelector(getConfig, {
       discovery: { candidates: [], disableCache: true },
-    })
+    } as any)
     const wrapper = render()
     expect(wrapper.find(LabeledToggle).prop('toggledOn')).toBe(true)
 
     // toggle switches value
     stubSelector(getConfig, {
       discovery: { candidates: [], disableCache: false },
-    })
+    } as any)
 
     // trigger a re-render
     wrapper.setProps({})
diff --git a/app/src/pages/More/NetworkSettingsCard/__tests__/NetworkSettingsCard.test.tsx b/app/src/pages/More/NetworkSettingsCard/__tests__/NetworkSettingsCard.test.tsx
index 9b7f3f1f755..06796fc19a6 100644
--- a/app/src/pages/More/NetworkSettingsCard/__tests__/NetworkSettingsCard.test.tsx
+++ b/app/src/pages/More/NetworkSettingsCard/__tests__/NetworkSettingsCard.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { shallow } from 'enzyme'
 
diff --git a/app/src/pages/More/NetworkSettingsCard/index.tsx b/app/src/pages/More/NetworkSettingsCard/index.tsx
index cfcb7b7e927..814b6b6e6ed 100644
--- a/app/src/pages/More/NetworkSettingsCard/index.tsx
+++ b/app/src/pages/More/NetworkSettingsCard/index.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 
 import { Card } from '@opentrons/components'
@@ -9,7 +8,7 @@ import { DisableDiscoveryCache } from './DisableDiscoveryCache'
 // TODO(mc, 2020-04-27): i18n
 const NETWORK_SETTINGS = 'Network Settings'
 
-export const NetworkSettingsCard = (): React.Node => (
+export const NetworkSettingsCard = (): JSX.Element => (
   <Card title={NETWORK_SETTINGS}>
     <AddManualIp />
     <DisableDiscoveryCache />
diff --git a/app/src/pages/More/Resources/ResourceCard.tsx b/app/src/pages/More/Resources/ResourceCard.tsx
index e095716314f..5a53bac2729 100644
--- a/app/src/pages/More/Resources/ResourceCard.tsx
+++ b/app/src/pages/More/Resources/ResourceCard.tsx
@@ -1,22 +1,20 @@
-// @flow
 // resources page layout
 import * as React from 'react'
 import { Card, OutlineButton } from '@opentrons/components'
 
 import styles from './styles.css'
 
-type Props = {
-  title: React.Node,
-  description: React.Node,
-  url: string,
+interface Props {
+  title: React.ReactNode
+  description: React.ReactNode
+  url: string
 }
 
-export function ResourceCard(props: Props): React.Node {
+export function ResourceCard(props: Props): JSX.Element {
   return (
     <Card title={props.title}>
       <div className={styles.card_content}>
         <p className={styles.link_label}>{props.description}</p>
-        {/* $FlowFixMe(mc, 2021-03-18): resolve with TS conversion or by using SecondaryBtn */}
         <OutlineButton
           Component="a"
           href={props.url}
diff --git a/app/src/pages/More/Resources/index.tsx b/app/src/pages/More/Resources/index.tsx
index 2cb19fb94fe..3974bda86f2 100644
--- a/app/src/pages/More/Resources/index.tsx
+++ b/app/src/pages/More/Resources/index.tsx
@@ -1,11 +1,10 @@
-// @flow
 // resources page layout
 import * as React from 'react'
 import { Page } from '../../../atoms/Page'
 import { ResourceCard } from './ResourceCard'
 import { CardContainer, CardRow } from '../../../atoms/layout'
 
-export function Resources(): React.Node {
+export function Resources(): JSX.Element {
   return (
     <Page titleBarProps={{ title: 'Resources' }}>
       <CardContainer>
diff --git a/app/src/pages/More/SystemInfoCard/U2EAdapterInfo.tsx b/app/src/pages/More/SystemInfoCard/U2EAdapterInfo.tsx
index 550954ac9c4..255daac0425 100644
--- a/app/src/pages/More/SystemInfoCard/U2EAdapterInfo.tsx
+++ b/app/src/pages/More/SystemInfoCard/U2EAdapterInfo.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { useSelector } from 'react-redux'
 
@@ -19,7 +18,7 @@ import type { State } from '../../../redux/types'
 
 const U2E_ADAPTER_INFORMATION = 'USB-to-Ethernet Adapter Information'
 
-export const U2EAdapterInfo = (): React.Node => {
+export const U2EAdapterInfo = (): JSX.Element => {
   const device = useSelector(SystemInfo.getU2EAdapterDevice)
   const ifacesMap = useSelector(SystemInfo.getU2EInterfacesMap)
   const driverOutdated = useSelector((state: State) => {
diff --git a/app/src/pages/More/SystemInfoCard/U2EDeviceDetails.tsx b/app/src/pages/More/SystemInfoCard/U2EDeviceDetails.tsx
index 0645a6ea498..c165780c90c 100644
--- a/app/src/pages/More/SystemInfoCard/U2EDeviceDetails.tsx
+++ b/app/src/pages/More/SystemInfoCard/U2EDeviceDetails.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import styled from 'styled-components'
 
@@ -27,17 +26,17 @@ const NETWORK_INTERFACE = 'Network Interface'
 const IPV4_ADDRESS = 'Local IPv4 Address'
 const IPV6_ADDRESS = 'Local IPv6 Address'
 
-export type U2EDeviceDetailsProps = {|
-  device: UsbDevice | null,
-  ifaces: Array<NetworkInterface>,
-|}
+export interface U2EDeviceDetailsProps {
+  device: UsbDevice | null
+  ifaces: NetworkInterface[]
+}
 
 const DetailText = styled.span`
   min-width: 8rem;
   margin-right: ${SPACING_1};
 `
 
-const DEVICE_STATS: Array<{| label: string, property: $Keys<UsbDevice> |}> = [
+const DEVICE_STATS: Array<{ label: string; property: keyof UsbDevice }> = [
   { label: 'Description', property: 'deviceName' },
   { label: 'Manufacturer', property: 'manufacturer' },
   { label: 'Serial Number', property: 'serialNumber' },
@@ -47,10 +46,10 @@ const DEVICE_STATS: Array<{| label: string, property: $Keys<UsbDevice> |}> = [
 const DetailItem = ({
   label,
   value,
-}: {|
-  label: string,
-  value: string | number,
-|}) => (
+}: {
+  label: string
+  value: string | number
+}): JSX.Element => (
   <Flex as="li" marginBottom={SPACING_1}>
     <DetailText>{label}:</DetailText>
     <DetailText>{value}</DetailText>
@@ -60,7 +59,7 @@ const DetailItem = ({
 export const U2EDeviceDetails = ({
   device,
   ifaces,
-}: U2EDeviceDetailsProps): React.Node => {
+}: U2EDeviceDetailsProps): JSX.Element => {
   const nwIfaceName = ifaces.length > 0 ? ifaces[0].name : NOT_ASSIGNED
 
   return (
diff --git a/app/src/pages/More/SystemInfoCard/U2EDriverWarning.tsx b/app/src/pages/More/SystemInfoCard/U2EDriverWarning.tsx
index 419b759cdcc..d594174c48c 100644
--- a/app/src/pages/More/SystemInfoCard/U2EDriverWarning.tsx
+++ b/app/src/pages/More/SystemInfoCard/U2EDriverWarning.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import styled from 'styled-components'
 
@@ -37,8 +36,8 @@ const GetUpdateButton = styled(OutlineButton)`
 `
 
 export function U2EDriverWarning(
-  props: React.ElementProps<typeof Flex>
-): React.Node {
+  props: React.ComponentProps<typeof Flex>
+): JSX.Element {
   const trackEvent = useTrackEvent()
 
   return (
diff --git a/app/src/pages/More/SystemInfoCard/__tests__/SystemInfoCard.test.tsx b/app/src/pages/More/SystemInfoCard/__tests__/SystemInfoCard.test.tsx
index 64d58e44da9..45950d3e29d 100644
--- a/app/src/pages/More/SystemInfoCard/__tests__/SystemInfoCard.test.tsx
+++ b/app/src/pages/More/SystemInfoCard/__tests__/SystemInfoCard.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { shallow } from 'enzyme'
 
diff --git a/app/src/pages/More/SystemInfoCard/__tests__/U2EAdapterInfo.test.tsx b/app/src/pages/More/SystemInfoCard/__tests__/U2EAdapterInfo.test.tsx
index c886983929d..38743d7fb4e 100644
--- a/app/src/pages/More/SystemInfoCard/__tests__/U2EAdapterInfo.test.tsx
+++ b/app/src/pages/More/SystemInfoCard/__tests__/U2EAdapterInfo.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { Provider } from 'react-redux'
 import { mount } from 'enzyme'
@@ -10,16 +9,11 @@ import { U2EAdapterInfo } from '../U2EAdapterInfo'
 import { U2EDriverWarning } from '../U2EDriverWarning'
 
 import type { State } from '../../../../redux/types'
-import type {
-  UsbDevice,
-  DriverStatus,
-  U2EInterfaceMap,
-} from '../../../../redux/system-info/types'
 
 jest.mock('../../../../redux/system-info/selectors')
 jest.mock('../../../../redux/analytics')
 
-const MOCK_STATE: State = ({ mockState: true }: any)
+const MOCK_STATE: State = { mockState: true } as any
 
 const MOCK_STORE = {
   getState: () => MOCK_STATE,
@@ -27,16 +21,22 @@ const MOCK_STORE = {
   subscribe: noop,
 }
 
-const getU2EAdapterDevice: JestMockFn<[State], UsbDevice | null> =
-  SystemInfo.getU2EAdapterDevice
+const getU2EAdapterDevice = SystemInfo.getU2EAdapterDevice as jest.MockedFunction<
+  typeof SystemInfo.getU2EAdapterDevice
+>
 
-const getU2EInterfacesMap: JestMockFn<[State], U2EInterfaceMap> =
-  SystemInfo.getU2EInterfacesMap
+const getU2EInterfacesMap = SystemInfo.getU2EInterfacesMap as jest.MockedFunction<
+  typeof SystemInfo.getU2EInterfacesMap
+>
 
-const getU2EWindowsDriverStatus: JestMockFn<[State], DriverStatus> =
-  SystemInfo.getU2EWindowsDriverStatus
+const getU2EWindowsDriverStatus = SystemInfo.getU2EWindowsDriverStatus as jest.MockedFunction<
+  typeof SystemInfo.getU2EWindowsDriverStatus
+>
 
-function stubSelector<R>(mock: JestMockFn<[State], R>, rVal: R) {
+function stubSelector<R>(
+  mock: jest.MockedFunction<(s: State) => R>,
+  rVal: R
+): void {
   mock.mockImplementation(state => {
     expect(state).toBe(MOCK_STATE)
     return rVal
@@ -44,7 +44,7 @@ function stubSelector<R>(mock: JestMockFn<[State], R>, rVal: R) {
 }
 
 describe('U2EAdapterInfo', () => {
-  const render = () => {
+  const render = (): ReturnType<typeof mount> => {
     return mount(<U2EAdapterInfo />, {
       wrappingComponent: Provider,
       wrappingComponentProps: { store: MOCK_STORE },
diff --git a/app/src/pages/More/SystemInfoCard/__tests__/U2EDriverWarning.test.tsx b/app/src/pages/More/SystemInfoCard/__tests__/U2EDriverWarning.test.tsx
index cb719bd2d1b..2a5b9ba4a49 100644
--- a/app/src/pages/More/SystemInfoCard/__tests__/U2EDriverWarning.test.tsx
+++ b/app/src/pages/More/SystemInfoCard/__tests__/U2EDriverWarning.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { mount } from 'enzyme'
 
@@ -16,11 +15,14 @@ import { U2EDriverWarning } from '../U2EDriverWarning'
 
 jest.mock('../../../../redux/analytics')
 
-const useTrackEvent: JestMockFn<[], $Call<typeof Analytics.useTrackEvent>> =
-  Analytics.useTrackEvent
+const useTrackEvent = Analytics.useTrackEvent as jest.MockedFunction<
+  typeof Analytics.useTrackEvent
+>
 
 describe('U2EDriverWarning', () => {
-  const trackEvent = jest.fn()
+  const trackEvent: jest.MockedFunction<
+    typeof Analytics.useTrackEvent
+  > = jest.fn()
 
   beforeEach(() => {
     useTrackEvent.mockReturnValue(trackEvent)
diff --git a/app/src/pages/More/SystemInfoCard/index.tsx b/app/src/pages/More/SystemInfoCard/index.tsx
index c9d06be5417..f8efbfd553a 100644
--- a/app/src/pages/More/SystemInfoCard/index.tsx
+++ b/app/src/pages/More/SystemInfoCard/index.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { Card } from '@opentrons/components'
 
@@ -7,7 +6,7 @@ import { U2EAdapterInfo } from './U2EAdapterInfo'
 // TODO(mc, 2020-04-27): i18n
 const SYSTEM_INFORMATION = 'System Information'
 
-export const SystemInfoCard = (): React.Node => (
+export const SystemInfoCard = (): JSX.Element => (
   <Card title={SYSTEM_INFORMATION}>
     <U2EAdapterInfo />
   </Card>
diff --git a/app/src/pages/More/__tests__/AppSettings.test.tsx b/app/src/pages/More/__tests__/AppSettings.test.tsx
index dbc4eda4aea..d2193eec29d 100644
--- a/app/src/pages/More/__tests__/AppSettings.test.tsx
+++ b/app/src/pages/More/__tests__/AppSettings.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 // app settings page component
 import * as React from 'react'
 import { shallow } from 'enzyme'
diff --git a/app/src/pages/More/__tests__/NetworkAndSystem.test.tsx b/app/src/pages/More/__tests__/NetworkAndSystem.test.tsx
index 9abbc1f5c95..ba79e49accd 100644
--- a/app/src/pages/More/__tests__/NetworkAndSystem.test.tsx
+++ b/app/src/pages/More/__tests__/NetworkAndSystem.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import React from 'react'
 import { shallow } from 'enzyme'
 
diff --git a/app/src/pages/More/index.tsx b/app/src/pages/More/index.tsx
index 7ac85a4dbe9..7d3fc4582bd 100644
--- a/app/src/pages/More/index.tsx
+++ b/app/src/pages/More/index.tsx
@@ -1,4 +1,3 @@
-// @flow
 // more nav button routes
 import * as React from 'react'
 import { useRouteMatch, Switch, Route, Redirect } from 'react-router-dom'
@@ -8,7 +7,7 @@ import { CustomLabware } from './CustomLabware'
 import { NetworkAndSystem } from './NetworkAndSystem'
 import { Resources } from './Resources'
 
-export function More(): React.Node {
+export function More(): JSX.Element {
   const { path } = useRouteMatch()
   const appPath = `${path}/app`
 
diff --git a/app/src/pages/Robots/ConnectPanel/RobotItem.tsx b/app/src/pages/Robots/ConnectPanel/RobotItem.tsx
index 94482cb47da..59700ac47b8 100644
--- a/app/src/pages/Robots/ConnectPanel/RobotItem.tsx
+++ b/app/src/pages/Robots/ConnectPanel/RobotItem.tsx
@@ -1,8 +1,7 @@
-// @flow
 // connected component for an item in a RobotList
 import * as React from 'react'
 import { useDispatch, useSelector } from 'react-redux'
-import { withRouter, type ContextRouter } from 'react-router-dom'
+import { withRouter } from 'react-router-dom'
 
 import {
   actions as RobotActions,
@@ -10,21 +9,19 @@ import {
 } from '../../../redux/robot'
 import { getBuildrootUpdateAvailable, UPGRADE } from '../../../redux/buildroot'
 import { CONNECTABLE } from '../../../redux/discovery'
-import { RobotListItem } from './RobotListItem.js'
+import { RobotListItem } from './RobotListItem'
 
+import type { RouteComponentProps } from 'react-router-dom'
 import type { State, Dispatch } from '../../../redux/types'
 import type { ViewableRobot } from '../../../redux/discovery/types'
 
-export type RobotItemProps = {|
-  ...ContextRouter,
-  robot: ViewableRobot,
-|}
+export interface RobotItemProps extends RouteComponentProps<{ name: string }> {
+  robot: ViewableRobot
+}
 
-export const RobotItem: React.AbstractComponent<
-  $Diff<RobotItemProps, ContextRouter>
-> = withRouter(RobotItemComponent)
+export const RobotItem = withRouter(RobotItemComponent)
 
-export function RobotItemComponent(props: RobotItemProps): React.Node {
+export function RobotItemComponent(props: RobotItemProps): JSX.Element {
   const { robot, match } = props
   const { name, displayName, status, local: isLocal } = robot
   const isUpgradable = useSelector((state: State) => {
@@ -38,7 +35,7 @@ export function RobotItemComponent(props: RobotItemProps): React.Node {
   )
   const dispatch = useDispatch<Dispatch>()
 
-  const handleToggleConnect = () => {
+  const handleToggleConnect = (): void => {
     if (!connectInProgress) {
       const action = isConnected
         ? RobotActions.disconnect()
diff --git a/app/src/pages/Robots/ConnectPanel/RobotLink.tsx b/app/src/pages/Robots/ConnectPanel/RobotLink.tsx
index b2b93338dc1..fb8c7c3775f 100644
--- a/app/src/pages/Robots/ConnectPanel/RobotLink.tsx
+++ b/app/src/pages/Robots/ConnectPanel/RobotLink.tsx
@@ -1,4 +1,3 @@
-// @flow
 // Robot and Instrument links specific to RobotListItem
 import * as React from 'react'
 import { NavLink } from 'react-router-dom'
@@ -7,16 +6,16 @@ import type { HoverTooltipHandlers } from '@opentrons/components'
 import cx from 'classnames'
 import styles from './styles.css'
 
-export type RobotLinkProps = {|
-  children: React.Node,
-  url: string,
-  className?: string,
-  activeClassName?: string,
-  hoverTooltipHandlers?: ?HoverTooltipHandlers,
-  disabled?: boolean,
-|}
+export interface RobotLinkProps {
+  children: React.ReactNode
+  url: string
+  className?: string
+  activeClassName?: string
+  hoverTooltipHandlers?: HoverTooltipHandlers | null
+  disabled?: boolean
+}
 
-export function RobotLink(props: RobotLinkProps): React.Node {
+export function RobotLink(props: RobotLinkProps): JSX.Element {
   const { url } = props
   const className = cx(styles.robot_link, props.className, {
     [styles.disabled]: props.disabled,
diff --git a/app/src/pages/Robots/ConnectPanel/RobotList.tsx b/app/src/pages/Robots/ConnectPanel/RobotList.tsx
index a3dd933ddd5..882e724da6d 100644
--- a/app/src/pages/Robots/ConnectPanel/RobotList.tsx
+++ b/app/src/pages/Robots/ConnectPanel/RobotList.tsx
@@ -1,12 +1,11 @@
-// @flow
 // list of robots
 import * as React from 'react'
 import styles from './styles.css'
 
-export type RobotListProps = {|
-  children: React.Node,
-|}
+export interface RobotListProps {
+  children: React.ReactNode
+}
 
-export function RobotList(props: RobotListProps): React.Node {
+export function RobotList(props: RobotListProps): JSX.Element {
   return <ol className={styles.robot_list}>{props.children}</ol>
 }
diff --git a/app/src/pages/Robots/ConnectPanel/RobotListItem.tsx b/app/src/pages/Robots/ConnectPanel/RobotListItem.tsx
index 466aec2be9f..3d2e99b5d2a 100644
--- a/app/src/pages/Robots/ConnectPanel/RobotListItem.tsx
+++ b/app/src/pages/Robots/ConnectPanel/RobotListItem.tsx
@@ -1,4 +1,3 @@
-// @flow
 // presentational component for an item in a RobotList
 import * as React from 'react'
 import { NotificationIcon, Icon, ToggleButton } from '@opentrons/components'
@@ -7,18 +6,18 @@ import { useTranslation } from 'react-i18next'
 import { RobotLink } from './RobotLink'
 import styles from './styles.css'
 
-export type RobotListItemProps = {|
-  name: string,
-  displayName: string,
-  isConnectable: boolean,
-  isUpgradable: boolean,
-  isSelected: boolean,
-  isLocal: boolean,
-  isConnected: boolean,
-  onToggleConnect: () => mixed,
-|}
+export interface RobotListItemProps {
+  name: string
+  displayName: string
+  isConnectable: boolean
+  isUpgradable: boolean
+  isSelected: boolean
+  isLocal: boolean
+  isConnected: boolean
+  onToggleConnect: () => unknown
+}
 
-export function RobotListItem(props: RobotListItemProps): React.Node {
+export function RobotListItem(props: RobotListItemProps): JSX.Element {
   const {
     name,
     displayName,
diff --git a/app/src/pages/Robots/ConnectPanel/ScanButton.tsx b/app/src/pages/Robots/ConnectPanel/ScanButton.tsx
index 1c24a2ba1ad..10906ea63a4 100644
--- a/app/src/pages/Robots/ConnectPanel/ScanButton.tsx
+++ b/app/src/pages/Robots/ConnectPanel/ScanButton.tsx
@@ -1,17 +1,16 @@
-// @flow
 import * as React from 'react'
 import { Icon, PrimaryButton } from '@opentrons/components'
 import { useTranslation } from 'react-i18next'
 
 import styles from './styles.css'
 
-export type ScanButtonProps = {|
-  isScanning: boolean,
-  onScanClick: () => mixed,
-  found: boolean,
-|}
+export interface ScanButtonProps {
+  isScanning: boolean
+  onScanClick: () => unknown
+  found: boolean
+}
 
-export function ScanButton(props: ScanButtonProps): React.Node {
+export function ScanButton(props: ScanButtonProps): JSX.Element {
   const { isScanning, onScanClick, found } = props
   const { t } = useTranslation()
 
diff --git a/app/src/pages/Robots/ConnectPanel/ScanStatus.tsx b/app/src/pages/Robots/ConnectPanel/ScanStatus.tsx
index b18e68a4762..a6a512c36c8 100644
--- a/app/src/pages/Robots/ConnectPanel/ScanStatus.tsx
+++ b/app/src/pages/Robots/ConnectPanel/ScanStatus.tsx
@@ -1,17 +1,16 @@
-// @flow
 import * as React from 'react'
 
 import { ScanButton } from './ScanButton'
 
 import styles from './styles.css'
 
-export type ScanStatusProps = {|
-  onScanClick: () => mixed,
-  isScanning: boolean,
-  found: boolean,
-|}
+export interface ScanStatusProps {
+  onScanClick: () => unknown
+  isScanning: boolean
+  found: boolean
+}
 
-export function ScanStatus(props: ScanStatusProps): React.Node {
+export function ScanStatus(props: ScanStatusProps): JSX.Element {
   const { found, isScanning } = props
 
   const notFoundMessage = !isScanning && !found && (
diff --git a/app/src/pages/Robots/ConnectPanel/UnreachableRobotItem.tsx b/app/src/pages/Robots/ConnectPanel/UnreachableRobotItem.tsx
index b399597c37f..0f33114af1e 100644
--- a/app/src/pages/Robots/ConnectPanel/UnreachableRobotItem.tsx
+++ b/app/src/pages/Robots/ConnectPanel/UnreachableRobotItem.tsx
@@ -1,4 +1,3 @@
-// @flow
 // list of robots
 import * as React from 'react'
 
@@ -8,7 +7,7 @@ import styles from './styles.css'
 
 import type { UnreachableRobot } from '../../../redux/discovery/types'
 
-export function UnreachableRobotItem(props: UnreachableRobot): React.Node {
+export function UnreachableRobotItem(props: UnreachableRobot): JSX.Element {
   const { displayName } = props
   return (
     <li className={styles.robot_group}>
diff --git a/app/src/pages/Robots/ConnectPanel/__tests__/RobotItem.test.tsx b/app/src/pages/Robots/ConnectPanel/__tests__/RobotItem.test.tsx
index 6d77d9e4d90..a5fca3cb44e 100644
--- a/app/src/pages/Robots/ConnectPanel/__tests__/RobotItem.test.tsx
+++ b/app/src/pages/Robots/ConnectPanel/__tests__/RobotItem.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { StaticRouter } from 'react-router-dom'
 import { Provider } from 'react-redux'
@@ -13,34 +12,37 @@ import * as Buildroot from '../../../../redux/buildroot'
 import { RobotItem } from '../RobotItem'
 import { RobotListItem } from '../RobotListItem'
 
-import type { State } from '../../../../redux/types'
-
 jest.mock('../../../../redux/buildroot/selectors')
 jest.mock('../../../../redux/robot/selectors')
 
-const getBuildrootUpdateAvailable: JestMockFn<
-  [State, any],
-  $Call<typeof Buildroot.getBuildrootUpdateAvailable, State, any>
-> = Buildroot.getBuildrootUpdateAvailable
+const getBuildrootUpdateAvailable = Buildroot.getBuildrootUpdateAvailable as jest.MockedFunction<
+  typeof Buildroot.getBuildrootUpdateAvailable
+>
 
-const getConnectRequest: JestMockFn<
-  [State],
-  $Call<typeof RobotSelectors.getConnectRequest, State>
-> = RobotSelectors.getConnectRequest
+const getConnectRequest = RobotSelectors.getConnectRequest as jest.MockedFunction<
+  typeof RobotSelectors.getConnectRequest
+>
 
 describe('ConnectPanel RobotItem', () => {
-  const store = {
+  const store: any = {
     subscribe: () => {},
     getState: () => ({ mockState: true }),
     dispatch: jest.fn(),
   }
 
-  const render = (robot = Fixtures.mockConnectableRobot, matchParams = {}) => {
+  const render = (
+    robot: any = Fixtures.mockConnectableRobot,
+    matchParams: any = {}
+  ): ReturnType<typeof mount> => {
     // TODO(mc, 2020-03-30): upgrade react-router to 5.1 for hooks
     // grab the wrapped component from react-router::withRouter
-    const Component = (RobotItem: any).WrappedComponent
+    const Component = (RobotItem as any).WrappedComponent
 
-    const Wrapper = ({ children }: {| children: React.Node |}) => (
+    const Wrapper = ({
+      children,
+    }: {
+      children: React.ReactNode
+    }): JSX.Element => (
       <Provider store={store}>
         <StaticRouter location="/" context={{}}>
           {children}
@@ -146,7 +148,7 @@ describe('ConnectPanel RobotItem', () => {
     const wrapper = render(robot)
     const item = wrapper.find(RobotListItem)
 
-    item.invoke('onToggleConnect')()
+    item.invoke('onToggleConnect')?.()
 
     expect(store.dispatch).toHaveBeenCalledWith(
       RobotActions.connect(robot.name)
@@ -158,7 +160,7 @@ describe('ConnectPanel RobotItem', () => {
     const wrapper = render(robot)
     const item = wrapper.find(RobotListItem)
 
-    item.invoke('onToggleConnect')()
+    item.invoke('onToggleConnect')?.()
 
     expect(store.dispatch).toHaveBeenCalledWith(RobotActions.disconnect())
   })
@@ -174,7 +176,7 @@ describe('ConnectPanel RobotItem', () => {
     const wrapper = render(robot)
     const item = wrapper.find(RobotListItem)
 
-    item.invoke('onToggleConnect')()
+    item.invoke('onToggleConnect')?.()
 
     expect(store.dispatch).not.toHaveBeenCalled()
   })
diff --git a/app/src/pages/Robots/ConnectPanel/__tests__/RobotListItem.test.tsx b/app/src/pages/Robots/ConnectPanel/__tests__/RobotListItem.test.tsx
index 1dd5a135b95..cb19c51b8df 100644
--- a/app/src/pages/Robots/ConnectPanel/__tests__/RobotListItem.test.tsx
+++ b/app/src/pages/Robots/ConnectPanel/__tests__/RobotListItem.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { shallow } from 'enzyme'
 
@@ -103,7 +102,7 @@ describe('ConnectPanel RobotListItem', () => {
     const wrapper = render({ isConnectable: true, isSelected: false })
     const toggle = wrapper.find(ToggleButton)
 
-    toggle.invoke('onClick')()
+    toggle.invoke('onClick')?.({} as React.MouseEvent)
     expect(handleToggleConnect).toHaveBeenCalled()
   })
 
diff --git a/app/src/pages/Robots/ConnectPanel/index.tsx b/app/src/pages/Robots/ConnectPanel/index.tsx
index 55c03bc356b..d1bd9382db6 100644
--- a/app/src/pages/Robots/ConnectPanel/index.tsx
+++ b/app/src/pages/Robots/ConnectPanel/index.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { connect } from 'react-redux'
 import orderBy from 'lodash/orderBy'
@@ -25,31 +24,21 @@ import type {
   UnreachableRobot,
 } from '../../../redux/discovery/types'
 
-type SP = {|
-  robots: Array<Robot>,
-  reachableRobots: Array<ReachableRobot>,
-  unreachableRobots: Array<UnreachableRobot>,
-  found: boolean,
-  isScanning: boolean,
-|}
-
-type DP = {| onScanClick: () => mixed |}
-
-type Props = {| ...SP, ...DP |}
-
-export const ConnectPanel: React.AbstractComponent<{||}> = connect<
-  Props,
-  {||},
-  SP,
-  DP,
-  State,
-  Dispatch
->(
-  mapStateToProps,
-  mapDispatchToProps
-)(ConnectPanelComponent)
+interface SP {
+  robots: Robot[]
+  reachableRobots: ReachableRobot[]
+  unreachableRobots: UnreachableRobot[]
+  found: boolean
+  isScanning: boolean
+}
+
+interface DP {
+  onScanClick: () => unknown
+}
+
+type Props = SP & DP
 
-function ConnectPanelComponent(props: Props) {
+function ConnectPanelComponent(props: Props): JSX.Element {
   const {
     robots,
     reachableRobots,
@@ -106,3 +95,17 @@ function mapDispatchToProps(dispatch: Dispatch): DP {
     onScanClick: () => dispatch(startDiscovery()),
   }
 }
+
+// slight code change here moving from the functional to object version of mapDispatchToProps satisfies the connect
+// functions types without having to import other types from react-redux. Mostly a convenience change as all new
+// connected components use the hooks api
+
+// const mapDispatchToProps: DP = {
+//   onScanClick: () => startDiscovery(),
+// }
+
+export const ConnectPanel = connect(
+  mapStateToProps,
+  // @ts-expect-error TODO: use commented code above
+  mapDispatchToProps
+)(ConnectPanelComponent)
diff --git a/app/src/pages/Robots/InstrumentSettings/AttachedPipettesCard.tsx b/app/src/pages/Robots/InstrumentSettings/AttachedPipettesCard.tsx
index 779432df3c6..abe950d3e24 100644
--- a/app/src/pages/Robots/InstrumentSettings/AttachedPipettesCard.tsx
+++ b/app/src/pages/Robots/InstrumentSettings/AttachedPipettesCard.tsx
@@ -1,4 +1,3 @@
-// @flow
 // attached pipettes container card
 import * as React from 'react'
 import { useSelector, useDispatch } from 'react-redux'
@@ -28,19 +27,19 @@ import {
 } from '../../../redux/calibration'
 import type { Mount } from '../../../redux/pipettes/types'
 
-type Props = {|
-  robotName: string,
-  makeChangeUrl: (mount: Mount) => string,
-  makeConfigureUrl: (mount: Mount) => string,
-  isChangingOrConfiguringPipette: boolean,
-|}
+interface Props {
+  robotName: string
+  makeChangeUrl: (mount: Mount) => string
+  makeConfigureUrl: (mount: Mount) => string
+  isChangingOrConfiguringPipette: boolean
+}
 
 // TODO(mc, 2019-12-09): i18n
 const PIPETTES = 'Pipettes'
 
 const FETCH_PIPETTES_INTERVAL_MS = 5000
 
-export function AttachedPipettesCard(props: Props): React.Node {
+export function AttachedPipettesCard(props: Props): JSX.Element {
   const {
     robotName,
     makeChangeUrl,
diff --git a/app/src/pages/Robots/InstrumentSettings/PipetteCalibrationInfo.tsx b/app/src/pages/Robots/InstrumentSettings/PipetteCalibrationInfo.tsx
index 512a2f33377..368fe0eacc0 100644
--- a/app/src/pages/Robots/InstrumentSettings/PipetteCalibrationInfo.tsx
+++ b/app/src/pages/Robots/InstrumentSettings/PipetteCalibrationInfo.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { useSelector } from 'react-redux'
 import {
@@ -75,15 +74,15 @@ type CalBlockModalState =
   | typeof CAL_BLOCK_MODAL_OPEN_WITH_REDO_TLC
   | typeof CAL_BLOCK_MODAL_OPEN_WITH_KEEP_TLC
 
-type Props = {|
-  robotName: string,
-  serialNumber: string | null,
-  mount: Mount,
-  disabledReason: string | null,
-  isChangingOrConfiguringPipette: boolean,
-|}
+interface Props {
+  robotName: string
+  serialNumber: string | null
+  mount: Mount
+  disabledReason: string | null
+  isChangingOrConfiguringPipette: boolean
+}
 
-export function PipetteCalibrationInfo(props: Props): React.Node {
+export function PipetteCalibrationInfo(props: Props): JSX.Element {
   const {
     robotName,
     serialNumber,
@@ -124,11 +123,11 @@ export function PipetteCalibrationInfo(props: Props): React.Node {
     setCalBlockModalState,
   ] = React.useState<CalBlockModalState>(CAL_BLOCK_MODAL_CLOSED)
 
-  type StartWizardOptions = {|
-    keepTipLength: boolean,
-    hasBlockModalResponse?: boolean | null,
-  |}
-  const startPipetteOffsetPossibleTLC = (options: StartWizardOptions) => {
+  interface StartWizardOptions {
+    keepTipLength: boolean
+    hasBlockModalResponse?: boolean | null
+  }
+  const startPipetteOffsetPossibleTLC = (options: StartWizardOptions): void => {
     const { keepTipLength, hasBlockModalResponse = null } = options
     if (hasBlockModalResponse === null && configHasCalibrationBlock === null) {
       setCalBlockModalState(
@@ -236,6 +235,7 @@ export function PipetteCalibrationInfo(props: Props): React.Node {
                 })
             : () => startPipetteOffsetPossibleTLC({ keepTipLength: true })
         }
+        // @ts-expect-error TODO: SecondaryBtn expects disabled to be explicit boolean type, cast here?
         disabled={disabledReason}
         width="15rem"
         paddingX={SPACING_2}
@@ -280,6 +280,7 @@ export function PipetteCalibrationInfo(props: Props): React.Node {
             onClick={() =>
               startPipetteOffsetPossibleTLC({ keepTipLength: false })
             }
+            // @ts-expect-error TODO: SecondaryBtn expects disabled to be explicit boolean type, cast here?
             disabled={disabledReason}
             width="15rem"
             paddingX={SPACING_2}
diff --git a/app/src/pages/Robots/InstrumentSettings/PipetteInfo.tsx b/app/src/pages/Robots/InstrumentSettings/PipetteInfo.tsx
index 6224d8ff0a2..66e35f73621 100644
--- a/app/src/pages/Robots/InstrumentSettings/PipetteInfo.tsx
+++ b/app/src/pages/Robots/InstrumentSettings/PipetteInfo.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { useSelector } from 'react-redux'
 import { Link } from 'react-router-dom'
@@ -34,14 +33,14 @@ import { PipetteCalibrationInfo } from './PipetteCalibrationInfo'
 import type { State } from '../../../redux/types'
 import type { Mount, AttachedPipette } from '../../../redux/pipettes/types'
 
-export type PipetteInfoProps = {|
-  robotName: string,
-  mount: Mount,
-  pipette: AttachedPipette | null,
-  changeUrl: string,
-  settingsUrl: string | null,
-  isChangingOrConfiguringPipette: boolean,
-|}
+export interface PipetteInfoProps {
+  robotName: string
+  mount: Mount
+  pipette: AttachedPipette | null
+  changeUrl: string
+  settingsUrl: string | null
+  isChangingOrConfiguringPipette: boolean
+}
 
 const MOUNT = 'mount'
 const SERIAL_NUMBER = 'Serial number'
@@ -49,7 +48,7 @@ const CHANGE = 'change'
 const ATTACH = 'attach'
 const NONE = 'none'
 
-export function PipetteInfo(props: PipetteInfoProps): React.Node {
+export function PipetteInfo(props: PipetteInfoProps): JSX.Element {
   const {
     robotName,
     mount,
@@ -116,6 +115,7 @@ export function PipetteInfo(props: PipetteInfoProps): React.Node {
           <PrimaryBtn
             {...(disabledReason ? changePipTargetProps : {})}
             as={disabledReason ? 'button' : Link}
+            // @ts-expect-error TODO: 'to' prop can only be passed if as={Link}
             to={changeUrl}
             disabled={disabledReason}
             title="changePipetteButton"
@@ -128,6 +128,7 @@ export function PipetteInfo(props: PipetteInfoProps): React.Node {
             <SecondaryBtn
               {...(disabledReason ? settingsTargetProps : {})}
               as={disabledReason ? 'button' : Link}
+              // @ts-expect-error TODO: 'to' prop can only be passed if as={Link}
               to={settingsUrl}
               disabled={disabledReason}
               title="pipetteSettingsButton"
diff --git a/app/src/pages/Robots/InstrumentSettings/__fixtures__/index.ts b/app/src/pages/Robots/InstrumentSettings/__fixtures__/index.ts
index 337c2e83923..1701e01bdeb 100644
--- a/app/src/pages/Robots/InstrumentSettings/__fixtures__/index.ts
+++ b/app/src/pages/Robots/InstrumentSettings/__fixtures__/index.ts
@@ -1,6 +1,6 @@
-// @flow
+import type { AttachedPipette } from '../../../../redux/pipettes/types'
 
-export const mockAttachedPipette = {
+export const mockAttachedPipette: AttachedPipette = {
   id: '1234_pip_id',
   name: 'Opentrons Test Pipette',
   model: 'opentrons_test_pipette',
diff --git a/app/src/pages/Robots/InstrumentSettings/__tests__/PipetteInfo.test.tsx b/app/src/pages/Robots/InstrumentSettings/__tests__/PipetteInfo.test.tsx
index 34aad03b359..ba31d39ab5a 100644
--- a/app/src/pages/Robots/InstrumentSettings/__tests__/PipetteInfo.test.tsx
+++ b/app/src/pages/Robots/InstrumentSettings/__tests__/PipetteInfo.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { mountWithStore } from '@opentrons/components/__utils__'
 
@@ -9,8 +8,6 @@ import {
 } from '../../../../redux/calibration'
 import { useCalibratePipetteOffset } from '../../../../organisms/CalibratePipetteOffset/useCalibratePipetteOffset'
 
-import type { State } from '../../../../redux/types'
-
 import { PipetteInfo } from '../PipetteInfo'
 import { mockAttachedPipette } from '../__fixtures__'
 import { mockConnectedRobot } from '../../../../redux/discovery/__fixtures__'
@@ -30,45 +27,34 @@ jest.mock('react-router-dom', () => ({ Link: () => <></> }))
 jest.mock('../../../../redux/discovery')
 jest.mock('../../../../redux/robot/selectors')
 
-const mockGetCustomLabwareDefinitions: JestMockFn<
-  [State],
-  $Call<typeof getCustomLabwareDefinitions, State>
-> = getCustomLabwareDefinitions
-
-const mockGetCalibrationForPipette: JestMockFn<
-  [State, string, string, string],
-  $Call<typeof getCalibrationForPipette, State, string, string, string>
-> = getCalibrationForPipette
-
-const mockGetTipLengthForPipetteAndTiprack: JestMockFn<
-  [State, string, string, string],
-  $Call<typeof getTipLengthForPipetteAndTiprack, State, string, string, string>
-> = getTipLengthForPipetteAndTiprack
-
-const mockUseCalibratePipetteOffset: JestMockFn<
-  [string, {}, null],
-  $Call<typeof useCalibratePipetteOffset, string, {}, null>
-> = useCalibratePipetteOffset
-
-const mockGetHasCalibrationBlock: JestMockFn<
-  [State],
-  $Call<typeof Config.getHasCalibrationBlock, State>
-> = Config.getHasCalibrationBlock
-
-const mockGetRobotByName: JestMockFn<
-  [State, string],
-  $Call<typeof getRobotByName, State, string>
-> = getRobotByName
-
-const mockGetIsRunning: JestMockFn<
-  [State],
-  $Call<typeof getIsRunning, State>
-> = getIsRunning
+const mockGetCustomLabwareDefinitions = getCustomLabwareDefinitions as jest.MockedFunction<
+  typeof getCustomLabwareDefinitions
+>
+const mockGetCalibrationForPipette = getCalibrationForPipette as jest.MockedFunction<
+  typeof getCalibrationForPipette
+>
+const mockGetTipLengthForPipetteAndTiprack = getTipLengthForPipetteAndTiprack as jest.MockedFunction<
+  typeof getTipLengthForPipetteAndTiprack
+>
+const mockUseCalibratePipetteOffset = useCalibratePipetteOffset as jest.MockedFunction<
+  typeof useCalibratePipetteOffset
+>
+const mockGetHasCalibrationBlock = Config.getHasCalibrationBlock as jest.MockedFunction<
+  typeof Config.getHasCalibrationBlock
+>
+const mockGetRobotByName = getRobotByName as jest.MockedFunction<
+  typeof getRobotByName
+>
+const mockGetIsRunning = getIsRunning as jest.MockedFunction<
+  typeof getIsRunning
+>
 
 describe('PipetteInfo', () => {
   const robotName = 'robot-name'
-  let render
-  let startWizard
+  let render: (
+    props?: Partial<React.ComponentProps<typeof PipetteInfo>>
+  ) => ReturnType<typeof mountWithStore>
+  let startWizard: any
 
   beforeEach(() => {
     startWizard = jest.fn()
@@ -80,7 +66,7 @@ describe('PipetteInfo', () => {
     mockGetIsRunning.mockReturnValue(false)
     mockGetRobotByName.mockReturnValue(mockConnectedRobot)
 
-    render = (props: $Shape<React.ElementProps<typeof PipetteInfo>> = {}) => {
+    render = (props = {}) => {
       const { pipette = mockAttachedPipette } = props
       return mountWithStore(
         <PipetteInfo
@@ -108,7 +94,9 @@ describe('PipetteInfo', () => {
   it('just launch POC w/o cal block modal if POC button clicked and data exists', () => {
     mockGetCalibrationForPipette.mockReturnValue(mockPipetteOffsetCalibration1)
     const { wrapper } = render()
-    wrapper.find('button[title="pipetteOffsetCalButton"]').invoke('onClick')()
+    wrapper.find('button[title="pipetteOffsetCalButton"]').invoke('onClick')?.(
+      {} as React.MouseEvent
+    )
     wrapper.update()
     expect(startWizard).toHaveBeenCalledWith({
       withIntent: 'recalibrate-pipette-offset',
@@ -118,12 +106,14 @@ describe('PipetteInfo', () => {
   it('launch POC w/ cal block modal denied if POC button clicked and no existing data and no cal block pref saved', () => {
     const { wrapper } = render()
     expect(wrapper.find('AskForCalibrationBlockModal').exists()).toBe(false)
-    wrapper.find('button[title="pipetteOffsetCalButton"]').invoke('onClick')()
+    wrapper.find('button[title="pipetteOffsetCalButton"]').invoke('onClick')?.(
+      {} as React.MouseEvent
+    )
     wrapper.update()
     expect(wrapper.find('AskForCalibrationBlockModal').exists()).toBe(true)
     wrapper
       .find('button[children="Continue with calibration block"]')
-      .invoke('onClick')()
+      .invoke('onClick')?.({} as React.MouseEvent)
     expect(startWizard).toHaveBeenCalledWith({
       overrideParams: {
         hasCalibrationBlock: true,
@@ -136,10 +126,14 @@ describe('PipetteInfo', () => {
   it('launch POC w/ cal block modal confirmed if POC button clicked and no existing data and no cal block pref saved', () => {
     const { wrapper } = render()
     expect(wrapper.find('AskForCalibrationBlockModal').exists()).toBe(false)
-    wrapper.find('button[title="pipetteOffsetCalButton"]').invoke('onClick')()
+    wrapper.find('button[title="pipetteOffsetCalButton"]').invoke('onClick')?.(
+      {} as React.MouseEvent
+    )
     wrapper.update()
     expect(wrapper.find('AskForCalibrationBlockModal').exists()).toBe(true)
-    wrapper.find('button[children="Use trash bin"]').invoke('onClick')()
+    wrapper.find('button[children="Use trash bin"]').invoke('onClick')?.(
+      {} as React.MouseEvent
+    )
     expect(startWizard).toHaveBeenCalledWith({
       overrideParams: {
         hasCalibrationBlock: false,
@@ -156,12 +150,14 @@ describe('PipetteInfo', () => {
     )
     const { wrapper } = render()
     expect(wrapper.find('AskForCalibrationBlockModal').exists()).toBe(false)
-    wrapper.find('button[title="recalibrateTipButton"]').invoke('onClick')()
+    wrapper.find('button[title="recalibrateTipButton"]').invoke('onClick')?.(
+      {} as React.MouseEvent
+    )
     wrapper.update()
     expect(wrapper.find('AskForCalibrationBlockModal').exists()).toBe(true)
     wrapper
       .find('button[children="Continue with calibration block"]')
-      .invoke('onClick')()
+      .invoke('onClick')?.({} as React.MouseEvent)
     expect(startWizard).toHaveBeenCalledWith({
       overrideParams: {
         hasCalibrationBlock: true,
@@ -178,10 +174,14 @@ describe('PipetteInfo', () => {
     )
     const { wrapper } = render()
     expect(wrapper.find('AskForCalibrationBlockModal').exists()).toBe(false)
-    wrapper.find('button[title="recalibrateTipButton"]').invoke('onClick')()
+    wrapper.find('button[title="recalibrateTipButton"]').invoke('onClick')?.(
+      {} as React.MouseEvent
+    )
     wrapper.update()
     expect(wrapper.find('AskForCalibrationBlockModal').exists()).toBe(true)
-    wrapper.find('button[children="Use trash bin"]').invoke('onClick')()
+    wrapper.find('button[children="Use trash bin"]').invoke('onClick')?.(
+      {} as React.MouseEvent
+    )
     expect(startWizard).toHaveBeenCalledWith({
       overrideParams: {
         hasCalibrationBlock: false,
@@ -200,7 +200,9 @@ describe('PipetteInfo', () => {
     )
     const { wrapper } = render()
     expect(wrapper.find('AskForCalibrationBlockModal').exists()).toBe(false)
-    wrapper.find('button[title="recalibrateTipButton"]').invoke('onClick')()
+    wrapper.find('button[title="recalibrateTipButton"]').invoke('onClick')?.(
+      {} as React.MouseEvent
+    )
     wrapper.update()
     expect(wrapper.find('AskForCalibrationBlockModal').exists()).toBe(false)
     expect(startWizard).toHaveBeenCalledWith({
@@ -221,7 +223,9 @@ describe('PipetteInfo', () => {
     )
     const { wrapper } = render()
     expect(wrapper.find('AskForCalibrationBlockModal').exists()).toBe(false)
-    wrapper.find('button[title="recalibrateTipButton"]').invoke('onClick')()
+    wrapper.find('button[title="recalibrateTipButton"]').invoke('onClick')?.(
+      {} as React.MouseEvent
+    )
     wrapper.update()
     expect(wrapper.find('AskForCalibrationBlockModal').exists()).toBe(false)
     expect(startWizard).toHaveBeenCalledWith({
diff --git a/app/src/pages/Robots/InstrumentSettings/index.tsx b/app/src/pages/Robots/InstrumentSettings/index.tsx
index 4ea474ca1c1..30653e8ab3c 100644
--- a/app/src/pages/Robots/InstrumentSettings/index.tsx
+++ b/app/src/pages/Robots/InstrumentSettings/index.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { Switch, Route } from 'react-router-dom'
 
@@ -9,18 +8,20 @@ import { ChangePipette } from '../../../organisms/ChangePipette'
 import { ConfigurePipette } from '../../../organisms/ConfigurePipette'
 import { Page } from '../../../atoms/Page'
 
-export type InstrumentSettingsProps = {|
-  robotName: string,
-  robotDisplayName: string,
-  url: string,
-  path: string,
-  pathname: string,
-|}
+export interface InstrumentSettingsProps {
+  robotName: string
+  robotDisplayName: string
+  url: string
+  path: string
+  pathname: string
+}
 
 // used to guarantee mount param in route is left or right
 const RE_MOUNT = `(${LEFT}|${RIGHT})`
 
-export function InstrumentSettings(props: InstrumentSettingsProps): React.Node {
+export function InstrumentSettings(
+  props: InstrumentSettingsProps
+): JSX.Element {
   const { robotName, robotDisplayName, url, path, pathname } = props
   const titleBarProps = { title: robotDisplayName }
 
@@ -44,7 +45,7 @@ export function InstrumentSettings(props: InstrumentSettingsProps): React.Node {
           render={routeProps => (
             <ChangePipette
               robotName={robotName}
-              mount={(routeProps.match.params.mount: any)}
+              mount={routeProps.match.params.mount}
               closeModal={routeProps.history.goBack}
             />
           )}
@@ -54,7 +55,7 @@ export function InstrumentSettings(props: InstrumentSettingsProps): React.Node {
           render={routeProps => (
             <ConfigurePipette
               robotName={robotName}
-              mount={(routeProps.match.params.mount: any)}
+              mount={routeProps.match.params.mount}
               closeModal={routeProps.history.goBack}
             />
           )}
diff --git a/app/src/pages/Robots/InstrumentSettings/utils.ts b/app/src/pages/Robots/InstrumentSettings/utils.ts
index e62565d536e..ed28b182f01 100644
--- a/app/src/pages/Robots/InstrumentSettings/utils.ts
+++ b/app/src/pages/Robots/InstrumentSettings/utils.ts
@@ -1,4 +1,3 @@
-// @flow
 import { getLabwareDisplayName } from '@opentrons/shared-data'
 import { findLabwareDefWithCustom } from '../../../assets/labware/findLabware'
 
@@ -8,7 +7,7 @@ const UNKNOWN_CUSTOM_LABWARE = 'unknown custom tiprack'
 
 export function getDisplayNameForTipRack(
   tiprackUri: string,
-  customLabware: Array<LabwareDefinition2>
+  customLabware: LabwareDefinition2[]
 ): string {
   const [namespace, loadName] = tiprackUri ? tiprackUri.split('/') : ['', '']
   const definition = findLabwareDefWithCustom(
diff --git a/app/src/pages/Robots/ModuleSettings/AttachedModulesCard.tsx b/app/src/pages/Robots/ModuleSettings/AttachedModulesCard.tsx
index 582991d0556..5045db32121 100644
--- a/app/src/pages/Robots/ModuleSettings/AttachedModulesCard.tsx
+++ b/app/src/pages/Robots/ModuleSettings/AttachedModulesCard.tsx
@@ -1,4 +1,3 @@
-// @flow
 // attached modules container card
 import * as React from 'react'
 import { useDispatch, useSelector } from 'react-redux'
@@ -29,14 +28,14 @@ import { UsbHubItem } from './UsbHubItem'
 const TITLE = 'Connected Modules'
 const POLL_MODULE_INTERVAL_MS = 5000
 
-type ModulesListByPort = {|
-  [port: string]: Array<AttachedModule>,
-|}
+interface ModulesListByPort {
+  [port: string]: AttachedModule[]
+}
 
-const moduleListWithUSBInfo: (
-  ModulesListByPort,
-  string | null
-) => Array<React.Node> = (modulesByPort, controlDisabledReason) => {
+const moduleListWithUSBInfo = (
+  modulesByPort: ModulesListByPort,
+  controlDisabledReason: string | null
+): JSX.Element[] => {
   return Object.keys(modulesByPort).map(port =>
     modulesByPort[port].length > 1 ? (
       <UsbHubItem
@@ -55,10 +54,10 @@ const moduleListWithUSBInfo: (
   )
 }
 
-const legacyModuleList: (
-  Array<AttachedModule>,
-  string | null
-) => Array<React.Node> = (modules, controlDisabledReason) => {
+const legacyModuleList = (
+  modules: AttachedModule[],
+  controlDisabledReason: string | null
+): JSX.Element[] => {
   return modules.map(mod => (
     <ModuleItem
       key={mod.serial}
@@ -68,9 +67,11 @@ const legacyModuleList: (
   ))
 }
 
-type Props = {| robotName: string |}
+interface Props {
+  robotName: string
+}
 
-export function AttachedModulesCard(props: Props): React.Node {
+export function AttachedModulesCard(props: Props): JSX.Element {
   const { robotName } = props
   const dispatch = useDispatch<Dispatch>()
   const connectedRobotName = useSelector(getConnectedRobotName)
@@ -80,14 +81,17 @@ export function AttachedModulesCard(props: Props): React.Node {
   const controlDisabledReason = useSelector((state: State) =>
     getModuleControlsDisabled(state, robotName)
   )
-  const modulesByPort = modules.reduce((portMap, module) => {
-    const port = module.usbPort.hub || module.usbPort.port
-    if (port !== null) {
-      const portContents = portMap[port] ?? []
-      portMap[port] = [...portContents, module]
-    }
-    return portMap
-  }, {})
+  const modulesByPort = modules.reduce<{ [port: number]: AttachedModule[] }>(
+    (portMap, module) => {
+      const port = module.usbPort.hub || module.usbPort.port
+      if (port !== null) {
+        const portContents = portMap[port] ?? []
+        portMap[port] = [...portContents, module]
+      }
+      return portMap
+    },
+    {}
+  )
 
   const modulesList = isEmpty(modulesByPort)
     ? legacyModuleList(modules, controlDisabledReason)
diff --git a/app/src/pages/Robots/ModuleSettings/ModuleItem/ModuleImage.tsx b/app/src/pages/Robots/ModuleSettings/ModuleItem/ModuleImage.tsx
index f25a7488ba2..1bb58f08cca 100644
--- a/app/src/pages/Robots/ModuleSettings/ModuleItem/ModuleImage.tsx
+++ b/app/src/pages/Robots/ModuleSettings/ModuleItem/ModuleImage.tsx
@@ -1,15 +1,14 @@
-// @flow
 import * as React from 'react'
 import { css } from 'styled-components'
 
 import { Flex, ALIGN_CENTER, SIZE_4 } from '@opentrons/components'
 import type { ModuleModel } from '@opentrons/shared-data'
 
-type Props = {|
-  model: ModuleModel,
-|}
+interface Props {
+  model: ModuleModel
+}
 
-export function ModuleImage(props: Props): React.Node {
+export function ModuleImage(props: Props): JSX.Element {
   const imgSrc = getModuleImg(props.model)
 
   return (
@@ -25,11 +24,11 @@ export function ModuleImage(props: Props): React.Node {
   )
 }
 
-function getModuleImg(model: ModuleModel) {
+function getModuleImg(model: ModuleModel): string {
   return MODULE_IMGS[model]
 }
 
-const MODULE_IMGS: { [ModuleModel]: mixed } = {
+const MODULE_IMGS: { [m in ModuleModel]: string } = {
   temperatureModuleV1: require('../../../../assets/images/modules/temperatureModuleV1@3x.png'),
   temperatureModuleV2: require('../../../../assets/images/modules/temperatureModuleV2@3x.png'),
   magneticModuleV1: require('../../../../assets/images/modules/magneticModuleV1@3x.png'),
diff --git a/app/src/pages/Robots/ModuleSettings/ModuleItem/ModuleInfo.tsx b/app/src/pages/Robots/ModuleSettings/ModuleItem/ModuleInfo.tsx
index f17647730d7..6c6ab8a7832 100644
--- a/app/src/pages/Robots/ModuleSettings/ModuleItem/ModuleInfo.tsx
+++ b/app/src/pages/Robots/ModuleSettings/ModuleItem/ModuleInfo.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 
 import {
@@ -13,11 +12,11 @@ import {
 } from '@opentrons/components'
 import type { AttachedModule } from '../../../../redux/modules/types'
 
-type Props = {|
-  module: AttachedModule,
-|}
+interface Props {
+  module: AttachedModule
+}
 
-export function ModuleInfo(props: Props): React.Node {
+export function ModuleInfo(props: Props): JSX.Element {
   const { serial, fwVersion } = props.module
 
   return (
diff --git a/app/src/pages/Robots/ModuleSettings/ModuleItem/ModuleUpdate.tsx b/app/src/pages/Robots/ModuleSettings/ModuleItem/ModuleUpdate.tsx
index a2a06b7bc79..318ee180991 100644
--- a/app/src/pages/Robots/ModuleSettings/ModuleItem/ModuleUpdate.tsx
+++ b/app/src/pages/Robots/ModuleSettings/ModuleItem/ModuleUpdate.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import last from 'lodash/last'
 import { useSelector, useDispatch } from 'react-redux'
@@ -23,7 +22,6 @@ import {
   dismissRequest,
 } from '../../../../redux/robot-api'
 import { updateModule } from '../../../../redux/modules'
-import type { UpdateModuleAction } from '../../../../redux/modules/types'
 import type { State, Dispatch } from '../../../../redux/types'
 import type { RequestState } from '../../../../redux/robot-api/types'
 
@@ -37,29 +35,28 @@ const FAILED_UPDATE_HEADER = 'Failed to update Module Firmware'
 const FAILED_UPDATE_BODY =
   'An error occurred while attempting to update your robot.'
 
-type Props = {|
-  hasAvailableUpdate: boolean,
-  controlDisabledReason: string | null,
-  moduleId: string,
-|}
+interface Props {
+  hasAvailableUpdate: boolean
+  controlDisabledReason: string | null
+  moduleId: string
+}
 
-export function ModuleUpdate(props: Props): React.Node {
+export function ModuleUpdate(props: Props): JSX.Element {
   const { hasAvailableUpdate, moduleId, controlDisabledReason } = props
   const dispatch = useDispatch<Dispatch>()
   const robotName = useSelector(getConnectedRobotName)
-  const [
-    dispatchApiRequest,
-    requestIds,
-  ] = useDispatchApiRequest<UpdateModuleAction>()
+  const [dispatchApiRequest, requestIds] = useDispatchApiRequest()
 
   const canControl = controlDisabledReason === null
-  const handleClick = () => {
+  const handleClick = (): void => {
     canControl &&
       robotName &&
       dispatchApiRequest(updateModule(robotName, moduleId))
   }
   const latestRequestId = last(requestIds)
   const latestRequest = useSelector<State, RequestState | null>(state =>
+    // @ts-expect-error TODO: should be `latestRequestId ? getRequestById(state, latestRequestId) : null` to be
+    // extra cautious that we don't pass a non-existent latestRequestId to anything that is expecting a real id.
     getRequestById(state, latestRequestId)
   )
   const isPending = latestRequest?.status === PENDING
@@ -73,8 +70,12 @@ export function ModuleUpdate(props: Props): React.Node {
   }
   const [targetProps, tooltipProps] = useHoverTooltip()
 
-  const handleCloseErrorModal = () => {
+  const handleCloseErrorModal = (): void => {
+    // @ts-expect-error TODO: use code below
     dispatch(dismissRequest(latestRequestId))
+    // if (latestRequestId != null) {
+    //   dispatch(dismissRequest(latestRequestId))
+    // }
   }
   return (
     <Flex justifyContent={JUSTIFY_FLEX_END} display={DISPLAY_INLINE_BLOCK}>
@@ -96,6 +97,12 @@ export function ModuleUpdate(props: Props): React.Node {
           >
             <p>{FAILED_UPDATE_BODY}</p>
             <p>{getErrorResponseMessage(latestRequest.error)}</p>
+            {/* TODO: use the following instead: */}
+            {/* <p>
+              {latestRequest.error != null
+                ? getErrorResponseMessage(latestRequest.error)
+                : null}
+            </p> */}
           </AlertModal>
         </Portal>
       )}
diff --git a/app/src/pages/Robots/ModuleSettings/ModuleItem/NoModulesMessage.tsx b/app/src/pages/Robots/ModuleSettings/ModuleItem/NoModulesMessage.tsx
index 100554ce13c..9a71641aecb 100644
--- a/app/src/pages/Robots/ModuleSettings/ModuleItem/NoModulesMessage.tsx
+++ b/app/src/pages/Robots/ModuleSettings/ModuleItem/NoModulesMessage.tsx
@@ -1,9 +1,8 @@
-// @flow
 import * as React from 'react'
 import { CardContentFull } from '../../../../atoms/layout'
 import styles from './styles.css'
 
-export function NoModulesMessage(): React.Node {
+export function NoModulesMessage(): JSX.Element {
   return (
     <CardContentFull>
       <p className={styles.modules_description}>No modules detected.</p>
diff --git a/app/src/pages/Robots/ModuleSettings/ModuleItem/__tests__/ModuleUpdate.test.tsx b/app/src/pages/Robots/ModuleSettings/ModuleItem/__tests__/ModuleUpdate.test.tsx
index a5a2ae82389..0fac595f621 100644
--- a/app/src/pages/Robots/ModuleSettings/ModuleItem/__tests__/ModuleUpdate.test.tsx
+++ b/app/src/pages/Robots/ModuleSettings/ModuleItem/__tests__/ModuleUpdate.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { Provider } from 'react-redux'
 import { mount } from 'enzyme'
@@ -10,7 +9,7 @@ import { ModuleUpdate } from '../ModuleUpdate'
 const mockStore = configureMockStore([])
 
 describe('ModuleUpdate', () => {
-  let store
+  let store: ReturnType<typeof mockStore>
 
   beforeEach(() => {
     store = mockStore({
diff --git a/app/src/pages/Robots/ModuleSettings/ModuleItem/index.tsx b/app/src/pages/Robots/ModuleSettings/ModuleItem/index.tsx
index 80b70ec86af..9c94fbf6281 100644
--- a/app/src/pages/Robots/ModuleSettings/ModuleItem/index.tsx
+++ b/app/src/pages/Robots/ModuleSettings/ModuleItem/index.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 
 import {
@@ -20,14 +19,14 @@ import { ModuleControls } from '../../../../molecules/ModuleControls'
 import type { AttachedModule } from '../../../../redux/modules/types'
 import { getModuleDisplayName } from '@opentrons/shared-data'
 
-type Props = {|
-  module: AttachedModule,
-  controlDisabledReason: string | null,
-  usbPort?: ?string,
-  hubPort?: ?string,
-|}
+interface Props {
+  module: AttachedModule
+  controlDisabledReason: string | null
+  usbPort?: string | null
+  hubPort?: string | null
+}
 
-export function ModuleItem(props: Props): React.Node {
+export function ModuleItem(props: Props): JSX.Element {
   const { module, controlDisabledReason, usbPort, hubPort } = props
 
   return (
diff --git a/app/src/pages/Robots/ModuleSettings/UsbHubItem.tsx b/app/src/pages/Robots/ModuleSettings/UsbHubItem.tsx
index b13c9bfd8ac..4581eeb7424 100644
--- a/app/src/pages/Robots/ModuleSettings/UsbHubItem.tsx
+++ b/app/src/pages/Robots/ModuleSettings/UsbHubItem.tsx
@@ -1,4 +1,3 @@
-// @flow
 import {
   Box,
   Flex,
@@ -17,13 +16,13 @@ import type { AttachedModule } from '../../../redux/modules/types'
 
 const MULTIPLE_MODULES = 'Multiple modules connected'
 
-type Props = {|
-  hub: string,
-  modules: Array<AttachedModule>,
-  controlDisabledReason: string | null,
-|}
+interface Props {
+  hub: string
+  modules: AttachedModule[]
+  controlDisabledReason: string | null
+}
 
-export function UsbHubItem(props: Props): React.Node {
+export function UsbHubItem(props: Props): JSX.Element {
   const { hub, modules, controlDisabledReason } = props
 
   return (
diff --git a/app/src/pages/Robots/ModuleSettings/index.tsx b/app/src/pages/Robots/ModuleSettings/index.tsx
index 9e7b7d383f5..70f61878bf9 100644
--- a/app/src/pages/Robots/ModuleSettings/index.tsx
+++ b/app/src/pages/Robots/ModuleSettings/index.tsx
@@ -1,16 +1,15 @@
-// @flow
 import * as React from 'react'
 
 import { Page } from '../../../atoms/Page'
 import { CardContainer, CardRow } from '../../../atoms/layout'
 import { AttachedModulesCard } from './AttachedModulesCard'
 
-export type ModuleSettingsProps = {|
-  robotName: string,
-  robotDisplayName: string,
-|}
+export interface ModuleSettingsProps {
+  robotName: string
+  robotDisplayName: string
+}
 
-export function ModuleSettings(props: ModuleSettingsProps): React.Node {
+export function ModuleSettings(props: ModuleSettingsProps): JSX.Element {
   const { robotName, robotDisplayName } = props
   const titleBarProps = { title: robotDisplayName }
 
diff --git a/app/src/pages/Robots/RobotSettings/AdvancedSettingsCard.tsx b/app/src/pages/Robots/RobotSettings/AdvancedSettingsCard.tsx
index 0bbe0d8d105..dddb93e24e0 100644
--- a/app/src/pages/Robots/RobotSettings/AdvancedSettingsCard.tsx
+++ b/app/src/pages/Robots/RobotSettings/AdvancedSettingsCard.tsx
@@ -1,4 +1,3 @@
-// @flow
 // app info card with version and updated
 import * as React from 'react'
 import { useTranslation } from 'react-i18next'
@@ -37,15 +36,15 @@ import type { State, Dispatch } from '../../../redux/types'
 import type { ViewableRobot } from '../../../redux/discovery/types'
 import type { RobotSettings } from '../../../redux/robot-settings/types'
 
-export type AdvancedSettingsCardProps = {|
-  robot: ViewableRobot,
-  resetUrl: string,
-|}
+export interface AdvancedSettingsCardProps {
+  robot: ViewableRobot
+  resetUrl: string
+}
 
 const ROBOT_LOGS_OPTOUT_ID = 'disableLogAggregation'
 export function AdvancedSettingsCard(
   props: AdvancedSettingsCardProps
-): React.Node {
+): JSX.Element {
   const { robot, resetUrl } = props
   const { name, ip, health, status } = robot
   const { t } = useTranslation('robot_advanced_settings')
@@ -60,7 +59,7 @@ export function AdvancedSettingsCard(
   const showLogOptoutModal = settings.some(
     s => s.id === ROBOT_LOGS_OPTOUT_ID && s.value === null
   )
-  const setLogOptout = (value: boolean) =>
+  const setLogOptout = (value: boolean): unknown =>
     dispatch(updateSetting(name, ROBOT_LOGS_OPTOUT_ID, value))
 
   React.useEffect(() => {
@@ -90,6 +89,7 @@ export function AdvancedSettingsCard(
       <Divider />
       <Flex justifyContent={JUSTIFY_SPACE_BETWEEN} padding={SPACING_3}>
         <LabeledValue label={t('reset_label')} value={t('reset_description')} />
+        {/* @ts-expect-error TODO: Link does not have a disable prop, is this prop achieving anything useful */}
         <SecondaryBtn
           disabled={controlsDisabled}
           as={Link}
diff --git a/app/src/pages/Robots/RobotSettings/CalibrationCard.tsx b/app/src/pages/Robots/RobotSettings/CalibrationCard.tsx
index 25d296eb408..e6b288d92c5 100644
--- a/app/src/pages/Robots/RobotSettings/CalibrationCard.tsx
+++ b/app/src/pages/Robots/RobotSettings/CalibrationCard.tsx
@@ -1,4 +1,3 @@
-// @flow
 // calibration panel with various calibration-related controls and info
 
 import * as React from 'react'
@@ -43,10 +42,10 @@ import { DeckCalibrationControl } from './DeckCalibrationControl'
 import { CheckCalibrationControl } from './CheckCalibrationControl'
 import { PipetteOffsets } from './PipetteOffsets'
 
-type Props = {|
-  robot: ViewableRobot,
-  pipettesPageUrl: string,
-|}
+interface Props {
+  robot: ViewableRobot
+  pipettesPageUrl: string
+}
 
 const DECK_CAL_STATUS_POLL_INTERVAL = 10000
 const CAL_ARTICLE_URL =
@@ -66,7 +65,7 @@ const attachedPipetteCalPresent: (
   return true
 }
 
-export function CalibrationCard(props: Props): React.Node {
+export function CalibrationCard(props: Props): JSX.Element {
   const { robot, pipettesPageUrl } = props
   const { name: robotName, status } = robot
   const notConnectable = status !== CONNECTABLE
@@ -132,7 +131,7 @@ export function CalibrationCard(props: Props): React.Node {
     buttonDisabledReason = t('shared:disabled_no_pipette_attached')
   }
 
-  const onClickSaveAs = e => {
+  const onClickSaveAs: React.MouseEventHandler = e => {
     e.preventDefault()
     doTrackEvent({
       name: Calibration.EVENT_CALIBRATION_DOWNLOADED,
@@ -151,11 +150,11 @@ export function CalibrationCard(props: Props): React.Node {
   }
 
   const displayCalCheck =
-    ![
+    !([
       Calibration.DECK_CAL_STATUS_SINGULARITY,
       Calibration.DECK_CAL_STATUS_BAD_CALIBRATION,
       Calibration.DECK_CAL_STATUS_IDENTITY,
-    ].includes(deckCalStatus) &&
+    ] as Array<typeof deckCalStatus>).includes(deckCalStatus) &&
     pipetteCalPresent &&
     pipettePresent
 
diff --git a/app/src/pages/Robots/RobotSettings/CheckCalibrationControl.tsx b/app/src/pages/Robots/RobotSettings/CheckCalibrationControl.tsx
index e278050e339..70b267e83ae 100644
--- a/app/src/pages/Robots/RobotSettings/CheckCalibrationControl.tsx
+++ b/app/src/pages/Robots/RobotSettings/CheckCalibrationControl.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { useSelector } from 'react-redux'
 import { useTranslation } from 'react-i18next'
@@ -25,20 +24,20 @@ import type { RequestState } from '../../../redux/robot-api/types'
 
 import type { State } from '../../../redux/types'
 
-export type CheckCalibrationControlProps = {|
-  robotName: string,
-  disabledReason: string | null,
-|}
+export interface CheckCalibrationControlProps {
+  robotName: string
+  disabledReason: string | null
+}
 
 // pipette calibration commands for which the full page spinner should not appear
-const spinnerCommandBlockList: Array<SessionCommandString> = [
+const spinnerCommandBlockList: SessionCommandString[] = [
   Sessions.sharedCalCommands.JOG,
 ]
 
 export function CheckCalibrationControl({
   robotName,
   disabledReason,
-}: CheckCalibrationControlProps): React.Node {
+}: CheckCalibrationControlProps): JSX.Element {
   const { t } = useTranslation(['robot_calibration', 'shared'])
   const [targetProps, tooltipProps] = useHoverTooltip()
 
@@ -49,20 +48,31 @@ export function CheckCalibrationControl({
   const [dispatchRequests] = RobotApi.useDispatchApiRequests(
     dispatchedAction => {
       if (dispatchedAction.type === Sessions.ENSURE_SESSION) {
+        // @ts-expect-error TODO: should be the code in comment below
         createRequestId.current = dispatchedAction.meta.requestId
+        // createRequestId.current =
+        //   'requestId' in dispatchedAction.meta
+        //     ? dispatchedAction.meta.requestId ?? null
+        //     : null
       } else if (
         dispatchedAction.type === Sessions.CREATE_SESSION_COMMAND &&
         dispatchedAction.payload.command.command ===
           Sessions.sharedCalCommands.JOG
       ) {
-        jogRequestId.current = dispatchedAction.meta.requestId
+        jogRequestId.current =
+          'requestId' in dispatchedAction.meta
+            ? dispatchedAction.meta.requestId ?? null
+            : null
       } else if (
         dispatchedAction.type !== Sessions.CREATE_SESSION_COMMAND ||
         !spinnerCommandBlockList.includes(
           dispatchedAction.payload.command.command
         )
       ) {
-        trackedRequestId.current = dispatchedAction.meta.requestId
+        trackedRequestId.current =
+          'meta' in dispatchedAction && 'requestId' in dispatchedAction.meta
+            ? dispatchedAction.meta.requestId ?? null
+            : null
       }
     }
   )
@@ -96,7 +106,7 @@ export function CheckCalibrationControl({
   const configHasCalibrationBlock = useSelector(Config.getHasCalibrationBlock)
   const [showCalBlockModal, setShowCalBlockModal] = React.useState(false)
 
-  const handleStart = (hasBlockModalResponse: boolean | null = null) => {
+  const handleStart = (hasBlockModalResponse: boolean | null = null): void => {
     if (hasBlockModalResponse === null && configHasCalibrationBlock === null) {
       setShowCalBlockModal(true)
     } else {
diff --git a/app/src/pages/Robots/RobotSettings/ConfirmStartDeckCalModal.tsx b/app/src/pages/Robots/RobotSettings/ConfirmStartDeckCalModal.tsx
index bda12c8a0ab..cb3b8cc0348 100644
--- a/app/src/pages/Robots/RobotSettings/ConfirmStartDeckCalModal.tsx
+++ b/app/src/pages/Robots/RobotSettings/ConfirmStartDeckCalModal.tsx
@@ -1,18 +1,17 @@
-// @flow
 import * as React from 'react'
 
 import { useTranslation } from 'react-i18next'
 import { AlertModal } from '@opentrons/components'
 import styles from './styles.css'
 
-export type ConfirmStartDeckCalModalProps = {|
-  cancel: () => mixed,
-  confirm: () => mixed,
-|}
+export interface ConfirmStartDeckCalModalProps {
+  cancel: () => unknown
+  confirm: () => unknown
+}
 
 export function ConfirmStartDeckCalModal(
   props: ConfirmStartDeckCalModalProps
-): React.Node {
+): JSX.Element {
   const { cancel, confirm } = props
   const { t } = useTranslation(['robot_calibration', 'shared'])
 
diff --git a/app/src/pages/Robots/RobotSettings/ConnectAlertModal.tsx b/app/src/pages/Robots/RobotSettings/ConnectAlertModal.tsx
index d0c63b02577..284e4d07445 100644
--- a/app/src/pages/Robots/RobotSettings/ConnectAlertModal.tsx
+++ b/app/src/pages/Robots/RobotSettings/ConnectAlertModal.tsx
@@ -1,15 +1,14 @@
-// @flow
 // AlertModal for failed connection to robot
 import * as React from 'react'
 import { useTranslation } from 'react-i18next'
 
 import { AlertModal, Text } from '@opentrons/components'
 import { Portal } from '../../../App/portal'
-export type ConnectAlertModalProps = {|
-  onCloseClick: () => mixed,
-|}
+export interface ConnectAlertModalProps {
+  onCloseClick: () => unknown
+}
 
-export function ConnectAlertModal(props: ConnectAlertModalProps): React.Node {
+export function ConnectAlertModal(props: ConnectAlertModalProps): JSX.Element {
   const { onCloseClick } = props
   const { t } = useTranslation('robot_connection')
 
diff --git a/app/src/pages/Robots/RobotSettings/ConnectBanner.tsx b/app/src/pages/Robots/RobotSettings/ConnectBanner.tsx
index 98de002b639..4b273964621 100644
--- a/app/src/pages/Robots/RobotSettings/ConnectBanner.tsx
+++ b/app/src/pages/Robots/RobotSettings/ConnectBanner.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { useTranslation } from 'react-i18next'
 import { AlertItem } from '@opentrons/components'
@@ -7,7 +6,7 @@ import type { Robot } from '../../../redux/discovery/types'
 
 type Props = Robot
 
-export function ConnectBanner(props: Props): React.Node {
+export function ConnectBanner(props: Props): JSX.Element | null {
   const { displayName, connected } = props
 
   const { t } = useTranslation('robot_connection')
diff --git a/app/src/pages/Robots/RobotSettings/ConnectionCard.tsx b/app/src/pages/Robots/RobotSettings/ConnectionCard.tsx
index 4f664ffca47..0fc2735322d 100644
--- a/app/src/pages/Robots/RobotSettings/ConnectionCard.tsx
+++ b/app/src/pages/Robots/RobotSettings/ConnectionCard.tsx
@@ -1,4 +1,3 @@
-// @flow
 // RobotSettings card for wifi status
 import * as React from 'react'
 import { useSelector, useDispatch } from 'react-redux'
@@ -17,13 +16,13 @@ import { ConnectionStatusMessage, ConnectionInfo } from './connection'
 import type { State, Dispatch } from '../../../redux/types'
 import type { ViewableRobot } from '../../../redux/discovery/types'
 
-type Props = {|
-  robot: ViewableRobot,
-|}
+interface Props {
+  robot: ViewableRobot
+}
 
 const STATUS_REFRESH_MS = 5000
 
-export function ConnectionCard(props: Props): React.Node {
+export function ConnectionCard(props: Props): JSX.Element {
   const { robot } = props
   const { name: robotName, status, local, ip } = robot
   const { t } = useTranslation('robot_connection')
diff --git a/app/src/pages/Robots/RobotSettings/Control.ts b/app/src/pages/Robots/RobotSettings/Control.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/app/src/pages/Robots/RobotSettings/ControlsCard.tsx b/app/src/pages/Robots/RobotSettings/ControlsCard.tsx
index c3dd92bdc0f..824d9b50fd6 100644
--- a/app/src/pages/Robots/RobotSettings/ControlsCard.tsx
+++ b/app/src/pages/Robots/RobotSettings/ControlsCard.tsx
@@ -1,4 +1,3 @@
-// @flow
 // "Robot Controls" card
 import * as React from 'react'
 import { useDispatch, useSelector } from 'react-redux'
@@ -29,11 +28,11 @@ import { ToggleBtn } from '../../../atoms/ToggleBtn'
 import type { State, Dispatch } from '../../../redux/types'
 import type { ViewableRobot } from '../../../redux/discovery/types'
 
-type Props = {|
-  robot: ViewableRobot,
-|}
+interface Props {
+  robot: ViewableRobot
+}
 
-export function ControlsCard(props: Props): React.Node {
+export function ControlsCard(props: Props): JSX.Element {
   const { t } = useTranslation(['robot_controls', 'shared'])
   const dispatch = useDispatch<Dispatch>()
   const { robot } = props
@@ -41,7 +40,8 @@ export function ControlsCard(props: Props): React.Node {
   const lightsOn = useSelector((state: State) => getLightsOn(state, robotName))
   const isRunning = useSelector(robotSelectors.getIsRunning)
   const notConnectable = status !== CONNECTABLE
-  const toggleLights = () => dispatch(updateLights(robotName, !lightsOn))
+  const toggleLights = (): unknown =>
+    dispatch(updateLights(robotName, !lightsOn))
 
   React.useEffect(() => {
     dispatch(fetchLights(robotName))
diff --git a/app/src/pages/Robots/RobotSettings/DeckCalibrationControl.tsx b/app/src/pages/Robots/RobotSettings/DeckCalibrationControl.tsx
index 4f6f533358d..415c4e20dac 100644
--- a/app/src/pages/Robots/RobotSettings/DeckCalibrationControl.tsx
+++ b/app/src/pages/Robots/RobotSettings/DeckCalibrationControl.tsx
@@ -1,5 +1,3 @@
-// @flow
-
 import * as React from 'react'
 import { useSelector, useDispatch } from 'react-redux'
 import { useTranslation } from 'react-i18next'
@@ -43,19 +41,19 @@ import type {
 import type { RequestState } from '../../../redux/robot-api/types'
 
 // deck calibration commands for which the full page spinner should not appear
-const spinnerCommandBlockList: Array<SessionCommandString> = [
+const spinnerCommandBlockList: SessionCommandString[] = [
   Sessions.sharedCalCommands.JOG,
 ]
 
-export type Props = {|
-  robotName: string,
-  disabledReason: string | null,
-  deckCalStatus: DeckCalibrationStatus | null,
-  deckCalData: DeckCalibrationData | null,
-  pipOffsetDataPresent: boolean,
-|}
+export interface Props {
+  robotName: string
+  disabledReason: string | null
+  deckCalStatus: DeckCalibrationStatus | null
+  deckCalData: DeckCalibrationData | null
+  pipOffsetDataPresent: boolean
+}
 
-export function DeckCalibrationControl(props: Props): React.Node {
+export function DeckCalibrationControl(props: Props): JSX.Element {
   const {
     robotName,
     disabledReason,
@@ -75,21 +73,44 @@ export function DeckCalibrationControl(props: Props): React.Node {
   const [dispatchRequests] = RobotApi.useDispatchApiRequests(
     dispatchedAction => {
       if (dispatchedAction.type === Sessions.ENSURE_SESSION) {
+        // @ts-expect-error TODO: code in comments below
         createRequestId.current = dispatchedAction.meta.requestId
+        // createRequestId.current =
+        // 'requestId' in dispatchedAction.meta
+        // ? dispatchedAction.meta.requestId ?? null
+        // : null
+
+        // @ts-expect-error TODO: code in comments below
         trackedRequestId.current = dispatchedAction.meta.requestId
+        // trackedRequestId.current =
+        //   'requestId' in dispatchedAction.meta
+        //     ? dispatchedAction.meta.requestId ?? null
+        //     : null
       } else if (
         dispatchedAction.type === Sessions.CREATE_SESSION_COMMAND &&
         dispatchedAction.payload.command.command ===
           Sessions.sharedCalCommands.JOG
       ) {
+        // @ts-expect-error TODO: code in comments below
         jogRequestId.current = dispatchedAction.meta.requestId
+        // jogRequestId.current =
+        //   'requestId' in dispatchedAction.meta
+        //     ? dispatchedAction.meta.requestId ?? null
+        //     : null
       } else if (
         dispatchedAction.type !== Sessions.CREATE_SESSION_COMMAND ||
         !spinnerCommandBlockList.includes(
           dispatchedAction.payload.command.command
         )
       ) {
+        // @ts-expect-error TODO: code in comments below
         trackedRequestId.current = dispatchedAction.meta.requestId
+        // trackedRequestId.current =
+        //   'meta' in dispatchedAction &&
+        //   'requestId' in dispatchedAction.meta &&
+        //   dispatchedAction.meta.requestId != null
+        //     ? dispatchedAction.meta.requestId
+        //     : null
       }
     }
   )
@@ -121,7 +142,7 @@ export function DeckCalibrationControl(props: Props): React.Node {
     }
   }, [createStatus])
 
-  const handleStartDeckCalSession = () => {
+  const handleStartDeckCalSession = (): void => {
     dispatchRequests(
       Sessions.ensureSession(robotName, Sessions.SESSION_TYPE_DECK_CALIBRATION)
     )
@@ -158,12 +179,14 @@ export function DeckCalibrationControl(props: Props): React.Node {
       return t('deck_calibration_missing')
     }
     const datestring =
-      typeof data.lastModified === 'string'
+      'lastModified' in data && typeof data.lastModified === 'string'
         ? formatLastModified(data.lastModified)
         : t('shared:unknown')
-    const getPrefix = calData =>
+    const getPrefix = (calData: DeckCalibrationData): string =>
+      // @ts-expect-error TODO protect against non existent source key with in operator
       typeof data?.source === 'string'
-        ? calData.source === Calibration.CALIBRATION_SOURCE_LEGACY
+        ? 'source' in calData &&
+          calData.source === Calibration.CALIBRATION_SOURCE_LEGACY
           ? t('last_migrated')
           : t('last_calibrated')
         : t('last_calibrated')
@@ -206,6 +229,7 @@ export function DeckCalibrationControl(props: Props): React.Node {
             {...targetProps}
             minWidth="12rem"
             onClick={confirmStart}
+            // @ts-expect-error TODO: SecondaryBtn expects a boolean value for it's disabled prop, cast disabledOrBusyReason?
             disabled={disabledOrBusyReason}
           >
             {showSpinner ? (
@@ -251,8 +275,12 @@ export function DeckCalibrationControl(props: Props): React.Node {
           >
             <Text>{t('deck_calibration_error_occured')}</Text>
             <Text>
-              {createRequest?.error &&
-                RobotApi.getErrorResponseMessage(createRequest.error)}
+              {
+                // @ts-expect-error TODO use in operator to protect against non existent error
+                createRequest?.error &&
+                  // @ts-expect-error TODO use in operator to protect against non existent error
+                  RobotApi.getErrorResponseMessage(createRequest.error)
+              }
             </Text>
           </AlertModal>
         )}
diff --git a/app/src/pages/Robots/RobotSettings/InformationCard.tsx b/app/src/pages/Robots/RobotSettings/InformationCard.tsx
index c74e3a3b383..0dc97341b19 100644
--- a/app/src/pages/Robots/RobotSettings/InformationCard.tsx
+++ b/app/src/pages/Robots/RobotSettings/InformationCard.tsx
@@ -1,4 +1,3 @@
-// @flow
 // RobotSettings card for robot status
 import * as React from 'react'
 import cx from 'classnames'
@@ -32,14 +31,14 @@ import { LabeledValue } from '../../../atoms/structure'
 import type { State, Dispatch } from '../../../redux/types'
 import type { ViewableRobot } from '../../../redux/discovery/types'
 
-export type InformationCardProps = {|
-  robot: ViewableRobot,
-  updateUrl: string,
-|}
+export interface InformationCardProps {
+  robot: ViewableRobot
+  updateUrl: string
+}
 
 const UPDATE_RECHECK_DELAY_MS = 60000
 
-export function InformationCard(props: InformationCardProps): React.Node {
+export function InformationCard(props: InformationCardProps): JSX.Element {
   const { robot, updateUrl } = props
   const { t } = useTranslation(['robot_info', 'shared'])
 
diff --git a/app/src/pages/Robots/RobotSettings/OpenJupyterControl.tsx b/app/src/pages/Robots/RobotSettings/OpenJupyterControl.tsx
index d557ab0d8e9..395e20b2f73 100644
--- a/app/src/pages/Robots/RobotSettings/OpenJupyterControl.tsx
+++ b/app/src/pages/Robots/RobotSettings/OpenJupyterControl.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { useTranslation, Trans } from 'react-i18next'
 
@@ -17,11 +16,13 @@ import { LabeledValue } from '../../../atoms/structure'
 
 const EVENT_JUPYTER_OPEN = { name: 'jupyterOpen', properties: {} }
 
-export type OpenJupyterControlProps = {|
-  robotIp: string,
-|}
+export interface OpenJupyterControlProps {
+  robotIp: string
+}
 
-export function OpenJupyterControl(props: OpenJupyterControlProps): React.Node {
+export function OpenJupyterControl(
+  props: OpenJupyterControlProps
+): JSX.Element {
   const { robotIp } = props
   const { t } = useTranslation(['robot_advanced_settings', 'shared'])
   const href = `http://${robotIp}:48888`
diff --git a/app/src/pages/Robots/RobotSettings/PipetteOffsetItem.tsx b/app/src/pages/Robots/RobotSettings/PipetteOffsetItem.tsx
index d9843331524..e115eb1bbfe 100644
--- a/app/src/pages/Robots/RobotSettings/PipetteOffsetItem.tsx
+++ b/app/src/pages/Robots/RobotSettings/PipetteOffsetItem.tsx
@@ -1,5 +1,3 @@
-// @flow
-
 import * as React from 'react'
 import { useTranslation } from 'react-i18next'
 
@@ -41,17 +39,17 @@ import type {
   TipLengthCalibration,
 } from '../../../redux/calibration/types'
 
-type Props = {|
-  mount: 'left' | 'right',
-  pipette: AttachedPipette | null,
-  calibration: PipetteCalibrations | null,
-  customLabware: Array<LabwareDefinition2>,
-|}
+interface Props {
+  mount: 'left' | 'right'
+  pipette: AttachedPipette | null
+  calibration: PipetteCalibrations | null
+  customLabware: LabwareDefinition2[]
+}
 
-function TipRackDisplayName(props: {|
-  tiprackUri: string,
-  customLabware: Array<LabwareDefinition2>,
-|}): React.Node {
+function TipRackDisplayName(props: {
+  tiprackUri: string
+  customLabware: LabwareDefinition2[]
+}): JSX.Element {
   const { t } = useTranslation('robot_calibration')
   const { tiprackUri, customLabware } = props
   const [namespace, loadName] = tiprackUri ? tiprackUri.split('/') : ['', '']
@@ -70,9 +68,9 @@ function TipRackDisplayName(props: {|
   )
 }
 
-function LastCalibrated(props: {|
-  calibration: PipetteOffsetCalibration | TipLengthCalibration,
-|}): React.Node {
+function LastCalibrated(props: {
+  calibration: PipetteOffsetCalibration | TipLengthCalibration
+}): JSX.Element {
   const { t } = useTranslation('robot_calibration')
   return (
     <Text
@@ -87,12 +85,12 @@ function LastCalibrated(props: {|
   )
 }
 
-type PipetteOffsetSectionProps = {|
-  pipette: AttachedPipette,
-  calibration: PipetteOffsetCalibration | null,
-|}
+interface PipetteOffsetSectionProps {
+  pipette: AttachedPipette
+  calibration: PipetteOffsetCalibration | null
+}
 
-function PipetteOffsetSection(props: PipetteOffsetSectionProps): React.Node {
+function PipetteOffsetSection(props: PipetteOffsetSectionProps): JSX.Element {
   const { t } = useTranslation('robot_calibration')
   const { pipette, calibration } = props
   return (
@@ -119,12 +117,12 @@ function PipetteOffsetSection(props: PipetteOffsetSectionProps): React.Node {
   )
 }
 
-type TipLengthSectionProps = {|
-  calibration: PipetteCalibrations | null,
-  customLabware: Array<LabwareDefinition2>,
-|}
+interface TipLengthSectionProps {
+  calibration: PipetteCalibrations | null
+  customLabware: LabwareDefinition2[]
+}
 
-export function TipLengthSection(props: TipLengthSectionProps): React.Node {
+export function TipLengthSection(props: TipLengthSectionProps): JSX.Element {
   const { calibration, customLabware } = props
   const { t } = useTranslation('robot_calibration')
   return (
@@ -153,7 +151,7 @@ export function TipLengthSection(props: TipLengthSectionProps): React.Node {
   )
 }
 
-export function PipetteOffsetItem(props: Props): React.Node {
+export function PipetteOffsetItem(props: Props): JSX.Element {
   const { t } = useTranslation('robot_calibration')
   const { mount, pipette, calibration, customLabware } = props
   return (
diff --git a/app/src/pages/Robots/RobotSettings/PipetteOffsets.tsx b/app/src/pages/Robots/RobotSettings/PipetteOffsets.tsx
index 29b53fd6501..44f149366af 100644
--- a/app/src/pages/Robots/RobotSettings/PipetteOffsets.tsx
+++ b/app/src/pages/Robots/RobotSettings/PipetteOffsets.tsx
@@ -1,5 +1,3 @@
-// @flow
-
 import * as React from 'react'
 import { useSelector } from 'react-redux'
 import { Link as RRDLink } from 'react-router-dom'
@@ -25,12 +23,12 @@ import type { ViewableRobot } from '../../../redux/discovery/types'
 
 import { PipetteOffsetItem } from './PipetteOffsetItem'
 
-type Props = {|
-  pipettesPageUrl: string,
-  robot: ViewableRobot,
-|}
+interface Props {
+  pipettesPageUrl: string
+  robot: ViewableRobot
+}
 
-export function PipetteOffsets(props: Props): React.Node {
+export function PipetteOffsets(props: Props): JSX.Element {
   const { pipettesPageUrl, robot } = props
   const { name: robotName } = robot
 
diff --git a/app/src/pages/Robots/RobotSettings/ReachableRobotBanner.tsx b/app/src/pages/Robots/RobotSettings/ReachableRobotBanner.tsx
index b3fce84226d..9dc476b91e1 100644
--- a/app/src/pages/Robots/RobotSettings/ReachableRobotBanner.tsx
+++ b/app/src/pages/Robots/RobotSettings/ReachableRobotBanner.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { AlertItem } from '@opentrons/components'
 import styles from './styles.css'
@@ -14,7 +13,9 @@ import type {
   HealthStatus,
 } from '../../../redux/discovery/types'
 
-type State = {| dismissed: boolean |}
+interface State {
+  dismissed: boolean
+}
 
 // TODO(bc, 2020-12-07): i18n
 const UNRESPONSIVE_TITLE = 'Unable to establish connection with robot'
@@ -31,7 +32,10 @@ const LAST_RESORT = (
   </p>
 )
 
-const NO_SERVER_MESSAGE = (serverStatus: HealthStatus, ip: string) => (
+const NO_SERVER_MESSAGE = (
+  serverStatus: HealthStatus,
+  ip: string
+): JSX.Element => (
   <div className={styles.banner}>
     <p>
       This OT-2 has been seen recently, but it is currently{' '}
@@ -42,7 +46,7 @@ const NO_SERVER_MESSAGE = (serverStatus: HealthStatus, ip: string) => (
   </div>
 )
 
-const SERVER_MESSAGE = (status: HealthStatus, ip: string) => (
+const SERVER_MESSAGE = (status: HealthStatus, ip: string): JSX.Element => (
   <div className={styles.banner}>
     <p>
       Your {"OT-2's"} API server is {STATUS_DESCRIPTION[status]} at IP address{' '}
@@ -76,7 +80,7 @@ export class ReachableRobotBanner extends React.Component<
     this.state = { dismissed: false }
   }
 
-  render(): React.Node {
+  render(): JSX.Element | null {
     const { ip, healthStatus, serverHealthStatus } = this.props
     const isVisible = !this.state.dismissed
     const message =
diff --git a/app/src/pages/Robots/RobotSettings/ResetRobotModal.tsx b/app/src/pages/Robots/RobotSettings/ResetRobotModal.tsx
index dd5c8441da7..c53ad53502e 100644
--- a/app/src/pages/Robots/RobotSettings/ResetRobotModal.tsx
+++ b/app/src/pages/Robots/RobotSettings/ResetRobotModal.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { useSelector, useDispatch } from 'react-redux'
 import last from 'lodash/last'
@@ -36,23 +35,33 @@ import { Portal } from '../../../App/portal'
 import type { State, Dispatch } from '../../../redux/types'
 import type { ResetConfigRequest } from '../../../redux/robot-admin/types'
 
-export type ResetRobotModalProps = {|
-  robotName: string,
-  closeModal: () => mixed,
-|}
+export interface ResetRobotModalProps {
+  robotName: string
+  closeModal: () => unknown
+}
 
 // TODO(bc, 2020-12-07): i18n
 const TITLE = 'Robot Configuration Reset'
 
-export function ResetRobotModal(props: ResetRobotModalProps): React.Node {
+export function ResetRobotModal(props: ResetRobotModalProps): JSX.Element {
   const { robotName, closeModal } = props
   const dispatch = useDispatch<Dispatch>()
   const [dispatchRequest, requestIds] = useDispatchApiRequest()
+
+  // const resetRequest = useSelector((state: State) => {
+  //   const lastId = last(requestIds)
+  //   return lastId != null ? getRequestById(state, lastId) : null
+  // })
+  // const resetRequestStatus = resetRequest != null ? resetRequest.status : null
+
+  // const triggerReset = (): unknown =>
   const resetRequestStatus = useSelector((state: State) => {
+    // @ts-expect-error TODO: should be commented code above,
+    // code change to protect against getting the status off of a request that doesn't exist
     return getRequestById(state, last(requestIds))
   })?.status
 
-  const triggerReset = () =>
+  const triggerReset = (): unknown =>
     dispatchRequest(resetConfig(robotName, resetOptions))
 
   const [resetOptions, setResetOptions] = React.useState<ResetConfigRequest>({})
@@ -117,6 +126,8 @@ export function ResetRobotModal(props: ResetRobotModalProps): React.Node {
               })
             }}
             name={o.id}
+            // value={Boolean(resetOptions[o.id])}
+            // @ts-expect-error TODO commented code above to explicitly give LabeledCheckbox the boolean that it's expecting
             value={resetOptions[o.id]}
             key={o.id}
           >
diff --git a/app/src/pages/Robots/RobotSettings/RestartRequiredBanner.tsx b/app/src/pages/Robots/RobotSettings/RestartRequiredBanner.tsx
index d327136deb2..270a0582e74 100644
--- a/app/src/pages/Robots/RobotSettings/RestartRequiredBanner.tsx
+++ b/app/src/pages/Robots/RobotSettings/RestartRequiredBanner.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { useDispatch } from 'react-redux'
 import { AlertItem, OutlineButton } from '@opentrons/components'
@@ -8,9 +7,9 @@ import styles from './styles.css'
 
 import type { Dispatch } from '../../../redux/types'
 
-export type RestartRequiredBannerProps = {|
-  robotName: string,
-|}
+export interface RestartRequiredBannerProps {
+  robotName: string
+}
 
 // TODO(mc, 2019-10-24): i18n
 const TITLE = 'Robot restart required'
@@ -20,7 +19,7 @@ const RESTART_NOW = 'Restart Now'
 
 export function RestartRequiredBanner(
   props: RestartRequiredBannerProps
-): React.Node {
+): JSX.Element | null {
   const { robotName } = props
   const [dismissed, setDismissed] = React.useState(false)
   const dispatch = useDispatch<Dispatch>()
diff --git a/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/FormModal.tsx b/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/FormModal.tsx
index 0d9bba54204..129da41ce47 100644
--- a/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/FormModal.tsx
+++ b/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/FormModal.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { Form } from 'formik'
 import styled, { css } from 'styled-components'
@@ -11,12 +10,7 @@ import { SecurityField } from './SecurityField'
 import { FIELD_TYPE_KEY_FILE, FIELD_TYPE_SECURITY } from '../constants'
 import * as Copy from '../i18n'
 
-import type { HTMLFormAttributes } from 'formik'
-import type { StyledComponent } from 'styled-components'
 import type { ConnectFormField, WifiNetwork } from '../types'
-import type { TextFieldProps } from './TextField'
-import type { KeyFileFieldProps } from './KeyFileField'
-import type { SecurityFieldProps } from './SecurityField'
 
 const fieldStyle = css`
   min-width: 12rem;
@@ -25,50 +19,34 @@ const StyledCopy = styled.p`
   margin: 0 1rem 1rem;
 `
 
-const StyledForm: StyledComponent<
-  HTMLFormAttributes,
-  {||},
-  typeof Form
-> = styled(Form)`
+const StyledForm = styled(Form)`
   font-size: ${FONT_SIZE_BODY_1};
   display: table;
   width: 80%;
   margin-top: 0.5rem;
 `
 
-const StyledTextField: StyledComponent<
-  TextFieldProps,
-  {||},
-  typeof TextField
-> = styled(TextField)`
+const StyledTextField = styled(TextField)`
   ${fieldStyle}
 `
 
-const StyledKeyFileField: StyledComponent<
-  KeyFileFieldProps,
-  {||},
-  typeof KeyFileField
-> = styled(KeyFileField)`
+const StyledKeyFileField = styled(KeyFileField)`
   ${fieldStyle}
 `
 
-const StyledSecurityField: StyledComponent<
-  SecurityFieldProps,
-  {||},
-  typeof SecurityField
-> = styled(SecurityField)`
+const StyledSecurityField = styled(SecurityField)`
   ${fieldStyle}
 `
 
-export type FormModalProps = {|
-  id: string,
-  network: WifiNetwork | null,
-  fields: Array<ConnectFormField>,
-  isValid: boolean,
-  onCancel: () => mixed,
-|}
+export interface FormModalProps {
+  id: string
+  network: WifiNetwork | null
+  fields: ConnectFormField[]
+  isValid: boolean
+  onCancel: () => unknown
+}
 
-export const FormModal = (props: FormModalProps): React.Node => {
+export const FormModal = (props: FormModalProps): JSX.Element => {
   const { id, network, fields, isValid, onCancel } = props
 
   const heading =
diff --git a/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/FormRow.tsx b/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/FormRow.tsx
index b2535e7fafb..7c2a09051c6 100644
--- a/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/FormRow.tsx
+++ b/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/FormRow.tsx
@@ -1,33 +1,26 @@
-// @flow
 // presentational components for the wifi connect form
 import * as React from 'react'
 import styled from 'styled-components'
 import { FONT_WEIGHT_SEMIBOLD } from '@opentrons/components'
 
-import type { StyledComponent } from 'styled-components'
-
-export type FormRowProps = {|
-  label: string,
-  labelFor: string,
-  children: React.Node,
-|}
+export interface FormRowProps {
+  label: string
+  labelFor: string
+  children: React.ReactNode
+}
 
-const StyledRow: StyledComponent<{||}, {||}, HTMLDivElement> = styled.div`
+const StyledRow = styled.div`
   display: table-row;
 `
 
-const StyledLabel: StyledComponent<{||}, {||}, HTMLLabelElement> = styled.label`
+const StyledLabel = styled.label`
   display: table-cell;
   padding-right: 1rem;
   text-align: right;
   font-weight: ${FONT_WEIGHT_SEMIBOLD};
 `
 
-const StyledInputWrapper: StyledComponent<
-  {||},
-  {||},
-  HTMLDivElement
-> = styled.div`
+const StyledInputWrapper = styled.div`
   padding-bottom: 0.75rem;
   display: table-cell;
 
@@ -36,7 +29,7 @@ const StyledInputWrapper: StyledComponent<
   }
 `
 
-export const FormRow = (props: FormRowProps): React.Node => {
+export const FormRow = (props: FormRowProps): JSX.Element => {
   const { label, labelFor, children } = props
 
   return (
diff --git a/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/KeyFileField.tsx b/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/KeyFileField.tsx
index 840ad833974..11d7afbe286 100644
--- a/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/KeyFileField.tsx
+++ b/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/KeyFileField.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 
 import { SelectField } from '@opentrons/components'
@@ -9,15 +8,15 @@ import { useConnectFormField } from './form-state'
 
 import type { WifiKey } from '../types'
 
-export type KeyFileFieldProps = {|
-  id: string,
-  name: string,
-  label: string,
-  placeholder: string,
-  robotName: string,
-  wifiKeys: Array<WifiKey>,
-  className?: string,
-|}
+export interface KeyFileFieldProps {
+  id: string
+  name: string
+  label: string
+  placeholder: string
+  robotName: string
+  wifiKeys: WifiKey[]
+  className?: string
+}
 
 const ADD_NEW_KEY_VALUE = '__addNewKey__'
 
@@ -25,17 +24,19 @@ const ADD_NEW_KEY_OPTION_GROUP = {
   options: [{ value: ADD_NEW_KEY_VALUE, label: LABEL_ADD_NEW_KEY }],
 }
 
-const makeKeyOptions = (keys: Array<WifiKey>) => ({
+const makeKeyOptions = (
+  keys: WifiKey[]
+): { options: Array<{ value: string; label: string }> } => ({
   options: keys.map(k => ({ value: k.id, label: k.name })),
 })
 
-export const KeyFileField = (props: KeyFileFieldProps): React.Node => {
+export const KeyFileField = (props: KeyFileFieldProps): JSX.Element => {
   const { id, name, label, placeholder, robotName, wifiKeys } = props
   const { value, error, setValue, setTouched } = useConnectFormField(name)
   const options = [makeKeyOptions(wifiKeys), ADD_NEW_KEY_OPTION_GROUP]
-  const uploadKeyRef = React.useRef()
+  const uploadKeyRef = React.useRef<HTMLInputElement>(null)
 
-  const handleValueChange = (_, value) => {
+  const handleValueChange = (_: string, value: string): void => {
     if (value === ADD_NEW_KEY_VALUE) {
       uploadKeyRef.current && uploadKeyRef.current.click()
     } else {
diff --git a/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/SecurityField.tsx b/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/SecurityField.tsx
index 712c8b6acfc..1d942ea972b 100644
--- a/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/SecurityField.tsx
+++ b/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/SecurityField.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { SelectField } from '@opentrons/components'
 
@@ -9,29 +8,31 @@ import { FormRow } from './FormRow'
 
 import type { EapOption } from '../types'
 
-export type SecurityFieldProps = {|
-  id: string,
-  name: string,
-  placeholder: string,
-  label: string,
-  showAllOptions: boolean,
-  eapOptions: Array<EapOption>,
-  className?: string,
-|}
+export interface SecurityFieldProps {
+  id: string
+  name: string
+  placeholder: string
+  label: string
+  showAllOptions: boolean
+  eapOptions: EapOption[]
+  className?: string
+}
 
 const ALL_SECURITY_OPTIONS = [
   { options: [{ value: SECURITY_NONE, label: LABEL_SECURITY_NONE }] },
   { options: [{ value: SECURITY_WPA_PSK, label: LABEL_SECURITY_PSK }] },
 ]
 
-const makeEapOptionsGroup = (eapOptions: Array<EapOption>) => ({
+const makeEapOptionsGroup = (
+  eapOptions: EapOption[]
+): { options: Array<{ value: string; label: string }> } => ({
   options: eapOptions.map(opt => ({
     value: opt.name,
     label: opt.displayName ?? opt.name,
   })),
 })
 
-export const SecurityField = (props: SecurityFieldProps): React.Node => {
+export const SecurityField = (props: SecurityFieldProps): JSX.Element => {
   const {
     id,
     name,
diff --git a/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/TextField.tsx b/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/TextField.tsx
index 8b727530d47..e2c5fed9907 100644
--- a/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/TextField.tsx
+++ b/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/TextField.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 
 import {
@@ -12,15 +11,15 @@ import { FormRow } from './FormRow'
 import { useConnectFormField } from './form-state'
 import { LABEL_SHOW_PASSWORD } from '../i18n'
 
-export type TextFieldProps = {|
-  id: string,
-  name: string,
-  label: string,
-  isPassword: boolean,
-  className?: string,
-|}
+export interface TextFieldProps {
+  id: string
+  name: string
+  label: string
+  isPassword: boolean
+  className?: string
+}
 
-export const TextField = (props: TextFieldProps): React.Node => {
+export const TextField = (props: TextFieldProps): JSX.Element => {
   const { id, name, label, isPassword, className } = props
   const { value, error, onChange, onBlur } = useConnectFormField(name)
   const [showPw, toggleShowPw] = React.useReducer(show => !show, false)
diff --git a/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/UploadKeyInput.tsx b/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/UploadKeyInput.tsx
index 6f089c9b2a4..05c532f0876 100644
--- a/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/UploadKeyInput.tsx
+++ b/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/UploadKeyInput.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import styled from 'styled-components'
 import { useSelector } from 'react-redux'
@@ -12,11 +11,11 @@ import {
 
 import type { State } from '../../../../../redux/types'
 
-export type UploadKeyInputProps = {|
-  robotName: string,
-  label: string,
-  onUpload: (keyId: string) => mixed,
-|}
+export interface UploadKeyInputProps {
+  robotName: string
+  label: string
+  onUpload: (keyId: string) => unknown
+}
 
 // TODO(mc, 2020-03-04): create styled HiddenInput in components library
 const HiddenInput = styled.input`
@@ -30,16 +29,19 @@ const HiddenInput = styled.input`
   border: 0;
 `
 
-const UploadKeyInputComponent = (props: UploadKeyInputProps, ref) => {
+const UploadKeyInputComponent = (
+  props: UploadKeyInputProps,
+  ref: React.ForwardedRef<HTMLInputElement>
+): JSX.Element => {
   const { robotName, label, onUpload } = props
   const [dispatchApi, requestIds] = useDispatchApiRequest()
-  const handleUpload = React.useRef()
+  const handleUpload = React.useRef<(key: string) => void>()
 
   const createdKeyId = useSelector((state: State) => {
     return getWifiKeyByRequestId(state, robotName, last(requestIds) ?? null)
   })?.id
 
-  const handleFileInput = (event: SyntheticInputEvent<HTMLInputElement>) => {
+  const handleFileInput: React.ChangeEventHandler<HTMLInputElement> = event => {
     if (event.target.files && event.target.files.length > 0) {
       const file = event.target.files[0]
       event.target.value = ''
@@ -68,7 +70,7 @@ const UploadKeyInputComponent = (props: UploadKeyInputProps, ref) => {
   )
 }
 
-export const UploadKeyInput: React.AbstractComponent<
-  UploadKeyInputProps,
-  HTMLInputElement
-> = React.forwardRef(UploadKeyInputComponent)
+export const UploadKeyInput = React.forwardRef<
+  HTMLInputElement,
+  UploadKeyInputProps
+>(UploadKeyInputComponent)
diff --git a/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/__tests__/ConnectModal.test.tsx b/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/__tests__/ConnectModal.test.tsx
index a791819cce3..37ae928218e 100644
--- a/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/__tests__/ConnectModal.test.tsx
+++ b/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/__tests__/ConnectModal.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { Formik } from 'formik'
 import { shallow, mount } from 'enzyme'
@@ -8,36 +7,23 @@ import * as FormFields from '../form-fields'
 
 import { ConnectModal, ConnectModalComponent } from '..'
 import { FormModal } from '../FormModal'
+import { ConnectFormField } from '../../types'
 
-import type {
-  WifiNetwork,
-  EapOption,
-  WifiKey,
-  ConnectFormValues,
-} from '../../types'
+import type { ShallowWrapper } from 'enzyme'
 
 jest.mock('../form-fields')
 
-const getConnectFormFields: JestMockFn<
-  [
-    WifiNetwork | null,
-    string,
-    Array<EapOption>,
-    Array<WifiKey>,
-    ConnectFormValues
-  ],
-  $Call<typeof FormFields.getConnectFormFields, any, any, any, any, any>
-> = FormFields.getConnectFormFields
-
-const validateConnectFormFields: JestMockFn<
-  [WifiNetwork | null, Array<EapOption>, ConnectFormValues],
-  $Call<typeof FormFields.validateConnectFormFields, any, any, any>
-> = FormFields.validateConnectFormFields
-
-const connectFormToConfigureRequest: JestMockFn<
-  [WifiNetwork | null, ConnectFormValues],
-  $Call<typeof FormFields.connectFormToConfigureRequest, any, any, any>
-> = FormFields.connectFormToConfigureRequest
+const getConnectFormFields = FormFields.getConnectFormFields as jest.MockedFunction<
+  typeof FormFields.getConnectFormFields
+>
+
+const validateConnectFormFields = FormFields.validateConnectFormFields as jest.MockedFunction<
+  typeof FormFields.validateConnectFormFields
+>
+
+const connectFormToConfigureRequest = FormFields.connectFormToConfigureRequest as jest.MockedFunction<
+  typeof FormFields.connectFormToConfigureRequest
+>
 
 const robotName = 'robotName'
 const eapOptions = [Fixtures.mockEapOption]
@@ -58,7 +44,11 @@ describe("SelectNetwork's ConnectModal", () => {
   })
 
   describe('Formik wrapper', () => {
-    const render = (network = null) => {
+    const render = (
+      network:
+        | React.ComponentProps<typeof ConnectModal>['network']
+        | null = null
+    ): ShallowWrapper<React.ComponentProps<typeof ConnectModal>> => {
       return shallow(
         <ConnectModal
           {...{
@@ -95,12 +85,14 @@ describe("SelectNetwork's ConnectModal", () => {
     it('calls onConnect on submit', () => {
       const network = Fixtures.mockWifiNetwork
       const wrapper = render(network)
-      const formik = wrapper.find(Formik)
-      const mockValues = { ssid: 'foobar' }
+      const formik: ShallowWrapper<
+        React.ComponentProps<typeof Formik>
+      > = wrapper.find(Formik)
+      const mockValues = { ssid: 'foobar' } as any
       const mockRequest = { ssid: 'foobar', hidden: false }
 
       connectFormToConfigureRequest.mockReturnValue(mockRequest)
-      formik.invoke('onSubmit')(mockValues)
+      formik.invoke('onSubmit')?.(mockValues, {} as any)
 
       expect(connectFormToConfigureRequest).toHaveBeenCalledWith(
         network,
@@ -116,7 +108,7 @@ describe("SelectNetwork's ConnectModal", () => {
       const mockValues = {}
 
       connectFormToConfigureRequest.mockReturnValue(null)
-      formik.invoke('onSubmit')(mockValues)
+      formik.invoke('onSubmit')?.(mockValues, {} as any)
 
       expect(handleConnect).not.toHaveBeenCalled()
     })
@@ -130,7 +122,7 @@ describe("SelectNetwork's ConnectModal", () => {
 
       validateConnectFormFields.mockReturnValue(mockErrors)
 
-      const result = formik.invoke('validate')(mockValues)
+      const result = formik.invoke('validate')?.(mockValues)
 
       expect(result).toEqual(mockErrors)
       expect(validateConnectFormFields).toHaveBeenCalledWith(
@@ -145,7 +137,11 @@ describe("SelectNetwork's ConnectModal", () => {
     const handleSubmit = jest.fn()
     const handleValidate = jest.fn()
 
-    const render = (network = null) => {
+    const render = (
+      network:
+        | React.ComponentProps<typeof ConnectModalComponent>['network']
+        | null = null
+    ): ReturnType<typeof mount> => {
       return mount(
         <ConnectModalComponent
           {...{
@@ -186,14 +182,14 @@ describe("SelectNetwork's ConnectModal", () => {
     })
 
     it('passes fields to the connect form modal', () => {
-      const mockFields = [
+      const mockFields: ConnectFormField[] = [
         {
           type: 'text',
           name: 'fieldName',
           label: '* Field Name',
           isPassword: false,
         },
-      ]
+      ] as any
 
       getConnectFormFields.mockReturnValue(mockFields)
 
diff --git a/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/__tests__/FormModal.test.tsx b/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/__tests__/FormModal.test.tsx
index 470de314cac..590c46f4539 100644
--- a/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/__tests__/FormModal.test.tsx
+++ b/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/__tests__/FormModal.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { mount } from 'enzyme'
 import { Formik, Form } from 'formik'
@@ -11,6 +10,8 @@ import { KeyFileField } from '../KeyFileField'
 import { SecurityField } from '../SecurityField'
 import { FormModal } from '../FormModal'
 
+import type { FormModalProps } from '../FormModal'
+
 // KeyFileField is wired to redux, so mock it out
 jest.mock('../KeyFileField', () => ({ KeyFileField: () => null }))
 
@@ -22,7 +23,11 @@ const wifiKeys = [Fixtures.mockWifiKey]
 describe('FormModal', () => {
   const handleCancel = jest.fn()
 
-  const render = (network = null, fields = [], isValid = false) => {
+  const render = (
+    network: FormModalProps['network'] = null,
+    fields: FormModalProps['fields'] = [],
+    isValid: FormModalProps['isValid'] = false
+  ) => {
     return mount(
       <FormModal
         id={id}
diff --git a/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/__tests__/KeyFileField.test.tsx b/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/__tests__/KeyFileField.test.tsx
index 6078844611e..34d69f8265c 100644
--- a/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/__tests__/KeyFileField.test.tsx
+++ b/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/__tests__/KeyFileField.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { shallow } from 'enzyme'
 
@@ -10,12 +9,13 @@ import * as FormState from '../form-state'
 
 import { LABEL_ADD_NEW_KEY } from '../../i18n'
 
+import type { ShallowWrapper } from 'enzyme'
+
 jest.mock('../form-state')
 
-const useConnectFormField: JestMockFn<
-  [string],
-  $Call<typeof FormState.useConnectFormField, string>
-> = FormState.useConnectFormField
+const useConnectFormField = FormState.useConnectFormField as jest.MockedFunction<
+  typeof FormState.useConnectFormField
+>
 
 describe('ConnectModal KeyFileField', () => {
   const fieldId = 'field-id'
@@ -32,7 +32,7 @@ describe('ConnectModal KeyFileField', () => {
   const setValue = jest.fn()
   const setTouched = jest.fn()
 
-  const render = (value = null) => {
+  const render = (value: any | null = null): ReturnType<typeof shallow> => {
     useConnectFormField.mockImplementation(name => {
       expect(name).toBe(fieldName)
       return {
@@ -115,9 +115,11 @@ describe('ConnectModal KeyFileField', () => {
 
   it('updates the field value with UploadKeyInput::onUpload', () => {
     const wrapper = render()
-    const upload = wrapper.find(UploadKeyInput)
+    const upload: ShallowWrapper<
+      React.ComponentProps<typeof UploadKeyInput>
+    > = wrapper.find(UploadKeyInput)
 
-    upload.invoke('onUpload')('new-key-id')
+    upload.invoke('onUpload')?.('new-key-id')
     expect(setValue).toHaveBeenCalledWith('new-key-id')
   })
 
@@ -125,25 +127,27 @@ describe('ConnectModal KeyFileField', () => {
     const wrapper = render()
     const select = wrapper.find(SelectField)
 
-    select.invoke('onValueChange')(fieldName, 'new-key-id')
+    select.invoke('onValueChange')?.(fieldName, 'new-key-id')
     expect(setValue).toHaveBeenCalledWith('new-key-id')
   })
 
   it('does not update the field value when add new option is selected', () => {
     const wrapper = render()
     const select = wrapper.find(SelectField)
-    const options = select.prop('options').flatMap(o => o.options)
+    const options = select.prop('options').flatMap((o: any) => o.options)
     const addNewOpt = options.find(o => o?.label === LABEL_ADD_NEW_KEY)
 
-    select.invoke('onValueChange')(fieldName, addNewOpt?.value)
+    select.invoke('onValueChange')?.(fieldName, addNewOpt?.value)
     expect(setValue).not.toHaveBeenCalledWith(addNewOpt?.value)
   })
 
   it('updates field touched with SelectField::onLoseFocus', () => {
     const wrapper = render()
-    const select = wrapper.find(SelectField)
+    const select: ShallowWrapper<
+      React.ComponentProps<typeof SelectField>
+    > = wrapper.find(SelectField)
 
-    select.invoke('onLoseFocus')()
+    select.invoke('onLoseFocus')?.('')
     expect(setTouched).toHaveBeenCalledWith(true)
   })
 })
diff --git a/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/__tests__/SecurityField.test.tsx b/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/__tests__/SecurityField.test.tsx
index 0e6af7a4200..4a8058cdd90 100644
--- a/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/__tests__/SecurityField.test.tsx
+++ b/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/__tests__/SecurityField.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { mount } from 'enzyme'
 
@@ -12,10 +11,9 @@ import { SECURITY_NONE, SECURITY_WPA_PSK } from '../../constants'
 
 jest.mock('../form-state')
 
-const useConnectFormField: JestMockFn<
-  [string],
-  $Call<typeof FormState.useConnectFormField, string>
-> = FormState.useConnectFormField
+const useConnectFormField = FormState.useConnectFormField as jest.MockedFunction<
+  typeof FormState.useConnectFormField
+>
 
 describe('ConnectModal SecurityField', () => {
   const fieldId = 'field-id'
@@ -30,7 +28,11 @@ describe('ConnectModal SecurityField', () => {
   const setValue = jest.fn()
   const setTouched = jest.fn()
 
-  const render = (value = null, error = null, showAllOptions = false) => {
+  const render = (
+    value: any | null = null,
+    error: any | null = null,
+    showAllOptions: any | null = false
+  ): ReturnType<typeof mount> => {
     useConnectFormField.mockImplementation(name => {
       expect(name).toBe(fieldName)
       return {
@@ -110,7 +112,7 @@ describe('ConnectModal SecurityField', () => {
     const wrapper = render()
     const select = wrapper.find(SelectField)
 
-    select.invoke('onValueChange')(fieldName, SECURITY_NONE)
+    select.invoke('onValueChange')?.(fieldName, SECURITY_NONE)
     expect(setValue).toHaveBeenCalledWith(SECURITY_NONE)
   })
 
@@ -118,7 +120,7 @@ describe('ConnectModal SecurityField', () => {
     const wrapper = render()
     const select = wrapper.find(SelectField)
 
-    select.invoke('onLoseFocus')(fieldName)
+    select.invoke('onLoseFocus')?.(fieldName)
     expect(setTouched).toHaveBeenCalledWith(true)
   })
 })
diff --git a/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/__tests__/TextField.test.tsx b/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/__tests__/TextField.test.tsx
index a0ae267bf3e..4af3ce0a267 100644
--- a/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/__tests__/TextField.test.tsx
+++ b/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/__tests__/TextField.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { act } from 'react-dom/test-utils'
 import { mount } from 'enzyme'
@@ -7,10 +6,9 @@ import * as FormState from '../form-state'
 
 jest.mock('../form-state')
 
-const useConnectFormField: JestMockFn<
-  [string],
-  $Call<typeof FormState.useConnectFormField, string>
-> = FormState.useConnectFormField
+const useConnectFormField = FormState.useConnectFormField as jest.MockedFunction<
+  typeof FormState.useConnectFormField
+>
 
 describe('ConnectModal TextField', () => {
   const fieldId = 'field-id'
@@ -24,7 +22,10 @@ describe('ConnectModal TextField', () => {
   const labelSelector = `label[htmlFor="${fieldId}"]`
   const checkboxSelector = 'input[type="checkbox"]'
 
-  const render = (isPassword = false, error = null) => {
+  const render = (
+    isPassword: boolean = false,
+    error: any | null = null
+  ): ReturnType<typeof mount> => {
     useConnectFormField.mockImplementation(name => {
       expect(name).toBe(fieldName)
       return {
@@ -88,12 +89,12 @@ describe('ConnectModal TextField', () => {
     const wrapper = render(true)
     const checkbox = wrapper.find(checkboxSelector)
 
-    act(() => checkbox.invoke('onChange')())
+    act(() => checkbox.invoke('onChange')?.({} as React.ChangeEvent))
     wrapper.update()
     expect(wrapper.find(checkboxSelector).prop('checked')).toEqual(true)
     expect(wrapper.find(inputSelector).prop('type')).toEqual('text')
 
-    act(() => checkbox.invoke('onChange')())
+    act(() => checkbox.invoke('onChange')?.({} as React.ChangeEvent))
     wrapper.update()
     expect(wrapper.find(checkboxSelector).prop('checked')).toEqual(false)
     expect(wrapper.find(inputSelector).prop('type')).toEqual('password')
diff --git a/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/__tests__/UploadKeyInput.test.tsx b/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/__tests__/UploadKeyInput.test.tsx
index 83e275ce820..870f18433f4 100644
--- a/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/__tests__/UploadKeyInput.test.tsx
+++ b/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/__tests__/UploadKeyInput.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { Provider } from 'react-redux'
 import { act } from 'react-dom/test-utils'
@@ -8,25 +7,24 @@ import * as Fixtures from '../../../../../../redux/networking/__fixtures__'
 import * as Networking from '../../../../../../redux/networking'
 import { UploadKeyInput } from '../UploadKeyInput'
 
-import type { State } from '../../../../../../redux/types'
+import type { Action } from '../../../../../../redux/types'
 
 jest.mock('../../../../../../redux/networking/selectors')
 
 const mockState = { state: true, mock: true }
-const mockRobotName = 'robot-name'
+const mockRobotName = 'robot-name' as any
 const mockFile = new File(['key-contents'], 'key.crt')
 
-const mockGetWifiKeyByRequestId: JestMockFn<
-  [State, string, string | null],
-  $Call<typeof Networking.getWifiKeyByRequestId, State, string, string | null>
-> = Networking.getWifiKeyByRequestId
+const mockGetWifiKeyByRequestId = Networking.getWifiKeyByRequestId as jest.MockedFunction<
+  typeof Networking.getWifiKeyByRequestId
+>
 
 describe('ConnectForm UploadKey input field', () => {
   const handleUpload = jest.fn()
   const label = 'field-label'
-  let dispatch
-  let mockStore
-  let render
+  let dispatch: any
+  let mockStore: any
+  let render: (ref?: any) => ReturnType<typeof mount>
 
   beforeEach(() => {
     dispatch = jest.fn()
@@ -73,7 +71,7 @@ describe('ConnectForm UploadKey input field', () => {
     const input = wrapper.find('input[type="file"]')
 
     act(() => {
-      input.invoke('onChange')({ target: { files: [mockFile] } })
+      input.invoke('onChange')?.({ target: { files: [mockFile] } } as any)
     })
 
     expect(dispatch).toHaveBeenCalledWith(
@@ -89,8 +87,8 @@ describe('ConnectForm UploadKey input field', () => {
     const input = wrapper.find('input[type="file"]')
 
     act(() => {
-      input.invoke('onChange')({ target: { files: [mockFile] } })
-      const postAction = dispatch.mock.calls.find(([action]) => {
+      input.invoke('onChange')?.({ target: { files: [mockFile] } } as any)
+      const postAction = dispatch.mock.calls.find(([action]: Action[]) => {
         return action.type === Networking.POST_WIFI_KEYS
       })
       const requestId = postAction?.[0].meta.requestId
diff --git a/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/__tests__/form-fields.test.ts b/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/__tests__/form-fields.test.ts
index 8b8860c3928..f6f202ba9de 100644
--- a/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/__tests__/form-fields.test.ts
+++ b/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/__tests__/form-fields.test.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import * as Fixtures from '../../../../../../redux/networking/__fixtures__'
 
 import {
@@ -260,7 +258,7 @@ describe('validateConnectFormFields', () => {
     ]
     const values = {
       securityType: 'someOtherEapType',
-      eapConfig: { [('fileField': string)]: '123' },
+      eapConfig: { fileField: '123' },
     }
     const errors = validateConnectFormFields(network, eapOptions, values)
 
@@ -330,7 +328,7 @@ describe('connectFormToConfigureRequest', () => {
     }
     const values = {
       securityType: 'someEapType',
-      eapConfig: { [('option1': string)]: 'fizzbuzz' },
+      eapConfig: { option1: 'fizzbuzz' },
     }
     const result = connectFormToConfigureRequest(network, values)
 
@@ -346,7 +344,7 @@ describe('connectFormToConfigureRequest', () => {
     const values = {
       ssid: 'foobar',
       securityType: 'someEapType',
-      eapConfig: { [('option1': string)]: 'fizzbuzz' },
+      eapConfig: { option1: 'fizzbuzz' },
     }
     const result = connectFormToConfigureRequest(null, values)
 
diff --git a/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/__tests__/form-state.test.tsx b/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/__tests__/form-state.test.tsx
index f7e67ed98eb..fdd50c8d84f 100644
--- a/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/__tests__/form-state.test.tsx
+++ b/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/__tests__/form-state.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { mount } from 'enzyme'
 import * as Formik from 'formik'
@@ -18,11 +17,11 @@ import type { ConnectFormFieldProps } from '../../types'
 // https://github.com/jaredpalmer/formik/pull/2360
 jest.mock('formik')
 
-const useFormikContext: JestMockFn<[], $Call<typeof Formik.useFormikContext>> =
-  Formik.useFormikContext
+const useFormikContext = Formik.useFormikContext as jest.MockedFunction<
+  typeof Formik.useFormikContext
+>
 
-const useField: JestMockFn<[any], $Call<typeof Formik.useField, any>> =
-  Formik.useField
+const useField = Formik.useField as jest.MockedFunction<typeof Formik.useField>
 
 describe('ConnectModal state hooks', () => {
   afterEach(() => {
@@ -34,18 +33,27 @@ describe('ConnectModal state hooks', () => {
     const setTouched = jest.fn()
     const setValues = jest.fn()
 
-    const mockFormOnce = (values, errors = {}, touched = {}) => {
-      useFormikContext.mockReturnValueOnce(
-        ({ values, errors, touched, setValues, setErrors, setTouched }: any)
-      )
+    const mockFormOnce = (
+      values: any,
+      errors: any = {},
+      touched: any = {}
+    ): void => {
+      useFormikContext.mockReturnValueOnce({
+        values,
+        errors,
+        touched,
+        setValues,
+        setErrors,
+        setTouched,
+      } as any)
     }
 
-    const TestUseResetFormOnSecurityChange = () => {
+    const TestUseResetFormOnSecurityChange = (): JSX.Element => {
       useResetFormOnSecurityChange()
       return <></>
     }
 
-    const render = () => {
+    const render = (): ReturnType<typeof mount> => {
       return mount(<TestUseResetFormOnSecurityChange />)
     }
 
@@ -101,21 +109,22 @@ describe('ConnectModal state hooks', () => {
     const setValue = jest.fn()
     const setTouched = jest.fn()
 
-    const mockFieldOnce = (value, error, touched) => {
+    const mockFieldOnce = (value?: any, error?: any, touched?: any): void => {
       const fieldProps: any = { value, onChange, onBlur }
       const fieldMeta: any = { error, touched }
       const fieldHelpers: any = { setValue, setTouched }
       useField.mockReturnValueOnce([fieldProps, fieldMeta, fieldHelpers])
     }
 
-    const MockField = (props: ConnectFormFieldProps) => <></>
+    const MockField = (props: ConnectFormFieldProps): JSX.Element => <></>
 
-    const TestUseConnectFormField = () => {
+    const TestUseConnectFormField = (): JSX.Element => {
       const fieldProps = useConnectFormField(fieldName)
       return <MockField {...fieldProps}></MockField>
     }
 
-    const render = () => mount(<TestUseConnectFormField />)
+    const render = (): ReturnType<typeof mount> =>
+      mount(<TestUseConnectFormField />)
 
     it('passes field name to useField', () => {
       mockFieldOnce()
diff --git a/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/form-fields.ts b/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/form-fields.ts
index 36e018b626f..317d7c07c58 100644
--- a/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/form-fields.ts
+++ b/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/form-fields.ts
@@ -1,4 +1,3 @@
-// @flow
 import get from 'lodash/get'
 
 import * as Constants from '../constants'
@@ -37,7 +36,7 @@ const FIELD_PSK: ConnectFormTextField = {
 }
 
 const makeSecurityField = (
-  eapOptions: Array<EapOption>,
+  eapOptions: EapOption[],
   showAllOptions: boolean
 ): ConnectFormSecurityField => ({
   type: Constants.FIELD_TYPE_SECURITY,
@@ -48,7 +47,9 @@ const makeSecurityField = (
   showAllOptions,
 })
 
-const getEapIsSelected = (formSecurityType): boolean %checks => {
+const getEapIsSelected = (
+  formSecurityType: string | null | undefined
+): boolean => {
   return (
     formSecurityType != null &&
     formSecurityType !== Constants.SECURITY_NONE &&
@@ -57,26 +58,26 @@ const getEapIsSelected = (formSecurityType): boolean %checks => {
 }
 
 const getEapFields = (
-  eapOptions,
-  values,
-  errors,
-  touched
-): Array<WifiAuthField> => {
+  eapOptions: EapOption[],
+  values: ConnectFormValues,
+  errors?: ConnectFormErrors,
+  touched?: boolean
+): WifiAuthField[] => {
   const eapType = values.securityType
   return eapOptions
     .filter(opt => opt.name === eapType)
     .flatMap(opt => opt.options)
 }
 
-const getEapFieldName = baseName => `eapConfig.${baseName}`
+const getEapFieldName = (baseName: string): string => `eapConfig.${baseName}`
 
 export function getConnectFormFields(
   network: WifiNetwork | null,
   robotName: string,
-  eapOptions: Array<EapOption>,
-  wifiKeys: Array<WifiKey>,
+  eapOptions: EapOption[],
+  wifiKeys: WifiKey[],
   values: ConnectFormValues
-): Array<ConnectFormField> {
+): ConnectFormField[] {
   const { securityType: formSecurityType } = values
   const fields = []
 
@@ -138,7 +139,7 @@ export function getConnectFormFields(
 
 export function validateConnectFormFields(
   network: WifiNetwork | null,
-  eapOptions: Array<EapOption>,
+  eapOptions: EapOption[],
   values: ConnectFormValues
 ): ConnectFormErrors {
   const {
@@ -146,7 +147,7 @@ export function validateConnectFormFields(
     securityType: formSecurityType,
     psk: formPsk,
   } = values
-  const errors: $Shape<ConnectFormErrors> = {}
+  const errors: Partial<ConnectFormErrors> = {}
 
   if (network === null && !formSsid) {
     errors.ssid = Copy.FIELD_IS_REQUIRED(Copy.LABEL_SSID)
@@ -178,9 +179,14 @@ export function validateConnectFormFields(
       .filter(
         ({ name, required }) => required && !get(values, getEapFieldName(name))
       )
-      .forEach(({ name, displayName }) => {
-        errors[getEapFieldName(name)] = Copy.FIELD_IS_REQUIRED(displayName)
-      })
+      .forEach(
+        ({ name, displayName }: Pick<EapOption, 'name' | 'displayName'>) => {
+          errors[
+            getEapFieldName(name) as keyof typeof errors
+            // @ts-expect-error TODO: displayName could be undefined
+          ] = Copy.FIELD_IS_REQUIRED(displayName)
+        }
+      )
   }
 
   return errors
@@ -203,6 +209,7 @@ export const connectFormToConfigureRequest = (
 
   if (getEapIsSelected(formSecurityType)) {
     securityType = Constants.SECURITY_WPA_EAP
+    // @ts-expect-error TODO: formSecurityType could be undefined, but eapType expects string
     eapConfig = { eapType: formSecurityType }
   } else if (network) {
     securityType = network.securityType
@@ -210,8 +217,7 @@ export const connectFormToConfigureRequest = (
     values.securityType === Constants.SECURITY_NONE ||
     values.securityType === Constants.SECURITY_WPA_PSK
   ) {
-    // NOTE(mc, 2020-03-13): Flow v0.119 unable to refine via consts
-    securityType = ((values.securityType: any): WifiSecurityType)
+    securityType = values.securityType as WifiSecurityType
   }
 
   if (ssid !== null && securityType !== null) {
diff --git a/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/form-state.ts b/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/form-state.ts
index 0724b51c0e4..d3dff499a9b 100644
--- a/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/form-state.ts
+++ b/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/form-state.ts
@@ -1,11 +1,10 @@
-// @flow
 import { useEffect } from 'react'
 import { useFormikContext, useField } from 'formik'
 import { usePrevious } from '@opentrons/components'
 
 import type { ConnectFormValues, ConnectFormFieldProps } from '../types'
 
-export const useResetFormOnSecurityChange = () => {
+export const useResetFormOnSecurityChange = (): void => {
   const {
     values,
     errors,
@@ -40,7 +39,9 @@ export const useResetFormOnSecurityChange = () => {
 }
 
 export const useConnectFormField = (name: string): ConnectFormFieldProps => {
-  const [fieldProps, fieldMeta, fieldHelpers] = useField<string | void>(name)
+  const [fieldProps, fieldMeta, fieldHelpers] = useField<string | undefined>(
+    name
+  )
   const { value, onChange, onBlur } = fieldProps
   const { setValue, setTouched } = fieldHelpers
   const error = fieldMeta.touched ? fieldMeta.error : null
diff --git a/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/index.tsx b/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/index.tsx
index c18b5e670b1..fa9f5f78a1e 100644
--- a/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/index.tsx
+++ b/app/src/pages/Robots/RobotSettings/SelectNetwork/ConnectModal/index.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { Formik, useFormikContext } from 'formik'
 
@@ -19,30 +18,32 @@ import type {
   EapOption,
 } from '../types'
 
-export type ConnectModalProps = {|
-  robotName: string,
-  network: WifiNetwork | null,
-  wifiKeys: Array<WifiKey>,
-  eapOptions: Array<EapOption>,
-  onConnect: WifiConfigureRequest => mixed,
-  onCancel: () => mixed,
-|}
+export interface ConnectModalProps {
+  robotName: string
+  network: WifiNetwork | null
+  wifiKeys: WifiKey[]
+  eapOptions: EapOption[]
+  onConnect: (r: WifiConfigureRequest) => unknown
+  onCancel: () => unknown
+}
 
-export const ConnectModal = (props: ConnectModalProps): React.Node => {
+export const ConnectModal = (props: ConnectModalProps): JSX.Element => {
   const { network, eapOptions, onConnect } = props
 
-  const handleSubmit = (values: ConnectFormValues) => {
+  const handleSubmit = (values: ConnectFormValues): void => {
     const request = connectFormToConfigureRequest(network, values)
     if (request) onConnect(request)
   }
 
-  const handleValidate = (values: ConnectFormValues) => {
+  const handleValidate = (
+    values: ConnectFormValues
+  ): ReturnType<typeof validateConnectFormFields> => {
     return validateConnectFormFields(network, eapOptions, values)
   }
 
   return (
     <Formik
-      initialValues={({}: ConnectFormValues)}
+      initialValues={{}}
       onSubmit={handleSubmit}
       validate={handleValidate}
       validateOnMount
@@ -52,7 +53,9 @@ export const ConnectModal = (props: ConnectModalProps): React.Node => {
   )
 }
 
-export const ConnectModalComponent = (props: ConnectModalProps): React.Node => {
+export const ConnectModalComponent = (
+  props: ConnectModalProps
+): JSX.Element => {
   const { robotName, network, wifiKeys, eapOptions, onCancel } = props
   const { values, isValid } = useFormikContext<ConnectFormValues>()
 
diff --git a/app/src/pages/Robots/RobotSettings/SelectNetwork/DisconnectModal.tsx b/app/src/pages/Robots/RobotSettings/SelectNetwork/DisconnectModal.tsx
index 0b18265b1a0..76d3ec6bf54 100644
--- a/app/src/pages/Robots/RobotSettings/SelectNetwork/DisconnectModal.tsx
+++ b/app/src/pages/Robots/RobotSettings/SelectNetwork/DisconnectModal.tsx
@@ -1,20 +1,19 @@
-// @flow
 import * as React from 'react'
 
 import { AlertModal } from '@opentrons/components'
 import * as Copy from './i18n'
 
-export type DisconnectModalProps = {|
-  ssid: string,
-  onDisconnect: () => mixed,
-  onCancel: () => mixed,
-|}
+export interface DisconnectModalProps {
+  ssid: string
+  onDisconnect: () => unknown
+  onCancel: () => unknown
+}
 
 export const DisconnectModal = ({
   ssid,
   onDisconnect,
   onCancel,
-}: DisconnectModalProps): React.Node => (
+}: DisconnectModalProps): JSX.Element => (
   <AlertModal
     alertOverlay
     iconName="wifi"
diff --git a/app/src/pages/Robots/RobotSettings/SelectNetwork/ResultModal.tsx b/app/src/pages/Robots/RobotSettings/SelectNetwork/ResultModal.tsx
index b63ce91f8bc..82b35f2b04a 100644
--- a/app/src/pages/Robots/RobotSettings/SelectNetwork/ResultModal.tsx
+++ b/app/src/pages/Robots/RobotSettings/SelectNetwork/ResultModal.tsx
@@ -1,5 +1,3 @@
-// @flow
-
 import * as React from 'react'
 
 import { AlertModal, SpinnerModal } from '@opentrons/components'
@@ -9,15 +7,15 @@ import * as Copy from './i18n'
 
 import type { NetworkChangeType } from './types'
 
-export type ResultModalProps = {|
-  type: NetworkChangeType,
-  ssid: string | null,
-  isPending: boolean,
-  error: { message?: string, ... } | null,
-  onClose: () => mixed,
-|}
+export interface ResultModalProps {
+  type: NetworkChangeType
+  ssid: string | null
+  isPending: boolean
+  error: { message?: string; [key: string]: unknown } | null
+  onClose: () => unknown
+}
 
-export const ResultModal = (props: ResultModalProps): React.Node => {
+export const ResultModal = (props: ResultModalProps): JSX.Element => {
   const { type, ssid, isPending, error, onClose } = props
   const isDisconnect = type === DISCONNECT
 
diff --git a/app/src/pages/Robots/RobotSettings/SelectNetwork/SelectSsid/NetworkOptionLabel.tsx b/app/src/pages/Robots/RobotSettings/SelectNetwork/SelectSsid/NetworkOptionLabel.tsx
index 6a941ad39a3..627ebb33045 100644
--- a/app/src/pages/Robots/RobotSettings/SelectNetwork/SelectSsid/NetworkOptionLabel.tsx
+++ b/app/src/pages/Robots/RobotSettings/SelectNetwork/SelectSsid/NetworkOptionLabel.tsx
@@ -1,61 +1,57 @@
-// @flow
 import * as React from 'react'
 import styled from 'styled-components'
 import { Icon, FONT_BODY_1_DARK } from '@opentrons/components'
 import { SECURITY_NONE } from '../../../../../redux/networking'
 
 import type { StyledComponent } from 'styled-components'
-import type { IconName, IconProps } from '@opentrons/components'
+import type { IconName } from '@opentrons/components'
 import type { WifiNetwork } from '../../../../../redux/networking/types'
 
-const SIGNAL_LEVEL_LOW = 25
-const SIGNAL_LEVEL_MED = 50
-const SIGNAL_LEVEL_HIGH = 75
+const SIGNAL_LEVEL_LOW: number = 25
+const SIGNAL_LEVEL_MED: number = 50
+const SIGNAL_LEVEL_HIGH: number = 75
 
-const StyledWrapper: StyledComponent<{||}, {||}, HTMLDivElement> = styled.div`
+const StyledWrapper: StyledComponent<'div', any> = styled.div`
   ${FONT_BODY_1_DARK}
   width: 100%;
   display: flex;
 `
 
-const StyledIcon: StyledComponent<IconProps, {||}, typeof Icon> = styled(Icon)`
+const StyledIcon: StyledComponent<typeof Icon, any> = styled(Icon)`
   flex: none;
   height: 1rem;
   width: 1rem;
   padding-left: 0.125rem;
 `
 
-const StyledConnectedIcon: StyledComponent<
-  IconProps,
-  {||},
-  typeof StyledIcon
-> = styled(StyledIcon)`
+const StyledConnectedIcon: StyledComponent<typeof StyledIcon, any> = styled(
+  StyledIcon
+)`
   margin-left: -0.5rem;
   padding-left: 0;
 `
 
 const StyledName: StyledComponent<
-  {| padLeft?: boolean |},
-  {||},
-  HTMLSpanElement
+  'span',
+  any,
+  { padLeft: boolean }
 > = styled.span`
   flex-basis: 100%;
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
-  ${({ padLeft }) => `
+  ${({ padLeft }: { padLeft: boolean }) => `
     padding-left: ${padLeft ? '0.75rem' : '0.25rem'};
   `}
 `
 
-export type NetworkOptionLabelProps = {|
-  ...WifiNetwork,
-  showConnectedIcon: boolean,
-|}
+export interface NetworkOptionLabelProps extends WifiNetwork {
+  showConnectedIcon: boolean
+}
 
 export const NetworkOptionLabel = (
   props: NetworkOptionLabelProps
-): React.Node => {
+): JSX.Element => {
   const { ssid, active, securityType, showConnectedIcon } = props
   const hasConnectedIcon = active && showConnectedIcon
   const hasSecureIcon = securityType !== SECURITY_NONE
@@ -72,11 +68,11 @@ export const NetworkOptionLabel = (
 
 export const NetworkActionLabel = ({
   label,
-}: {|
-  label: string,
-|}): React.Node => <StyledName padLeft={true}>{label}</StyledName>
+}: {
+  label: string
+}): JSX.Element => <StyledName padLeft={true}>{label}</StyledName>
 
-const renderSignalIcon = signal => {
+const renderSignalIcon = (signal: number): JSX.Element => {
   let iconName: IconName
 
   if (signal <= SIGNAL_LEVEL_LOW) {
diff --git a/app/src/pages/Robots/RobotSettings/SelectNetwork/SelectSsid/__tests__/NetworkOptionLabel.test.tsx b/app/src/pages/Robots/RobotSettings/SelectNetwork/SelectSsid/__tests__/NetworkOptionLabel.test.tsx
index e1f98e20686..caa0a656774 100644
--- a/app/src/pages/Robots/RobotSettings/SelectNetwork/SelectSsid/__tests__/NetworkOptionLabel.test.tsx
+++ b/app/src/pages/Robots/RobotSettings/SelectNetwork/SelectSsid/__tests__/NetworkOptionLabel.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { mount } from 'enzyme'
 
@@ -6,8 +5,10 @@ import * as Fixtures from '../../../../../../redux/networking/__fixtures__'
 import { SECURITY_NONE } from '../../constants'
 import { NetworkOptionLabel } from '../NetworkOptionLabel'
 
+import type { NetworkOptionLabelProps } from '../NetworkOptionLabel'
+
 describe('NetworkOptionLabel presentational component', () => {
-  let props
+  let props: NetworkOptionLabelProps
   const render = () => mount(<NetworkOptionLabel {...props} />)
 
   beforeEach(() => {
diff --git a/app/src/pages/Robots/RobotSettings/SelectNetwork/SelectSsid/__tests__/SelectSsid.test.tsx b/app/src/pages/Robots/RobotSettings/SelectNetwork/SelectSsid/__tests__/SelectSsid.test.tsx
index e87b16cdb0c..82e5152adef 100644
--- a/app/src/pages/Robots/RobotSettings/SelectNetwork/SelectSsid/__tests__/SelectSsid.test.tsx
+++ b/app/src/pages/Robots/RobotSettings/SelectNetwork/SelectSsid/__tests__/SelectSsid.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { mount } from 'enzyme'
 import { SelectField, CONTEXT_VALUE, CONTEXT_MENU } from '@opentrons/components'
@@ -98,7 +97,7 @@ describe('SelectSsid component', () => {
     const wrapper = render()
     const selectField = wrapper.find(SelectField)
 
-    selectField.invoke('onValueChange')('_', 'foo')
+    selectField.invoke('onValueChange')?.('_', 'foo')
 
     expect(handleConnect).toHaveBeenCalledWith('foo')
   })
@@ -106,13 +105,13 @@ describe('SelectSsid component', () => {
   it('if user selects join other value, onJoinOther is called', () => {
     const wrapper = render()
     const selectField = wrapper.find(SelectField)
-    const options = selectField.prop('options').flatMap(o => o.options)
+    const options = selectField.prop('options').flatMap((o: any) => o.options)
     const joinOtherValue = options.find(
       o => o.label === LABEL_JOIN_OTHER_NETWORK
     )?.value
 
     expect(joinOtherValue).toEqual(expect.any(String))
-    selectField.invoke('onValueChange')('_', joinOtherValue)
+    selectField.invoke('onValueChange')?.('_', joinOtherValue)
 
     expect(handleJoinOther).toHaveBeenCalled()
   })
@@ -120,13 +119,13 @@ describe('SelectSsid component', () => {
   it('if user selects disconnect value, onDisconnect is called', () => {
     const wrapper = render()
     const selectField = wrapper.find(SelectField)
-    const options = selectField.prop('options').flatMap(o => o.options)
+    const options = selectField.prop('options').flatMap((o: any) => o.options)
     const disconectValue = options.find(
       o => o.label === DISCONNECT_FROM_SSID('foo')
     )?.value
 
     expect(disconectValue).toEqual(expect.any(String))
-    selectField.invoke('onValueChange')('_', disconectValue)
+    selectField.invoke('onValueChange')?.('_', disconectValue)
 
     expect(handleDisconnect).toHaveBeenCalled()
   })
@@ -141,14 +140,12 @@ describe('SelectSsid component', () => {
     const expectedBar = mount(
       <NetworkOptionLabel {...mockWifiList[1]} showConnectedIcon={true} />
     )
-    const fooLabel = selectField.prop('formatOptionLabel')(
-      { value: 'foo' },
-      { context: CONTEXT_VALUE }
-    )
-    const barLabel = selectField.prop('formatOptionLabel')(
-      { value: 'bar' },
-      { context: CONTEXT_MENU }
-    )
+    const fooLabel = selectField.prop('formatOptionLabel')?.({ value: 'foo' }, {
+      context: CONTEXT_VALUE,
+    } as any) as any
+    const barLabel = selectField.prop('formatOptionLabel')?.({ value: 'bar' }, {
+      context: CONTEXT_MENU,
+    } as any) as any
 
     expect(mount(fooLabel)).toEqual(expectedFoo)
     expect(mount(barLabel)).toEqual(expectedBar)
@@ -157,15 +154,15 @@ describe('SelectSsid component', () => {
   it('formats the join other label', () => {
     const wrapper = render()
     const selectField = wrapper.find(SelectField)
-    const options = selectField.prop('options').flatMap(o => o.options)
+    const options = selectField.prop('options').flatMap((o: any) => o.options)
     const joinOtherOpt = options.find(o => o.label === LABEL_JOIN_OTHER_NETWORK)
 
     expect(joinOtherOpt?.value).toEqual(expect.any(String))
     expect(joinOtherOpt?.label).toEqual(expect.any(String))
 
-    const label = selectField.prop('formatOptionLabel')(joinOtherOpt, {
+    const label = selectField.prop('formatOptionLabel')?.(joinOtherOpt, {
       context: CONTEXT_MENU,
-    })
+    } as any) as any
 
     expect(mount(label).html()).toContain(joinOtherOpt?.label)
   })
@@ -173,7 +170,7 @@ describe('SelectSsid component', () => {
   it('formats the disconnect label', () => {
     const wrapper = render()
     const selectField = wrapper.find(SelectField)
-    const options = selectField.prop('options').flatMap(o => o.options)
+    const options = selectField.prop('options').flatMap((o: any) => o.options)
     const disconectOpt = options.find(
       o => o.label === DISCONNECT_FROM_SSID('foo')
     )
@@ -181,9 +178,9 @@ describe('SelectSsid component', () => {
     expect(disconectOpt?.value).toEqual(expect.any(String))
     expect(disconectOpt?.label).toEqual(expect.any(String))
 
-    const label = selectField.prop('formatOptionLabel')(disconectOpt, {
+    const label = selectField.prop('formatOptionLabel')?.(disconectOpt, {
       context: CONTEXT_MENU,
-    })
+    } as any) as any
 
     expect(mount(label).html()).toContain(disconectOpt?.label)
   })
diff --git a/app/src/pages/Robots/RobotSettings/SelectNetwork/SelectSsid/index.tsx b/app/src/pages/Robots/RobotSettings/SelectNetwork/SelectSsid/index.tsx
index 441c3acb7ea..3940797e997 100644
--- a/app/src/pages/Robots/RobotSettings/SelectNetwork/SelectSsid/index.tsx
+++ b/app/src/pages/Robots/RobotSettings/SelectNetwork/SelectSsid/index.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import styled from 'styled-components'
 
@@ -13,14 +12,14 @@ import type {
 
 import type { WifiNetwork } from '../types'
 
-export type SelectSsidProps = {|
-  list: Array<WifiNetwork>,
-  value: string | null,
-  showWifiDisconnect: boolean,
-  onConnect: (ssid: string) => mixed,
-  onJoinOther: () => mixed,
-  onDisconnect: () => mixed,
-|}
+export interface SelectSsidProps {
+  list: WifiNetwork[]
+  value: string | null
+  showWifiDisconnect: boolean
+  onConnect: (ssid: string) => unknown
+  onJoinOther: () => unknown
+  onDisconnect: () => unknown
+}
 
 const FIELD_NAME = '__SelectSsid__'
 
@@ -32,7 +31,9 @@ const SELECT_JOIN_OTHER_GROUP = {
   options: [{ value: JOIN_OTHER_VALUE, label: Copy.LABEL_JOIN_OTHER_NETWORK }],
 }
 
-const makeSelectDisconnectGroup = ssid => ({
+const makeSelectDisconnectGroup = (
+  ssid: string
+): { options: Array<{ value: string; label: string }> } => ({
   options: [
     { value: DISCONNECT_WIFI_VALUE, label: Copy.DISCONNECT_FROM_SSID(ssid) },
   ],
@@ -45,9 +46,9 @@ const StyledSelectField: React.ComponentType<SelectFieldProps> = styled(
 `
 
 const formatOptions = (
-  list: Array<WifiNetwork>,
+  list: WifiNetwork[],
   showWifiDisconnect: boolean
-): Array<SelectOptionOrGroup> => {
+): SelectOptionOrGroup[] => {
   const ssidOptionsList = { options: list.map(({ ssid }) => ({ value: ssid })) }
   const options = [ssidOptionsList, SELECT_JOIN_OTHER_GROUP]
 
@@ -59,7 +60,7 @@ const formatOptions = (
   return options
 }
 
-export function SelectSsid(props: SelectSsidProps): React.Node {
+export function SelectSsid(props: SelectSsidProps): JSX.Element {
   const {
     list,
     value,
@@ -69,7 +70,7 @@ export function SelectSsid(props: SelectSsidProps): React.Node {
     showWifiDisconnect,
   } = props
 
-  const handleValueChange = (_, value) => {
+  const handleValueChange = (_: string, value: string): void => {
     if (value === JOIN_OTHER_VALUE) {
       onJoinOther()
     } else if (value === DISCONNECT_WIFI_VALUE) {
@@ -79,7 +80,9 @@ export function SelectSsid(props: SelectSsidProps): React.Node {
     }
   }
 
-  const formatOptionLabel = (option, { context }) => {
+  const formatOptionLabel: React.ComponentProps<
+    typeof StyledSelectField
+  >['formatOptionLabel'] = (option, { context }): JSX.Element | null => {
     const { value, label } = option
 
     if (label != null) return <NetworkActionLabel label={label} />
diff --git a/app/src/pages/Robots/RobotSettings/SelectNetwork/__tests__/DisconnectModal.test.tsx b/app/src/pages/Robots/RobotSettings/SelectNetwork/__tests__/DisconnectModal.test.tsx
index bbb13083dee..a3da232146f 100644
--- a/app/src/pages/Robots/RobotSettings/SelectNetwork/__tests__/DisconnectModal.test.tsx
+++ b/app/src/pages/Robots/RobotSettings/SelectNetwork/__tests__/DisconnectModal.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { shallow } from 'enzyme'
 
diff --git a/app/src/pages/Robots/RobotSettings/SelectNetwork/__tests__/ResultModal.test.tsx b/app/src/pages/Robots/RobotSettings/SelectNetwork/__tests__/ResultModal.test.tsx
index 4f8e241f154..3cf51d805b4 100644
--- a/app/src/pages/Robots/RobotSettings/SelectNetwork/__tests__/ResultModal.test.tsx
+++ b/app/src/pages/Robots/RobotSettings/SelectNetwork/__tests__/ResultModal.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { shallow } from 'enzyme'
 
@@ -7,6 +6,9 @@ import { ErrorModal } from '../../../../../molecules/modals'
 import { ResultModal } from '../ResultModal'
 import { DISCONNECT, CONNECT, JOIN_OTHER } from '../constants'
 
+import type { ShallowWrapper } from 'enzyme'
+import type { ResultModalProps } from '../ResultModal'
+
 describe("SelectNetwork's ResultModal", () => {
   const mockSsid = 'foobar'
   const handleClose = jest.fn()
@@ -16,7 +18,13 @@ describe("SelectNetwork's ResultModal", () => {
   })
 
   describe('pending', () => {
-    const render = (type, ssid = mockSsid) => {
+    const render: (
+      type: ResultModalProps['type'],
+      ssid?: ResultModalProps['ssid']
+    ) => ShallowWrapper<React.ComponentProps<typeof ResultModal>> = (
+      type,
+      ssid = mockSsid
+    ) => {
       return shallow(
         <ResultModal
           {...{
@@ -78,7 +86,13 @@ describe("SelectNetwork's ResultModal", () => {
   })
 
   describe('success', () => {
-    const render = (type, ssid = mockSsid) => {
+    const render: (
+      type: ResultModalProps['type'],
+      ssid?: ResultModalProps['ssid']
+    ) => ShallowWrapper<React.ComponentProps<typeof ResultModal>> = (
+      type,
+      ssid = mockSsid
+    ) => {
       return shallow(
         <ResultModal
           {...{
@@ -161,7 +175,13 @@ describe("SelectNetwork's ResultModal", () => {
 
   describe('failure', () => {
     const error = { message: 'oh no!' }
-    const render = (type, ssid = mockSsid) => {
+    const render: (
+      type: ResultModalProps['type'],
+      ssid?: ResultModalProps['ssid']
+    ) => ShallowWrapper<React.ComponentProps<typeof ResultModal>> = (
+      type,
+      ssid = mockSsid
+    ) => {
       return shallow(
         <ResultModal
           {...{
diff --git a/app/src/pages/Robots/RobotSettings/SelectNetwork/__tests__/SelectNetwork.test.tsx b/app/src/pages/Robots/RobotSettings/SelectNetwork/__tests__/SelectNetwork.test.tsx
index ff3d0f38512..6854d7c7962 100644
--- a/app/src/pages/Robots/RobotSettings/SelectNetwork/__tests__/SelectNetwork.test.tsx
+++ b/app/src/pages/Robots/RobotSettings/SelectNetwork/__tests__/SelectNetwork.test.tsx
@@ -1,5 +1,3 @@
-// @flow
-
 import * as React from 'react'
 import { Provider } from 'react-redux'
 
@@ -18,7 +16,8 @@ import { DisconnectModal } from '../DisconnectModal'
 import { ResultModal } from '../ResultModal'
 import { SelectNetwork } from '..'
 
-import type { State } from '../../../../../redux/types'
+import type { ReactWrapper } from 'enzyme'
+import { RequestState } from '../../../../../redux/robot-api/types'
 
 jest.mock('../../../../../redux/networking/selectors')
 jest.mock('../../../../../redux/robot-api/selectors')
@@ -49,35 +48,31 @@ const mockWifiKeys = [
 
 const mockEapOptions = [Fixtures.mockEapOption]
 
-const mockGetWifiList: JestMockFn<
-  [State, string],
-  $Call<typeof Networking.getWifiList, State, string>
-> = Networking.getWifiList
+const mockGetWifiList = Networking.getWifiList as jest.MockedFunction<
+  typeof Networking.getWifiList
+>
 
-const mockGetWifiKeys: JestMockFn<
-  [State, string],
-  $Call<typeof Networking.getWifiKeys, State, string>
-> = Networking.getWifiKeys
+const mockGetWifiKeys = Networking.getWifiKeys as jest.MockedFunction<
+  typeof Networking.getWifiKeys
+>
 
-const mockGetEapOptions: JestMockFn<
-  [State, string],
-  $Call<typeof Networking.getEapOptions, State, string>
-> = Networking.getEapOptions
+const mockGetEapOptions = Networking.getEapOptions as jest.MockedFunction<
+  typeof Networking.getEapOptions
+>
 
-const mockGetCanDisconnect: JestMockFn<
-  [State, string],
-  $Call<typeof Networking.getCanDisconnect, State, string>
-> = Networking.getCanDisconnect
+const mockGetCanDisconnect = Networking.getCanDisconnect as jest.MockedFunction<
+  typeof Networking.getCanDisconnect
+>
 
-const mockGetRequestById: JestMockFn<
-  [State, string],
-  $Call<typeof RobotApi.getRequestById, State, string>
-> = RobotApi.getRequestById
+const mockGetRequestById = RobotApi.getRequestById as jest.MockedFunction<
+  typeof RobotApi.getRequestById
+>
 
 describe('<SelectNetwork />', () => {
-  let dispatch
-  let mockStore
-  let render
+  let dispatch: any
+  let mockStore: any
+
+  let render: () => ReactWrapper<React.ComponentProps<typeof SelectNetwork>>
 
   beforeEach(() => {
     dispatch = jest.fn()
@@ -159,15 +154,17 @@ describe('<SelectNetwork />', () => {
   })
 
   describe('disconnecting from the active network', () => {
-    let wrapper
-    let disconnectModal
+    let wrapper: ReactWrapper<React.ComponentProps<typeof SelectNetwork>>
+    let disconnectModal: ReactWrapper<
+      React.ComponentProps<typeof DisconnectModal>
+    >
 
     beforeEach(() => {
       wrapper = render()
       const selectSsid = wrapper.find(SelectSsid)
 
       act(() => {
-        selectSsid.invoke('onDisconnect')()
+        selectSsid.invoke('onDisconnect')?.()
       })
       wrapper.update()
 
@@ -181,7 +178,7 @@ describe('<SelectNetwork />', () => {
 
     it('passes onCancel prop that closes the modal', () => {
       act(() => {
-        disconnectModal.invoke('onCancel')()
+        disconnectModal.invoke('onCancel')?.()
       })
       wrapper.update()
 
@@ -189,13 +186,15 @@ describe('<SelectNetwork />', () => {
     })
 
     describe('dispatching the request', () => {
-      let requestId
+      let requestId: string | null
 
-      const disconnectAndSetMockRequestState = (requestState = null) => {
+      const disconnectAndSetMockRequestState = (
+        requestState: RequestState | null = null
+      ) => {
         act(() => {
-          disconnectModal.invoke('onDisconnect')()
+          disconnectModal.invoke('onDisconnect')?.()
           const actionCall = dispatch.mock.calls.find(
-            call => call[0].type === Networking.POST_WIFI_DISCONNECT
+            (call: any) => call[0].type === Networking.POST_WIFI_DISCONNECT
           )
           requestId = actionCall?.[0].meta.requestId
 
@@ -239,7 +238,7 @@ describe('<SelectNetwork />', () => {
       it('closes spinner and shows success when disconnect succeeds', () => {
         disconnectAndSetMockRequestState({
           status: RobotApi.SUCCESS,
-          response: ({}: any),
+          response: {} as any,
         })
 
         expect(wrapper.find(DisconnectModal)).toHaveLength(0)
@@ -254,20 +253,20 @@ describe('<SelectNetwork />', () => {
         })
 
         act(() => {
-          resultModal.invoke('onClose')()
+          resultModal.invoke('onClose')?.()
         })
         wrapper.update()
 
         expect(wrapper.find(ResultModal)).toHaveLength(0)
         expect(dispatch).toHaveBeenCalledWith(
-          RobotApi.dismissRequest(((requestId: any): string))
+          RobotApi.dismissRequest(requestId as any)
         )
       })
 
       it('closes spinner and shows failure if disconnect fails', () => {
         disconnectAndSetMockRequestState({
           status: RobotApi.FAILURE,
-          response: ({}: any),
+          response: {} as any,
           error: { message: 'oh no!' },
         })
 
@@ -283,21 +282,21 @@ describe('<SelectNetwork />', () => {
         })
 
         act(() => {
-          resultModal.invoke('onClose')()
+          resultModal.invoke('onClose')?.()
         })
         wrapper.update()
 
         expect(wrapper.find(ResultModal)).toHaveLength(0)
         expect(dispatch).toHaveBeenCalledWith(
-          RobotApi.dismissRequest(((requestId: any): string))
+          RobotApi.dismissRequest(requestId as any)
         )
       })
     })
   })
 
   describe('joining a network', () => {
-    let wrapper
-    let connectModal
+    let wrapper: ReactWrapper<React.ComponentProps<typeof SelectNetwork>>
+    let connectModal: ReactWrapper<React.ComponentProps<typeof ConnectModal>>
 
     beforeEach(() => {
       wrapper = render()
@@ -305,7 +304,7 @@ describe('<SelectNetwork />', () => {
       dispatch.mockReset()
 
       act(() => {
-        selectSsid.invoke('onConnect')(mockWifiList[1].ssid)
+        selectSsid.invoke('onConnect')?.(mockWifiList[1].ssid)
       })
       wrapper.update()
 
@@ -337,7 +336,7 @@ describe('<SelectNetwork />', () => {
       const selectSsid = wrapper.find(SelectSsid)
 
       act(() => {
-        selectSsid.invoke('onJoinOther')()
+        selectSsid.invoke('onJoinOther')?.()
       })
       wrapper.update()
       connectModal = wrapper.find(Portal).find(ConnectModal)
@@ -359,7 +358,7 @@ describe('<SelectNetwork />', () => {
       dispatch.mockReset()
 
       act(() => {
-        selectSsid.invoke('onJoinOther')()
+        selectSsid.invoke('onJoinOther')?.()
       })
 
       const expectedFetchEap = Networking.fetchEapOptions(mockRobotName)
@@ -371,7 +370,7 @@ describe('<SelectNetwork />', () => {
 
     it('passes onCancel prop that closes the modal', () => {
       act(() => {
-        connectModal.invoke('onCancel')()
+        connectModal.invoke('onCancel')?.()
       })
       wrapper.update()
 
@@ -380,13 +379,15 @@ describe('<SelectNetwork />', () => {
 
     describe('dispatching the request', () => {
       const mockConfigure = { ssid: mockWifiList[1].ssid, psk: 'password' }
-      let requestId
+      let requestId: string | null
 
-      const connectAndSetMockRequestState = (requestState = null) => {
+      const connectAndSetMockRequestState = (
+        requestState: RequestState | null = null
+      ) => {
         act(() => {
-          connectModal.invoke('onConnect')(mockConfigure)
+          connectModal.invoke('onConnect')?.(mockConfigure)
           const actionCall = dispatch.mock.calls.find(
-            call => call[0].type === Networking.POST_WIFI_CONFIGURE
+            (call: any) => call[0].type === Networking.POST_WIFI_CONFIGURE
           )
           requestId = actionCall?.[0].meta.requestId
 
@@ -427,7 +428,7 @@ describe('<SelectNetwork />', () => {
       it('closes spinner and shows success if connect succeeds', () => {
         connectAndSetMockRequestState({
           status: RobotApi.SUCCESS,
-          response: ({}: any),
+          response: {} as any,
         })
 
         expect(wrapper.find(ConnectModal)).toHaveLength(0)
@@ -442,20 +443,20 @@ describe('<SelectNetwork />', () => {
         })
 
         act(() => {
-          resultModal.invoke('onClose')()
+          resultModal.invoke('onClose')?.()
         })
         wrapper.update()
 
         expect(wrapper.find(ResultModal)).toHaveLength(0)
         expect(dispatch).toHaveBeenCalledWith(
-          RobotApi.dismissRequest(((requestId: any): string))
+          RobotApi.dismissRequest(requestId as any)
         )
       })
 
       it('closes spinner and shows failure if connect fails', () => {
         connectAndSetMockRequestState({
           status: RobotApi.FAILURE,
-          response: ({}: any),
+          response: {} as any,
           error: { message: 'oh no!' },
         })
 
@@ -471,13 +472,13 @@ describe('<SelectNetwork />', () => {
         })
 
         act(() => {
-          resultModal.invoke('onClose')()
+          resultModal.invoke('onClose')?.()
         })
         wrapper.update()
 
         expect(wrapper.find(ResultModal)).toHaveLength(0)
         expect(dispatch).toHaveBeenCalledWith(
-          RobotApi.dismissRequest(((requestId: any): string))
+          RobotApi.dismissRequest(requestId as any)
         )
       })
 
@@ -492,7 +493,7 @@ describe('<SelectNetwork />', () => {
         }
 
         act(() => {
-          selectSsid.invoke('onConnect')(mockWifiList[2].ssid)
+          selectSsid.invoke('onConnect')?.(mockWifiList[2].ssid)
         })
         wrapper.update()
 
diff --git a/app/src/pages/Robots/RobotSettings/SelectNetwork/constants.ts b/app/src/pages/Robots/RobotSettings/SelectNetwork/constants.ts
index 232e283e835..f41c785edbc 100644
--- a/app/src/pages/Robots/RobotSettings/SelectNetwork/constants.ts
+++ b/app/src/pages/Robots/RobotSettings/SelectNetwork/constants.ts
@@ -1,5 +1,3 @@
-// @flow
-
 export {
   AUTH_TYPE_STRING,
   AUTH_TYPE_PASSWORD,
diff --git a/app/src/pages/Robots/RobotSettings/SelectNetwork/i18n.ts b/app/src/pages/Robots/RobotSettings/SelectNetwork/i18n.ts
index 32ce9caff12..14fa87eed0c 100644
--- a/app/src/pages/Robots/RobotSettings/SelectNetwork/i18n.ts
+++ b/app/src/pages/Robots/RobotSettings/SelectNetwork/i18n.ts
@@ -1,4 +1,3 @@
-// @flow
 // TODO(mc, 2020-03-11): i18n
 
 import {
@@ -81,7 +80,7 @@ export const FIELD_NOT_LONG_ENOUGH = (
   minLength: number
 ): string => `${name} must be at least ${minLength} characters`
 
-const renderMaybeSsid = (ssid: string | null) =>
+const renderMaybeSsid = (ssid: string | null): string =>
   ssid !== null ? ` network ${ssid}` : ''
 
 export const CONNECTING_TO_NETWORK = (ssid: string | null): string =>
diff --git a/app/src/pages/Robots/RobotSettings/SelectNetwork/index.tsx b/app/src/pages/Robots/RobotSettings/SelectNetwork/index.tsx
index 6226c5d6a81..9979402c55a 100644
--- a/app/src/pages/Robots/RobotSettings/SelectNetwork/index.tsx
+++ b/app/src/pages/Robots/RobotSettings/SelectNetwork/index.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { useDispatch, useSelector } from 'react-redux'
 import last from 'lodash/last'
@@ -18,13 +17,15 @@ import { CONNECT, DISCONNECT, JOIN_OTHER } from './constants'
 import type { State, Dispatch } from '../../../../redux/types'
 import type { WifiConfigureRequest, NetworkChangeState } from './types'
 
-type SelectNetworkProps = {| robotName: string |}
+interface SelectNetworkProps {
+  robotName: string
+}
 
 const LIST_REFRESH_MS = 10000
 
 export const SelectNetwork = ({
   robotName,
-}: SelectNetworkProps): React.Node => {
+}: SelectNetworkProps): JSX.Element => {
   const list = useSelector((state: State) =>
     Networking.getWifiList(state, robotName)
   )
@@ -47,18 +48,23 @@ export const SelectNetwork = ({
   const [dispatchApi, requestIds] = RobotApi.useDispatchApiRequest()
 
   const requestState = useSelector((state: State) =>
+    // @ts-expect-error TODO use commented code below to protect against retrieving a request when the id doesn't exist
     RobotApi.getRequestById(state, last(requestIds))
   )
+  // const requestState = useSelector((state: State) => {
+  //   const lastId = last(requestIds)
+  //   return lastId != null ? RobotApi.getRequestById(state, lastId) : null
+  // })
 
   const activeNetwork = list.find(nw => nw.active)
 
-  const handleDisconnect = () => {
+  const handleDisconnect = (): void => {
     if (activeNetwork) {
       dispatchApi(Networking.postWifiDisconnect(robotName, activeNetwork.ssid))
     }
   }
 
-  const handleConnect = (options: WifiConfigureRequest) => {
+  const handleConnect = (options: WifiConfigureRequest): void => {
     dispatchApi(Networking.postWifiConfigure(robotName, options))
     if (changeState.type === JOIN_OTHER) {
       setChangeState({ ...changeState, ssid: options.ssid })
@@ -80,7 +86,7 @@ export const SelectNetwork = ({
     }
   }, [robotName, dispatch, changeState.type])
 
-  const handleSelectConnect = ssid => {
+  const handleSelectConnect = (ssid: string): void => {
     const network = list.find(nw => nw.ssid === ssid)
 
     if (network) {
@@ -94,17 +100,21 @@ export const SelectNetwork = ({
     }
   }
 
-  const handleSelectDisconnect = () => {
+  const handleSelectDisconnect = (): void => {
     const ssid = activeNetwork?.ssid
     ssid != null && setChangeState({ type: DISCONNECT, ssid })
   }
 
-  const handleSelectJoinOther = () => {
+  const handleSelectJoinOther = (): void => {
     setChangeState({ type: JOIN_OTHER, ssid: null })
   }
 
-  const handleDone = () => {
+  const handleDone = (): void => {
+    // @ts-expect-error TODO use commented code below
     if (last(requestIds)) dispatch(RobotApi.dismissRequest(last(requestIds)))
+    // const lastId = last(requestIds)
+    // if (lastId != null) dispatch(RobotApi.dismissRequest(lastId))
+
     setChangeState({ type: null })
   }
 
@@ -126,9 +136,17 @@ export const SelectNetwork = ({
               ssid={changeState.ssid}
               isPending={requestState.status === RobotApi.PENDING}
               error={
+                // @ts-expect-error TODO use commented code below
                 requestState.error && requestState.error.message
-                  ? requestState.error
+                  ? // @ts-expect-error TODO use commented code below
+                    requestState.error
                   : null
+                // 'error' in requestState &&
+                // requestState.error &&
+                // 'message' in requestState.error &&
+                // requestState.error.message
+                //   ? requestState.error
+                //   : null
               }
               onClose={handleDone}
             />
diff --git a/app/src/pages/Robots/RobotSettings/SelectNetwork/types.ts b/app/src/pages/Robots/RobotSettings/SelectNetwork/types.ts
index 4802e150c06..588bfffe54e 100644
--- a/app/src/pages/Robots/RobotSettings/SelectNetwork/types.ts
+++ b/app/src/pages/Robots/RobotSettings/SelectNetwork/types.ts
@@ -1,4 +1,3 @@
-// @flow
 import type { FormikErrors } from 'formik'
 
 import type {
@@ -7,7 +6,7 @@ import type {
   WifiKey,
 } from '../../../../redux/networking/types'
 
-import typeof {
+import {
   CONNECT,
   DISCONNECT,
   JOIN_OTHER,
@@ -26,64 +25,64 @@ export type {
   EapOption,
 } from '../../../../redux/networking/types'
 
-export type NetworkChangeType = CONNECT | DISCONNECT | JOIN_OTHER
+export type NetworkChangeType =
+  | typeof CONNECT
+  | typeof DISCONNECT
+  | typeof JOIN_OTHER
 
 export type NetworkChangeState =
-  | {| type: CONNECT, ssid: string, network: WifiNetwork |}
-  | {| type: DISCONNECT, ssid: string |}
-  | {| type: JOIN_OTHER, ssid: string | null |}
-  | {| type: null |}
+  | { type: typeof CONNECT; ssid: string; network: WifiNetwork }
+  | { type: typeof DISCONNECT; ssid: string }
+  | { type: typeof JOIN_OTHER; ssid: string | null }
+  | { type: null }
 
-export type ConnectFormValues = $Shape<{|
-  ssid?: string,
-  psk?: string,
+export type ConnectFormValues = Partial<{
+  ssid?: string
+  psk?: string
   // securityType form value may be securityType or eapConfig.eapType
-  securityType?: string,
-  eapConfig?: {|
-    [eapOption: string]: string,
-  |},
-|}>
+  securityType?: string
+  eapConfig?: {
+    [eapOption: string]: string
+  }
+}>
 
-export type ConnectFormErrors = $Shape<FormikErrors<ConnectFormValues>>
+export type ConnectFormErrors = Partial<FormikErrors<ConnectFormValues>>
 
-type ConnectFormFieldCommon = {|
-  name: string,
-  label: string,
-|}
+interface ConnectFormFieldCommon {
+  name: string
+  label: string
+}
 
-export type ConnectFormTextField = {|
-  ...ConnectFormFieldCommon,
-  type: FIELD_TYPE_TEXT,
-  isPassword: boolean,
-|}
+export interface ConnectFormTextField extends ConnectFormFieldCommon {
+  type: typeof FIELD_TYPE_TEXT
+  isPassword: boolean
+}
 
-export type ConnectFormKeyField = {|
-  ...ConnectFormFieldCommon,
-  type: FIELD_TYPE_KEY_FILE,
-  robotName: string,
-  wifiKeys: Array<WifiKey>,
-  placeholder: string,
-|}
+export interface ConnectFormKeyField extends ConnectFormFieldCommon {
+  type: typeof FIELD_TYPE_KEY_FILE
+  robotName: string
+  wifiKeys: WifiKey[]
+  placeholder: string
+}
 
 // UI only auth field; server will never return this field type
-export type ConnectFormSecurityField = {|
-  ...ConnectFormFieldCommon,
-  type: FIELD_TYPE_SECURITY,
-  eapOptions: Array<EapOption>,
-  showAllOptions: boolean,
-  placeholder: string,
-|}
+export interface ConnectFormSecurityField extends ConnectFormFieldCommon {
+  type: typeof FIELD_TYPE_SECURITY
+  eapOptions: EapOption[]
+  showAllOptions: boolean
+  placeholder: string
+}
 
 export type ConnectFormField =
   | ConnectFormTextField
   | ConnectFormKeyField
   | ConnectFormSecurityField
 
-export type ConnectFormFieldProps = $ReadOnly<{|
-  value: string | null,
-  error: string | null,
-  onChange: (event: SyntheticInputEvent<HTMLInputElement>) => mixed,
-  onBlur: (event: SyntheticFocusEvent<HTMLInputElement>) => mixed,
-  setValue: (value: string) => mixed,
-  setTouched: (touched: boolean) => mixed,
-|}>
+export type ConnectFormFieldProps = Readonly<{
+  value: string | null
+  error: string | null
+  onChange: React.ChangeEventHandler
+  onBlur: React.FocusEventHandler
+  setValue: (value: string) => unknown
+  setTouched: (touched: boolean) => unknown
+}>
diff --git a/app/src/pages/Robots/RobotSettings/StatusCard.tsx b/app/src/pages/Robots/RobotSettings/StatusCard.tsx
index 9affd8e394f..8f7823e6bc7 100644
--- a/app/src/pages/Robots/RobotSettings/StatusCard.tsx
+++ b/app/src/pages/Robots/RobotSettings/StatusCard.tsx
@@ -1,4 +1,3 @@
-// @flow
 // RobotSettings card for robot status
 import * as React from 'react'
 import { useSelector, useDispatch } from 'react-redux'
@@ -24,9 +23,11 @@ import { LabeledValue } from '../../../atoms/structure'
 import type { Dispatch } from '../../../redux/types'
 import type { ViewableRobot } from '../../../redux/discovery/types'
 
-type Props = {| robot: ViewableRobot |}
+interface Props {
+  robot: ViewableRobot
+}
 
-export function StatusCard(props: Props): React.Node {
+export function StatusCard(props: Props): JSX.Element {
   const { robot } = props
   const dispatch = useDispatch<Dispatch>()
   const { t } = useTranslation('robot_connection')
@@ -46,7 +47,7 @@ export function StatusCard(props: Props): React.Node {
     status = sessionStatus
   }
 
-  const handleClick = () => {
+  const handleClick: React.MouseEventHandler = () => {
     if (connected) {
       dispatch(robotActions.disconnect())
     } else {
diff --git a/app/src/pages/Robots/RobotSettings/UpdateBuildroot/DownloadUpdateModal.tsx b/app/src/pages/Robots/RobotSettings/UpdateBuildroot/DownloadUpdateModal.tsx
index 0aebdbf9056..9abba63dd93 100644
--- a/app/src/pages/Robots/RobotSettings/UpdateBuildroot/DownloadUpdateModal.tsx
+++ b/app/src/pages/Robots/RobotSettings/UpdateBuildroot/DownloadUpdateModal.tsx
@@ -1,4 +1,3 @@
-// @flow
 // Placeholder modal for missing/downloading/errored update files
 
 import * as React from 'react'
@@ -7,15 +6,15 @@ import { ProgressBar } from './progress'
 import styles from './styles.css'
 import type { ButtonProps } from '@opentrons/components'
 
-export type DownloadUpdateModalProps = {|
-  notNowButton: ButtonProps,
-  error: string | null,
-  progress: number | null,
-|}
+export interface DownloadUpdateModalProps {
+  notNowButton: ButtonProps
+  error: string | null
+  progress: number | null
+}
 
 export function DownloadUpdateModal(
   props: DownloadUpdateModalProps
-): React.Node {
+): JSX.Element {
   const { notNowButton, error, progress } = props
   const heading = error !== null ? 'Download Error' : 'Downloading Update'
 
diff --git a/app/src/pages/Robots/RobotSettings/UpdateBuildroot/InstallModal.tsx b/app/src/pages/Robots/RobotSettings/UpdateBuildroot/InstallModal.tsx
index 9b079a2da66..61c7d19e597 100644
--- a/app/src/pages/Robots/RobotSettings/UpdateBuildroot/InstallModal.tsx
+++ b/app/src/pages/Robots/RobotSettings/UpdateBuildroot/InstallModal.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 
 import { AlertModal } from '@opentrons/components'
@@ -10,14 +9,14 @@ import type {
   RobotSystemType,
 } from '../../../../redux/buildroot/types'
 
-export type InstallModalProps = {|
-  robot: ViewableRobot,
-  robotSystemType: RobotSystemType | null,
-  session: BuildrootUpdateSession,
-  close: () => mixed,
-|}
+export interface InstallModalProps {
+  robot: ViewableRobot
+  robotSystemType: RobotSystemType | null
+  session: BuildrootUpdateSession
+  close: () => unknown
+}
 
-export function InstallModal(props: InstallModalProps): React.Node {
+export function InstallModal(props: InstallModalProps): JSX.Element {
   const { session, close, robotSystemType } = props
   const buttons = []
 
@@ -26,6 +25,7 @@ export function InstallModal(props: InstallModalProps): React.Node {
   }
 
   let heading: string
+  // let heading: string = ''
   if (robotSystemType === 'balena') {
     if (
       session.step === 'premigration' ||
@@ -41,6 +41,7 @@ export function InstallModal(props: InstallModalProps): React.Node {
 
   return (
     <AlertModal
+      // @ts-expect-error use commented code above
       heading={heading}
       buttons={buttons}
       restrictOuterScroll={false}
diff --git a/app/src/pages/Robots/RobotSettings/UpdateBuildroot/InstallModalContents.tsx b/app/src/pages/Robots/RobotSettings/UpdateBuildroot/InstallModalContents.tsx
index 24c9225ea95..7e132b40991 100644
--- a/app/src/pages/Robots/RobotSettings/UpdateBuildroot/InstallModalContents.tsx
+++ b/app/src/pages/Robots/RobotSettings/UpdateBuildroot/InstallModalContents.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 
 import { usePrevious } from '@opentrons/components'
@@ -10,14 +9,14 @@ import type {
   RobotSystemType,
 } from '../../../../redux/buildroot/types'
 
-export type InstallModalContentsProps = {|
-  robotSystemType: RobotSystemType | null,
-  session: BuildrootUpdateSession,
-|}
+export interface InstallModalContentsProps {
+  robotSystemType: RobotSystemType | null
+  session: BuildrootUpdateSession
+}
 
 export function InstallModalContents(
   props: InstallModalContentsProps
-): React.Node {
+): JSX.Element {
   const { robotSystemType, session } = props
   const { step: updateStep, progress, error } = session
   const prevStep = usePrevious(updateStep)
diff --git a/app/src/pages/Robots/RobotSettings/UpdateBuildroot/MigrationWarningModal.tsx b/app/src/pages/Robots/RobotSettings/UpdateBuildroot/MigrationWarningModal.tsx
index 09f39e759bf..90f2ae236cf 100644
--- a/app/src/pages/Robots/RobotSettings/UpdateBuildroot/MigrationWarningModal.tsx
+++ b/app/src/pages/Robots/RobotSettings/UpdateBuildroot/MigrationWarningModal.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 
 import { AlertModal } from '@opentrons/components'
@@ -8,20 +7,22 @@ import styles from './styles.css'
 import type { ButtonProps } from '@opentrons/components'
 import type { BuildrootUpdateType } from '../../../../redux/buildroot/types'
 
-export type MigrationWarningModalProps = {|
-  notNowButton: ButtonProps,
-  updateType: BuildrootUpdateType | null,
-  proceed: () => mixed,
-|}
+export interface MigrationWarningModalProps {
+  notNowButton: ButtonProps
+  updateType: BuildrootUpdateType | null
+  proceed: () => unknown
+}
+
+type MaybeButtonProps = ButtonProps | null | undefined
 
 const HEADING = 'Robot Operating System Update Available'
 
 export function MigrationWarningModal(
   props: MigrationWarningModalProps
-): React.Node {
+): JSX.Element {
   const { notNowButton, updateType, proceed } = props
 
-  const buttons: Array<?ButtonProps> = [
+  const buttons: MaybeButtonProps[] = [
     notNowButton,
     {
       children: updateType === UPGRADE ? 'view robot update' : 'update robot',
diff --git a/app/src/pages/Robots/RobotSettings/UpdateBuildroot/ReleaseNotesModal.tsx b/app/src/pages/Robots/RobotSettings/UpdateBuildroot/ReleaseNotesModal.tsx
index 804293e26d0..1623c8d88da 100644
--- a/app/src/pages/Robots/RobotSettings/UpdateBuildroot/ReleaseNotesModal.tsx
+++ b/app/src/pages/Robots/RobotSettings/UpdateBuildroot/ReleaseNotesModal.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { useDispatch } from 'react-redux'
 
@@ -11,15 +10,15 @@ import type { ButtonProps } from '@opentrons/components'
 import type { Dispatch } from '../../../../redux/types'
 import type { RobotSystemType } from '../../../../redux/buildroot/types'
 
-export type ReleaseNotesModalProps = {|
-  robotName: string,
-  notNowButton: ButtonProps,
-  releaseNotes: string,
-  systemType: RobotSystemType | null,
-  proceed: () => mixed,
-|}
+export interface ReleaseNotesModalProps {
+  robotName: string
+  notNowButton: ButtonProps
+  releaseNotes: string
+  systemType: RobotSystemType | null
+  proceed: () => unknown
+}
 
-export function ReleaseNotesModal(props: ReleaseNotesModalProps): React.Node {
+export function ReleaseNotesModal(props: ReleaseNotesModalProps): JSX.Element {
   const { robotName, notNowButton, releaseNotes, systemType, proceed } = props
   const dispatch = useDispatch<Dispatch>()
 
diff --git a/app/src/pages/Robots/RobotSettings/UpdateBuildroot/SkipAppUpdateMessage.tsx b/app/src/pages/Robots/RobotSettings/UpdateBuildroot/SkipAppUpdateMessage.tsx
index cdb79580bb4..4611e5c462f 100644
--- a/app/src/pages/Robots/RobotSettings/UpdateBuildroot/SkipAppUpdateMessage.tsx
+++ b/app/src/pages/Robots/RobotSettings/UpdateBuildroot/SkipAppUpdateMessage.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 
 import {
@@ -9,9 +8,9 @@ import {
   Text,
 } from '@opentrons/components'
 
-type SkipAppUpdateMessageProps = {|
-  onClick: () => mixed,
-|}
+interface SkipAppUpdateMessageProps {
+  onClick: React.MouseEventHandler
+}
 
 const SKIP_APP_MESSAGE =
   'If you wish to skip this app update and only sync your robot server with your current app version, please '
@@ -19,7 +18,7 @@ const CLICK_HERE = 'click here'
 
 export function SkipAppUpdateMessage(
   props: SkipAppUpdateMessageProps
-): React.Node {
+): JSX.Element {
   return (
     <Text paddingLeft={SPACING_3}>
       {SKIP_APP_MESSAGE}
diff --git a/app/src/pages/Robots/RobotSettings/UpdateBuildroot/SyncRobotMessage.tsx b/app/src/pages/Robots/RobotSettings/UpdateBuildroot/SyncRobotMessage.tsx
index 90a9e72e73b..66f49b634d7 100644
--- a/app/src/pages/Robots/RobotSettings/UpdateBuildroot/SyncRobotMessage.tsx
+++ b/app/src/pages/Robots/RobotSettings/UpdateBuildroot/SyncRobotMessage.tsx
@@ -1,15 +1,16 @@
-// @flow
 import * as React from 'react'
 import styles from './styles.css'
 import { UPGRADE, DOWNGRADE, REINSTALL } from '../../../../redux/buildroot'
 import type { BuildrootUpdateType } from '../../../../redux/buildroot/types'
 
-export type SyncRobotMessageProps = {|
-  updateType: BuildrootUpdateType,
-  version: string,
-|}
+export interface SyncRobotMessageProps {
+  updateType: BuildrootUpdateType
+  version: string
+}
 
-export function SyncRobotMessage(props: SyncRobotMessageProps): React.Node {
+export function SyncRobotMessage(
+  props: SyncRobotMessageProps
+): JSX.Element | null {
   const { updateType, version } = props
 
   if (updateType === REINSTALL) return null
diff --git a/app/src/pages/Robots/RobotSettings/UpdateBuildroot/UpdateAppMessage.tsx b/app/src/pages/Robots/RobotSettings/UpdateBuildroot/UpdateAppMessage.tsx
index 5fda9830b5b..fc89d3addd7 100644
--- a/app/src/pages/Robots/RobotSettings/UpdateBuildroot/UpdateAppMessage.tsx
+++ b/app/src/pages/Robots/RobotSettings/UpdateBuildroot/UpdateAppMessage.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import semver from 'semver'
 import styles from './styles.css'
@@ -20,7 +19,7 @@ const UPDATE_APP = (
   </>
 )
 
-export function UpdateAppMessage(props: VersionProps): React.Node {
+export function UpdateAppMessage(props: VersionProps): JSX.Element {
   const { appVersion, availableUpdate } = props
   const versionsMatch: boolean =
     semver.valid(appVersion) && semver.valid(availableUpdate)
diff --git a/app/src/pages/Robots/RobotSettings/UpdateBuildroot/VersionInfoModal.tsx b/app/src/pages/Robots/RobotSettings/UpdateBuildroot/VersionInfoModal.tsx
index 2024613ad41..067464d4000 100644
--- a/app/src/pages/Robots/RobotSettings/UpdateBuildroot/VersionInfoModal.tsx
+++ b/app/src/pages/Robots/RobotSettings/UpdateBuildroot/VersionInfoModal.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { useSelector } from 'react-redux'
 
@@ -17,21 +16,22 @@ import { SkipAppUpdateMessage } from './SkipAppUpdateMessage'
 import { SyncRobotMessage } from './SyncRobotMessage'
 import styles from './styles.css'
 
+import type { ButtonProps } from '@opentrons/components'
 import type { BuildrootUpdateType } from '../../../../redux/buildroot/types'
 import type { ViewableRobot } from '../../../../redux/discovery/types'
 
-export type VersionInfoModalProps = {|
-  robot: ViewableRobot,
-  robotUpdateType: BuildrootUpdateType | null,
-  close: () => mixed,
-  proceed: () => mixed,
-|}
+export interface VersionInfoModalProps {
+  robot: ViewableRobot
+  robotUpdateType: BuildrootUpdateType | null
+  close: () => unknown
+  proceed: () => unknown
+}
 
 const REINSTALL_HEADING = 'Robot is up to date'
 const REINSTALL_MESSAGE =
   "It looks like your robot is already up to date, but if you're experiencing issues you can re-apply the latest update."
 
-export function VersionInfoModal(props: VersionInfoModalProps): React.Node {
+export function VersionInfoModal(props: VersionInfoModalProps): JSX.Element {
   const { robot, robotUpdateType, close, proceed } = props
   const [showUpdateAppModal, setShowUpdateAppModal] = React.useState(false)
   const availableAppUpdateVersion = useSelector(getAvailableShellUpdate)
@@ -51,7 +51,7 @@ export function VersionInfoModal(props: VersionInfoModalProps): React.Node {
   }
 
   let heading = ''
-  let primaryButton = { className: styles.view_update_button }
+  let primaryButton: ButtonProps = { className: styles.view_update_button }
   let message = null
   let secondaryMessage = null
 
diff --git a/app/src/pages/Robots/RobotSettings/UpdateBuildroot/VersionList.tsx b/app/src/pages/Robots/RobotSettings/UpdateBuildroot/VersionList.tsx
index b14770d317d..b3aaafa8ff2 100644
--- a/app/src/pages/Robots/RobotSettings/UpdateBuildroot/VersionList.tsx
+++ b/app/src/pages/Robots/RobotSettings/UpdateBuildroot/VersionList.tsx
@@ -1,9 +1,8 @@
-// @flow
 import * as React from 'react'
 import styles from './styles.css'
-import type { VersionProps } from './types.js'
+import type { VersionProps } from './types'
 
-export function VersionList(props: VersionProps): React.Node {
+export function VersionList(props: VersionProps): JSX.Element {
   return (
     <ol className={styles.version_list}>
       <li>Your current app version: {props.appVersion}</li>
diff --git a/app/src/pages/Robots/RobotSettings/UpdateBuildroot/ViewUpdateModal.tsx b/app/src/pages/Robots/RobotSettings/UpdateBuildroot/ViewUpdateModal.tsx
index 17038c3d6e9..d332903efa6 100644
--- a/app/src/pages/Robots/RobotSettings/UpdateBuildroot/ViewUpdateModal.tsx
+++ b/app/src/pages/Robots/RobotSettings/UpdateBuildroot/ViewUpdateModal.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { useSelector } from 'react-redux'
 
@@ -19,15 +18,17 @@ import type {
   RobotSystemType,
 } from '../../../../redux/buildroot/types'
 
-export type ViewUpdateModalProps = {|
-  robotName: string,
-  robotUpdateType: BuildrootUpdateType | null,
-  robotSystemType: RobotSystemType | null,
-  close: () => mixed,
-  proceed: () => mixed,
-|}
+export interface ViewUpdateModalProps {
+  robotName: string
+  robotUpdateType: BuildrootUpdateType | null
+  robotSystemType: RobotSystemType | null
+  close: () => unknown
+  proceed: () => unknown
+}
 
-export function ViewUpdateModal(props: ViewUpdateModalProps): React.Node {
+export function ViewUpdateModal(
+  props: ViewUpdateModalProps
+): JSX.Element | null {
   const { robotName, robotUpdateType, robotSystemType, close, proceed } = props
   const updateInfo = useSelector(getBuildrootUpdateInfo)
   const downloadProgress = useSelector(getBuildrootDownloadProgress)
diff --git a/app/src/pages/Robots/RobotSettings/UpdateBuildroot/__tests__/DownloadUpdateModal.test.tsx b/app/src/pages/Robots/RobotSettings/UpdateBuildroot/__tests__/DownloadUpdateModal.test.tsx
index 358297af1f7..6160b462bc9 100644
--- a/app/src/pages/Robots/RobotSettings/UpdateBuildroot/__tests__/DownloadUpdateModal.test.tsx
+++ b/app/src/pages/Robots/RobotSettings/UpdateBuildroot/__tests__/DownloadUpdateModal.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { mount } from 'enzyme'
 
@@ -9,7 +8,7 @@ import { DownloadUpdateModal } from '../DownloadUpdateModal'
 describe('DownloadUpdateModal', () => {
   const handleClose = jest.fn()
 
-  const render = (error = null) => {
+  const render = (error: string | null = null) => {
     return mount(
       <DownloadUpdateModal
         notNowButton={{ onClick: handleClose, children: 'not now' }}
@@ -36,7 +35,7 @@ describe('DownloadUpdateModal', () => {
 
     expect(button.text()).toMatch(/not now/)
     expect(handleClose).not.toHaveBeenCalled()
-    button.invoke('onClick')()
+    button.invoke('onClick')?.({} as React.MouseEvent)
     expect(handleClose).toHaveBeenCalled()
   })
 
diff --git a/app/src/pages/Robots/RobotSettings/UpdateBuildroot/__tests__/UpdateBuildroot.test.tsx b/app/src/pages/Robots/RobotSettings/UpdateBuildroot/__tests__/UpdateBuildroot.test.tsx
index 785ef50cda1..387f33424d1 100644
--- a/app/src/pages/Robots/RobotSettings/UpdateBuildroot/__tests__/UpdateBuildroot.test.tsx
+++ b/app/src/pages/Robots/RobotSettings/UpdateBuildroot/__tests__/UpdateBuildroot.test.tsx
@@ -1,7 +1,9 @@
-// @flow
 import * as React from 'react'
 
-import { mountWithStore } from '@opentrons/components/__utils__'
+import {
+  mountWithStore,
+  WrapperWithStore,
+} from '@opentrons/components/__utils__'
 import { mockConnectableRobot as mockRobot } from '../../../../../redux/discovery/__fixtures__'
 import * as Buildroot from '../../../../../redux/buildroot'
 import { UpdateBuildroot } from '..'
@@ -10,7 +12,6 @@ import { ViewUpdateModal } from '../ViewUpdateModal'
 import { InstallModal } from '../InstallModal'
 
 import type { State } from '../../../../../redux/types'
-import type { ViewableRobot } from '../../../../../redux/discovery/types'
 
 // shallow render connected children
 jest.mock('../VersionInfoModal', () => ({
@@ -23,27 +24,24 @@ jest.mock('../ViewUpdateModal', () => ({
 
 jest.mock('../../../../../redux/buildroot/selectors')
 
-const getBuildrootUpdateAvailable: JestMockFn<
-  [State, ViewableRobot],
-  $Call<typeof Buildroot.getBuildrootUpdateAvailable, State, ViewableRobot>
-> = Buildroot.getBuildrootUpdateAvailable
+const getBuildrootUpdateAvailable = Buildroot.getBuildrootUpdateAvailable as jest.MockedFunction<
+  typeof Buildroot.getBuildrootUpdateAvailable
+>
+const getBuildrootSession = Buildroot.getBuildrootSession as jest.MockedFunction<
+  typeof Buildroot.getBuildrootSession
+>
+const getRobotSystemType = Buildroot.getRobotSystemType as jest.MockedFunction<
+  typeof Buildroot.getRobotSystemType
+>
 
-const getBuildrootSession: JestMockFn<
-  [State],
-  $Call<typeof Buildroot.getBuildrootSession, State>
-> = Buildroot.getBuildrootSession
-
-const getRobotSystemType: JestMockFn<
-  [ViewableRobot],
-  $Call<typeof Buildroot.getRobotSystemType, ViewableRobot>
-> = Buildroot.getRobotSystemType
-
-const MOCK_STATE: State = ({ mockState: true }: any)
+const MOCK_STATE: State = { mockState: true } as any
 
 describe('UpdateBuildroot wizard', () => {
   const closeModal = jest.fn()
-  const render = () => {
-    return mountWithStore(
+  const render = (): WrapperWithStore<
+    React.ComponentProps<typeof UpdateBuildroot>
+  > => {
+    return mountWithStore<React.ComponentProps<typeof UpdateBuildroot>>(
       <UpdateBuildroot robot={mockRobot} close={closeModal} />,
       { initialState: MOCK_STATE }
     )
@@ -79,7 +77,7 @@ describe('UpdateBuildroot wizard', () => {
     )
     expect(closeModal).not.toHaveBeenCalled()
 
-    versionInfo.invoke('close')()
+    versionInfo.invoke('close')?.()
     expect(closeModal).toHaveBeenCalled()
   })
 
@@ -88,7 +86,7 @@ describe('UpdateBuildroot wizard', () => {
     const versionInfo = wrapper.find(VersionInfoModal)
 
     expect(wrapper.exists(ViewUpdateModal)).toBe(false)
-    versionInfo.invoke('proceed')()
+    versionInfo.invoke('proceed')?.()
 
     const viewUpdate = wrapper.find(ViewUpdateModal)
     expect(viewUpdate.prop('robotName')).toBe(mockRobot.name)
@@ -96,14 +94,14 @@ describe('UpdateBuildroot wizard', () => {
     expect(viewUpdate.prop('robotSystemType')).toBe(Buildroot.BUILDROOT)
     expect(getRobotSystemType).toHaveBeenCalledWith(mockRobot)
 
-    viewUpdate.invoke('close')()
+    viewUpdate.invoke('close')?.()
     expect(closeModal).toHaveBeenCalled()
   })
 
   it('should proceed from the ViewUpdateModal to an install', () => {
     const { wrapper, store } = render()
-    wrapper.find(VersionInfoModal).invoke('proceed')()
-    wrapper.find(ViewUpdateModal).invoke('proceed')()
+    wrapper.find(VersionInfoModal).invoke('proceed')?.()
+    wrapper.find(ViewUpdateModal).invoke('proceed')?.()
 
     expect(store.dispatch).toHaveBeenCalledWith(
       Buildroot.startBuildrootUpdate(mockRobot.name)
@@ -132,7 +130,7 @@ describe('UpdateBuildroot wizard', () => {
     expect(installModal.prop('session')).toBe(mockSession)
 
     expect(closeModal).not.toHaveBeenCalled()
-    installModal.invoke('close')()
+    installModal.invoke('close')?.()
     expect(closeModal).toHaveBeenCalled()
   })
 
diff --git a/app/src/pages/Robots/RobotSettings/UpdateBuildroot/__tests__/VersionInfoModal.test.tsx b/app/src/pages/Robots/RobotSettings/UpdateBuildroot/__tests__/VersionInfoModal.test.tsx
index 4c287a9ceb9..242242f6ee9 100644
--- a/app/src/pages/Robots/RobotSettings/UpdateBuildroot/__tests__/VersionInfoModal.test.tsx
+++ b/app/src/pages/Robots/RobotSettings/UpdateBuildroot/__tests__/VersionInfoModal.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 
 import { mountWithStore } from '@opentrons/components/__utils__'
@@ -13,24 +12,33 @@ import { SyncRobotMessage } from '../SyncRobotMessage'
 import { SkipAppUpdateMessage } from '../SkipAppUpdateMessage'
 import { VersionInfoModal } from '../VersionInfoModal'
 
-import type { State } from '../../../../../redux/types'
+import type { State, Action } from '../../../../../redux/types'
 
 jest.mock('../../../../../redux/shell/update')
 jest.mock('../../../../../organisms/UpdateAppModal', () => ({
   UpdateAppModal: () => null,
 }))
 
-const MOCK_STATE: $Shape<State> = {}
+const MOCK_STATE: State = {} as any
 
-const getAvailableShellUpdate: JestMockFn<[State], string | null> =
-  Shell.getAvailableShellUpdate
+const getAvailableShellUpdate = Shell.getAvailableShellUpdate as jest.MockedFunction<
+  typeof Shell.getAvailableShellUpdate
+>
 
 describe('VersionInfoModal', () => {
   const handleClose = jest.fn()
   const handleProceed = jest.fn()
 
-  const render = (robotUpdateType = UPGRADE) => {
-    return mountWithStore(
+  const render = (
+    robotUpdateType: React.ComponentProps<
+      typeof VersionInfoModal
+    >['robotUpdateType'] = UPGRADE
+  ) => {
+    return mountWithStore<
+      React.ComponentProps<typeof VersionInfoModal>,
+      State,
+      Action
+    >(
       <VersionInfoModal
         robot={mockReachableRobot}
         robotUpdateType={robotUpdateType}
@@ -75,10 +83,10 @@ describe('VersionInfoModal', () => {
     expect(primaryButton.text()).toMatch(/view robot update/i)
 
     expect(handleClose).not.toHaveBeenCalled()
-    closeButton.invoke('onClick')()
+    closeButton.invoke('onClick')?.({} as React.MouseEvent)
     expect(handleClose).toHaveBeenCalled()
     expect(handleProceed).not.toHaveBeenCalled()
-    primaryButton.invoke('onClick')()
+    primaryButton.invoke('onClick')?.({} as React.MouseEvent)
     expect(handleProceed).toHaveBeenCalled()
   })
 
@@ -105,10 +113,10 @@ describe('VersionInfoModal', () => {
     expect(primaryButton.text()).toMatch(/downgrade/i)
 
     expect(handleClose).not.toHaveBeenCalled()
-    closeButton.invoke('onClick')()
+    closeButton.invoke('onClick')?.({} as React.MouseEvent)
     expect(handleClose).toHaveBeenCalled()
     expect(handleProceed).not.toHaveBeenCalled()
-    primaryButton.invoke('onClick')()
+    primaryButton.invoke('onClick')?.({} as React.MouseEvent)
     expect(handleProceed).toHaveBeenCalled()
   })
 
@@ -132,10 +140,10 @@ describe('VersionInfoModal', () => {
     expect(primaryButton.text()).toMatch(/reinstall/i)
 
     expect(handleClose).not.toHaveBeenCalled()
-    closeButton.invoke('onClick')()
+    closeButton.invoke('onClick')?.({} as React.MouseEvent)
     expect(handleClose).toHaveBeenCalled()
     expect(handleProceed).not.toHaveBeenCalled()
-    primaryButton.invoke('onClick')()
+    primaryButton.invoke('onClick')?.({} as React.MouseEvent)
     expect(handleProceed).toHaveBeenCalled()
   })
 
@@ -166,7 +174,7 @@ describe('VersionInfoModal', () => {
 
       expect(wrapper.exists(UpdateAppModal)).toBe(false)
 
-      viewUpdateButton.invoke('onClick')()
+      viewUpdateButton.invoke('onClick')?.({} as React.MouseEvent)
 
       expect(wrapper.find(Portal).exists(UpdateAppModal)).toBe(true)
     })
@@ -176,7 +184,7 @@ describe('VersionInfoModal', () => {
       const skipAppUpdate = wrapper.find(SkipAppUpdateMessage)
 
       expect(handleProceed).not.toHaveBeenCalled()
-      skipAppUpdate.invoke('onClick')()
+      skipAppUpdate.invoke('onClick')?.({} as React.MouseEvent)
       expect(handleProceed).toHaveBeenCalled()
     })
 
@@ -187,11 +195,11 @@ describe('VersionInfoModal', () => {
         .find('button')
         .filterWhere(b => /view app update/i.test(b.text()))
 
-      viewUpdateButton.invoke('onClick')()
+      viewUpdateButton.invoke('onClick')?.({} as React.MouseEvent)
 
       expect(handleClose).not.toHaveBeenCalled()
 
-      wrapper.find(UpdateAppModal).invoke('closeModal')()
+      wrapper.find(UpdateAppModal).invoke('closeModal')?.()
 
       expect(handleClose).toHaveBeenCalled()
     })
diff --git a/app/src/pages/Robots/RobotSettings/UpdateBuildroot/__tests__/ViewUpdateModal.test.tsx b/app/src/pages/Robots/RobotSettings/UpdateBuildroot/__tests__/ViewUpdateModal.test.tsx
index 3a98de13dc6..2d2143af4bb 100644
--- a/app/src/pages/Robots/RobotSettings/UpdateBuildroot/__tests__/ViewUpdateModal.test.tsx
+++ b/app/src/pages/Robots/RobotSettings/UpdateBuildroot/__tests__/ViewUpdateModal.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 
 import { mountWithStore } from '@opentrons/components/__utils__'
@@ -13,22 +12,17 @@ import type { State } from '../../../../../redux/types'
 
 jest.mock('../../../../../redux/buildroot')
 
-const getBuildrootUpdateInfo: JestMockFn<
-  [State],
-  $Call<typeof Buildroot.getBuildrootUpdateInfo, State>
-> = Buildroot.getBuildrootUpdateInfo
-
-const getBuildrootDownloadProgress: JestMockFn<
-  [State],
-  $Call<typeof Buildroot.getBuildrootDownloadProgress, State>
-> = Buildroot.getBuildrootDownloadProgress
-
-const getBuildrootDownloadError: JestMockFn<
-  [State],
-  $Call<typeof Buildroot.getBuildrootDownloadError, State>
-> = Buildroot.getBuildrootDownloadError
-
-const MOCK_STATE: State = ({ mockState: true }: any)
+const getBuildrootUpdateInfo = Buildroot.getBuildrootUpdateInfo as jest.MockedFunction<
+  typeof Buildroot.getBuildrootUpdateInfo
+>
+const getBuildrootDownloadProgress = Buildroot.getBuildrootDownloadProgress as jest.MockedFunction<
+  typeof Buildroot.getBuildrootDownloadProgress
+>
+const getBuildrootDownloadError = Buildroot.getBuildrootDownloadError as jest.MockedFunction<
+  typeof Buildroot.getBuildrootDownloadError
+>
+
+const MOCK_STATE: State = { mockState: true } as any
 const MOCK_ROBOT_NAME = 'robot-name'
 
 describe('ViewUpdateModal', () => {
@@ -36,10 +30,14 @@ describe('ViewUpdateModal', () => {
   const handleProceed = jest.fn()
 
   const render = (
-    robotUpdateType = Buildroot.UPGRADE,
-    robotSystemType = Buildroot.BUILDROOT
+    robotUpdateType: React.ComponentProps<
+      typeof ViewUpdateModal
+    >['robotUpdateType'] = Buildroot.UPGRADE,
+    robotSystemType: React.ComponentProps<
+      typeof ViewUpdateModal
+    >['robotSystemType'] = Buildroot.BUILDROOT
   ) => {
-    return mountWithStore(
+    return mountWithStore<React.ComponentProps<typeof ViewUpdateModal>>(
       <ViewUpdateModal
         robotName={MOCK_ROBOT_NAME}
         robotUpdateType={robotUpdateType}
@@ -73,7 +71,7 @@ describe('ViewUpdateModal', () => {
 
     expect(closeButtonProps.children).toMatch(/not now/i)
     expect(handleClose).not.toHaveBeenCalled()
-    closeButtonProps.onClick()
+    closeButtonProps.onClick?.({} as React.MouseEvent)
     expect(handleClose).toHaveBeenCalled()
   })
 
@@ -90,7 +88,7 @@ describe('ViewUpdateModal', () => {
 
     expect(closeButtonProps.children).toMatch(/close/i)
     expect(handleClose).not.toHaveBeenCalled()
-    closeButtonProps.onClick()
+    closeButtonProps.onClick?.({} as React.MouseEvent)
     expect(handleClose).toHaveBeenCalled()
   })
 
@@ -111,11 +109,11 @@ describe('ViewUpdateModal', () => {
 
     expect(closeButtonProps.children).toMatch(/not now/i)
     expect(handleClose).not.toHaveBeenCalled()
-    closeButtonProps.onClick()
+    closeButtonProps.onClick?.({} as React.MouseEvent)
     expect(handleClose).toHaveBeenCalled()
 
     expect(handleProceed).not.toHaveBeenCalled()
-    releaseNotesModal.invoke('proceed')()
+    releaseNotesModal.invoke('proceed')?.()
     expect(handleProceed).toHaveBeenCalled()
   })
 
@@ -147,7 +145,7 @@ describe('ViewUpdateModal', () => {
 
     expect(closeButtonProps.children).toMatch(/not now/i)
     expect(handleClose).not.toHaveBeenCalled()
-    closeButtonProps.onClick()
+    closeButtonProps.onClick?.({} as React.MouseEvent)
     expect(handleClose).toHaveBeenCalled()
   })
 
@@ -159,7 +157,7 @@ describe('ViewUpdateModal', () => {
     const { wrapper } = render(Buildroot.UPGRADE, Buildroot.BALENA)
     const migrationWarning = wrapper.find(MigrationWarningModal)
 
-    migrationWarning.invoke('proceed')()
+    migrationWarning.invoke('proceed')?.()
 
     expect(wrapper.find(ReleaseNotesModal).prop('systemType')).toBe(
       Buildroot.BALENA
@@ -170,7 +168,7 @@ describe('ViewUpdateModal', () => {
     const { wrapper } = render(Buildroot.UPGRADE, Buildroot.BALENA)
     const migrationWarning = wrapper.find(MigrationWarningModal)
 
-    migrationWarning.invoke('proceed')()
+    migrationWarning.invoke('proceed')?.()
     expect(wrapper.exists(DownloadUpdateModal)).toBe(true)
   })
 })
diff --git a/app/src/pages/Robots/RobotSettings/UpdateBuildroot/index.tsx b/app/src/pages/Robots/RobotSettings/UpdateBuildroot/index.tsx
index 0d1f04638a8..3b6c7db19ea 100644
--- a/app/src/pages/Robots/RobotSettings/UpdateBuildroot/index.tsx
+++ b/app/src/pages/Robots/RobotSettings/UpdateBuildroot/index.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { useSelector, useDispatch } from 'react-redux'
 
@@ -18,12 +17,12 @@ import {
 import type { State, Dispatch } from '../../../../redux/types'
 import type { ViewableRobot } from '../../../../redux/discovery/types'
 
-export type UpdateBuildrootProps = {|
-  robot: ViewableRobot,
-  close: () => mixed,
-|}
+export interface UpdateBuildrootProps {
+  robot: ViewableRobot
+  close: () => unknown
+}
 
-export function UpdateBuildroot(props: UpdateBuildrootProps): React.Node {
+export function UpdateBuildroot(props: UpdateBuildrootProps): JSX.Element {
   const { robot, close } = props
   const robotName = robot.name
   const [viewUpdateInfo, setViewUpdateInfo] = React.useState(false)
diff --git a/app/src/pages/Robots/RobotSettings/UpdateBuildroot/progress.tsx b/app/src/pages/Robots/RobotSettings/UpdateBuildroot/progress.tsx
index 3eb175645ce..c4de00e5da4 100644
--- a/app/src/pages/Robots/RobotSettings/UpdateBuildroot/progress.tsx
+++ b/app/src/pages/Robots/RobotSettings/UpdateBuildroot/progress.tsx
@@ -1,8 +1,7 @@
-// @flow
 import * as React from 'react'
 import styles from './styles.css'
 
-export function ProgressSpinner(): React.Node {
+export function ProgressSpinner(): JSX.Element {
   return (
     <div className={styles.progress_spinner}>
       <span />
@@ -17,11 +16,11 @@ export function ProgressSpinner(): React.Node {
   )
 }
 
-export type ProgressBarProps = {|
-  progress: number | null,
-|}
+export interface ProgressBarProps {
+  progress: number | null
+}
 
-export function ProgressBar(props: ProgressBarProps): React.Node {
+export function ProgressBar(props: ProgressBarProps): JSX.Element {
   const progress = props.progress || 0
   const width = `${progress}%`
 
diff --git a/app/src/pages/Robots/RobotSettings/UpdateBuildroot/types.ts b/app/src/pages/Robots/RobotSettings/UpdateBuildroot/types.ts
index 0cdf4c17eba..5e32b2360d7 100644
--- a/app/src/pages/Robots/RobotSettings/UpdateBuildroot/types.ts
+++ b/app/src/pages/Robots/RobotSettings/UpdateBuildroot/types.ts
@@ -1,7 +1,5 @@
-// @flow
-
-export type VersionProps = {|
-  appVersion: string,
-  robotVersion: string | null,
-  availableUpdate: string,
-|}
+export interface VersionProps {
+  appVersion: string
+  robotVersion: string | null
+  availableUpdate: string
+}
diff --git a/app/src/pages/Robots/RobotSettings/UpdateFromFileControl.tsx b/app/src/pages/Robots/RobotSettings/UpdateFromFileControl.tsx
index ed7b9cc246f..8b046d539f2 100644
--- a/app/src/pages/Robots/RobotSettings/UpdateFromFileControl.tsx
+++ b/app/src/pages/Robots/RobotSettings/UpdateFromFileControl.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import cx from 'classnames'
 import { useTranslation, Trans } from 'react-i18next'
@@ -32,13 +31,13 @@ const HIDDEN_CSS = css`
   clip: rect(1px 1px 1px 1px);
 `
 
-export type UpdateFromFileControlProps = {|
-  robotName: string,
-|}
+export interface UpdateFromFileControlProps {
+  robotName: string
+}
 
 export function UpdateFromFileControl(
   props: UpdateFromFileControlProps
-): React.Node {
+): JSX.Element {
   const { robotName } = props
   const { t } = useTranslation(['robot_advanced_settings', 'shared'])
   const dispatch = useDispatch<Dispatch>()
@@ -48,12 +47,13 @@ export function UpdateFromFileControl(
   const updateDisabled = updateFromFileDisabledReason !== null
   const [updateBtnProps, updateBtnTooltipProps] = useHoverTooltip()
 
-  const handleChange = (event: SyntheticInputEvent<HTMLInputElement>) => {
+  const handleChange: React.ChangeEventHandler<HTMLInputElement> = event => {
     const { files } = event.target
-    if (files.length === 1 && !updateDisabled) {
+    // TODO(bc, 2021-05-28): augment the file interface to remove the any cast below
+    if (files?.length === 1 && !updateDisabled) {
       // NOTE: File.path is Electron-specific
       // https://electronjs.org/docs/api/file-object
-      dispatch(startBuildrootUpdate(robotName, (files[0]: any).path))
+      dispatch(startBuildrootUpdate(robotName, (files[0] as any).path))
     }
     // clear input value to allow same file to be selected again if necessary
     event.target.value = ''
diff --git a/app/src/pages/Robots/RobotSettings/__tests__/AdvancedSettingsCard.test.tsx b/app/src/pages/Robots/RobotSettings/__tests__/AdvancedSettingsCard.test.tsx
index ce2cfe58e09..c499811000a 100644
--- a/app/src/pages/Robots/RobotSettings/__tests__/AdvancedSettingsCard.test.tsx
+++ b/app/src/pages/Robots/RobotSettings/__tests__/AdvancedSettingsCard.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { mountWithProviders } from '@opentrons/components/__utils__'
 
@@ -10,8 +9,6 @@ import { AdvancedSettingsCard } from '../AdvancedSettingsCard'
 import { UpdateFromFileControl } from '../UpdateFromFileControl'
 import { OpenJupyterControl } from '../OpenJupyterControl'
 
-import type { State } from '../../../../redux/types'
-
 jest.mock('react-router-dom', () => ({ Link: 'a' }))
 
 jest.mock('../UpdateFromFileControl', () => ({
@@ -22,14 +19,17 @@ jest.mock('../../../../redux/analytics')
 jest.mock('../../../../redux/robot-settings/selectors')
 jest.mock('../../../../redux/shell/robot-logs/selectors')
 
-const getRobotSettings: JestMockFn<
-  [State, string],
-  $Call<typeof RobotSettings.getRobotSettings, State, string>
-> = RobotSettings.getRobotSettings
+const getRobotSettings = RobotSettings.getRobotSettings as jest.MockedFunction<
+  typeof RobotSettings.getRobotSettings
+>
 
 // TODO(mc, 2020-09-09): flesh out these tests
 describe('RobotSettings > AdvancedSettingsCard', () => {
-  const render = (robot = mockConnectableRobot) => {
+  const render = (
+    robot: React.ComponentProps<
+      typeof AdvancedSettingsCard
+    >['robot'] = mockConnectableRobot
+  ): ReturnType<typeof mountWithProviders> => {
     const resetUrl = `/robots/${robot.name}/reset`
     return mountWithProviders(
       <AdvancedSettingsCard robot={robot} resetUrl={resetUrl} />,
diff --git a/app/src/pages/Robots/RobotSettings/__tests__/CalibrationCard.test.tsx b/app/src/pages/Robots/RobotSettings/__tests__/CalibrationCard.test.tsx
index 1489f47e396..71f33c4eea7 100644
--- a/app/src/pages/Robots/RobotSettings/__tests__/CalibrationCard.test.tsx
+++ b/app/src/pages/Robots/RobotSettings/__tests__/CalibrationCard.test.tsx
@@ -1,5 +1,3 @@
-// @flow
-
 import * as React from 'react'
 import { mountWithProviders } from '@opentrons/components/__utils__'
 import { saveAs } from 'file-saver'
@@ -23,13 +21,13 @@ import { CONNECTABLE, UNREACHABLE } from '../../../../redux/discovery'
 
 import type { State, Action } from '../../../../redux/types'
 import type { ViewableRobot } from '../../../../redux/discovery/types'
-import type { AnalyticsEvent } from '../../../../redux/analytics/types'
+import type { HTMLAttributes, ReactWrapper } from 'enzyme'
 import type {
   AttachedPipettesByMount,
   PipetteCalibrationsByMount,
 } from '../../../../redux/pipettes/types'
 
-const mockCallTrackEvent: JestMockFn<[AnalyticsEvent], void> = jest.fn()
+const mockCallTrackEvent = jest.fn()
 
 jest.mock('react-router-dom', () => ({ Link: 'a' }))
 jest.mock('file-saver')
@@ -53,31 +51,30 @@ jest.mock('../PipetteOffsets', () => ({
   PipetteOffsets: () => <></>,
 }))
 
-const MOCK_STATE: State = ({ mockState: true }: any)
+const MOCK_STATE: State = { mockState: true } as any
 
-const mockGetIsRunning: JestMockFn<
-  [State],
-  $Call<typeof RobotSelectors.getIsRunning, State>
-> = RobotSelectors.getIsRunning
+const mockGetIsRunning = RobotSelectors.getIsRunning as jest.MockedFunction<
+  typeof RobotSelectors.getIsRunning
+>
 
-const mockUnconnectableRobot: ViewableRobot = ({
+const mockUnconnectableRobot: ViewableRobot = {
   name: 'robot-name',
   connected: true,
   status: UNREACHABLE,
-}: any)
+} as any
 
-const mockRobot: ViewableRobot = ({
+const mockRobot: ViewableRobot = {
   name: 'robot-name',
   connected: true,
   status: CONNECTABLE,
-}: any)
+} as any
 
-const mockAttachedPipettes: AttachedPipettesByMount = ({
+const mockAttachedPipettes: AttachedPipettesByMount = {
   left: mockAttachedPipette,
   right: null,
-}: any)
+} as any
 
-const mockAttachedPipetteCalibrations: PipetteCalibrationsByMount = ({
+const mockAttachedPipetteCalibrations: PipetteCalibrationsByMount = {
   left: {
     offset: mockPipetteOffsetCalibration1,
     tipLength: mockTipLengthCalibration1,
@@ -86,48 +83,52 @@ const mockAttachedPipetteCalibrations: PipetteCalibrationsByMount = ({
     offset: null,
     tipLength: null,
   },
-}: any)
+} as any
 
-const getAttachedPipettes: JestMockFn<
-  [State, string],
-  $Call<typeof Pipettes.getAttachedPipettes, State, string>
-> = Pipettes.getAttachedPipettes
+const getAttachedPipettes = Pipettes.getAttachedPipettes as jest.MockedFunction<
+  typeof Pipettes.getAttachedPipettes
+>
 
-const getAttachedPipetteCalibrations: JestMockFn<
-  [State, string],
-  $Call<typeof Pipettes.getAttachedPipetteCalibrations, State, string>
-> = Pipettes.getAttachedPipetteCalibrations
+const getAttachedPipetteCalibrations = Pipettes.getAttachedPipetteCalibrations as jest.MockedFunction<
+  typeof Pipettes.getAttachedPipetteCalibrations
+>
 
-const getFeatureFlags: JestMockFn<
-  [State],
-  $Call<typeof Config.getFeatureFlags, State>
-> = Config.getFeatureFlags
+const getFeatureFlags = Config.getFeatureFlags as jest.MockedFunction<
+  typeof Config.getFeatureFlags
+>
 
-const getDeckCalibrationStatus: JestMockFn<
-  [State, string],
-  $Call<typeof Calibration.getDeckCalibrationStatus, State, string>
-> = Calibration.getDeckCalibrationStatus
+const getDeckCalibrationStatus = Calibration.getDeckCalibrationStatus as jest.MockedFunction<
+  typeof Calibration.getDeckCalibrationStatus
+>
 
-const getDeckCalButton = wrapper =>
-  wrapper.find('DeckCalibrationControl').find('button')
+const getDeckCalButton = (
+  wrapper: ReactWrapper<React.ComponentProps<typeof CalibrationCard>>
+): ReactWrapper => wrapper.find('DeckCalibrationControl').find('button')
 
-const getCheckCalibrationControl = wrapper =>
-  wrapper.find(CheckCalibrationControl)
+const getCheckCalibrationControl = (
+  wrapper: ReactWrapper<React.ComponentProps<typeof CalibrationCard>>
+): ReactWrapper => wrapper.find('CheckCalibrationControl')
 
-const getDownloadButton = wrapper =>
+const getDownloadButton = (
+  wrapper: ReactWrapper<React.ComponentProps<typeof CalibrationCard>>
+): ReactWrapper<HTMLAttributes> =>
   wrapper.find('a').filter({ children: 'Download your calibration data' })
 
 describe('CalibrationCard', () => {
   const render = (robot: ViewableRobot = mockRobot) => {
-    return mountWithProviders<_, State, Action>(
-      <CalibrationCard robot={robot} pipettesPageUrl={'fake-url'} />,
-      { initialState: MOCK_STATE, i18n }
-    )
+    return mountWithProviders<
+      React.ComponentProps<typeof CalibrationCard>,
+      State,
+      Action
+    >(<CalibrationCard robot={robot} pipettesPageUrl={'fake-url'} />, {
+      initialState: MOCK_STATE,
+      i18n,
+    })
   }
 
   const realBlob = global.Blob
   beforeAll(() => {
-    global.Blob = function (content, options) {
+    global.Blob = function (content: any, options: any) {
       return { content, options }
     }
   })
@@ -220,11 +221,11 @@ describe('CalibrationCard', () => {
   })
 
   it('DC and check cal buttons disabled if not connected', () => {
-    const mockRobotNotConnected: ViewableRobot = ({
+    const mockRobotNotConnected: ViewableRobot = {
       name: 'robot-name',
       connected: false,
       status: CONNECTABLE,
-    }: any)
+    } as any
 
     const { wrapper } = render(mockRobotNotConnected)
 
@@ -285,7 +286,9 @@ describe('CalibrationCard', () => {
   it('lets you click download to download', () => {
     const { wrapper } = render()
 
-    getDownloadButton(wrapper).invoke('onClick')({ preventDefault: () => {} })
+    getDownloadButton(wrapper).invoke('onClick')?.({
+      preventDefault: () => {},
+    } as any)
     expect(saveAs).toHaveBeenCalled()
     expect(mockCallTrackEvent).toHaveBeenCalledWith({
       name: 'calibrationDataDownloaded',
diff --git a/app/src/pages/Robots/RobotSettings/__tests__/CheckCalibrationControl.test.tsx b/app/src/pages/Robots/RobotSettings/__tests__/CheckCalibrationControl.test.tsx
index f5779e3f65c..40a06db7f1f 100644
--- a/app/src/pages/Robots/RobotSettings/__tests__/CheckCalibrationControl.test.tsx
+++ b/app/src/pages/Robots/RobotSettings/__tests__/CheckCalibrationControl.test.tsx
@@ -1,6 +1,8 @@
-// @flow
 import * as React from 'react'
-import { mountWithProviders } from '@opentrons/components/__utils__'
+import {
+  mountWithProviders,
+  WrapperWithStore,
+} from '@opentrons/components/__utils__'
 
 import { i18n } from '../../../../i18n'
 import * as Sessions from '../../../../redux/sessions'
@@ -9,7 +11,8 @@ import { Tooltip, PrimaryBtn, SecondaryBtn } from '@opentrons/components'
 import { TitledControl } from '../../../../atoms/TitledControl'
 import { CheckCalibrationControl } from '../CheckCalibrationControl'
 
-import type { State } from '../../../../redux/types'
+import type { State, Action } from '../../../../redux/types'
+import type { HTMLAttributes, ReactWrapper } from 'enzyme'
 
 import { mockCalibrationCheckSessionAttributes } from '../../../../redux/sessions/__fixtures__'
 
@@ -19,29 +22,33 @@ jest.mock('../../../../organisms/CheckCalibration', () => ({
   CheckCalibration: () => <></>,
 }))
 
-const getRobotSessionOfType: JestMockFn<
-  [State, string, Sessions.SessionType],
-  $Call<
-    typeof Sessions.getRobotSessionOfType,
-    State,
-    string,
-    Sessions.SessionType
-  >
-> = Sessions.getRobotSessionOfType
+const getRobotSessionOfType = Sessions.getRobotSessionOfType as jest.MockedFunction<
+  typeof Sessions.getRobotSessionOfType
+>
 
-const MOCK_STATE: State = ({ mockState: true }: any)
+const MOCK_STATE: State = { mockState: true } as any
 
 describe('CheckCalibrationControl', () => {
-  const getCalCheckButton = wrapper =>
+  const getCalCheckButton = (
+    wrapper: ReactWrapper<React.ComponentProps<typeof CheckCalibrationControl>>
+  ): ReactWrapper<HTMLAttributes> =>
     wrapper
       .find('TitledControl[title="calibration health check"]')
       .find('button')
 
   const render = (
-    props: $Shape<React.ElementProps<typeof CheckCalibrationControl>> = {}
-  ) => {
+    props: Partial<React.ComponentProps<typeof CheckCalibrationControl>> = {}
+  ): WrapperWithStore<
+    React.ComponentProps<typeof CheckCalibrationControl>,
+    State,
+    Action
+  > => {
     const { robotName = 'robot-name', disabledReason = null } = props
-    return mountWithProviders(
+    return mountWithProviders<
+      React.ComponentProps<typeof CheckCalibrationControl>,
+      State,
+      Action
+    >(
       <CheckCalibrationControl
         robotName={robotName}
         disabledReason={disabledReason}
@@ -85,11 +92,11 @@ describe('CheckCalibrationControl', () => {
 
   it('button launches new check calibration health after confirm', () => {
     const { wrapper, store } = render()
-    getCalCheckButton(wrapper).invoke('onClick')()
+    getCalCheckButton(wrapper).invoke('onClick')?.({} as React.MouseEvent)
     wrapper.update()
 
     const calBlockButton = wrapper.find(PrimaryBtn)
-    calBlockButton.invoke('onClick')()
+    calBlockButton.invoke('onClick')?.({} as React.MouseEvent)
     wrapper.update()
 
     expect(store.dispatch).toHaveBeenCalledWith({
diff --git a/app/src/pages/Robots/RobotSettings/__tests__/ConnectionCard.test.tsx b/app/src/pages/Robots/RobotSettings/__tests__/ConnectionCard.test.tsx
index dd32fa9efce..ffd2163d9ca 100644
--- a/app/src/pages/Robots/RobotSettings/__tests__/ConnectionCard.test.tsx
+++ b/app/src/pages/Robots/RobotSettings/__tests__/ConnectionCard.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { mountWithProviders } from '@opentrons/components/__utils__'
 import { i18n } from '../../../../i18n'
@@ -9,7 +8,6 @@ import { ConnectionCard } from '../ConnectionCard'
 import { SelectNetwork } from '../SelectNetwork'
 import { ConnectionStatusMessage } from '../connection'
 
-import type { State } from '../../../../redux/types'
 import type { ViewableRobot } from '../../../../redux/discovery/types'
 
 jest.mock('../../../../redux/networking/selectors')
@@ -19,25 +17,23 @@ jest.mock('../SelectNetwork', () => ({
   },
 }))
 
-const mockRobot: ViewableRobot = ({
+const mockRobot: ViewableRobot = {
   name: 'robot-name',
   connected: true,
   status: CONNECTABLE,
   ip: '1.2.3.4',
-}: any)
+} as any
 
-const mockGetInternetStatus: JestMockFn<
-  [State, string],
-  $Call<typeof Networking.getInternetStatus, State, string>
-> = Networking.getInternetStatus
+const mockGetInternetStatus = Networking.getInternetStatus as jest.MockedFunction<
+  typeof Networking.getInternetStatus
+>
 
-const mockGetNetworkInterfaces: JestMockFn<
-  [State, string],
-  $Call<typeof Networking.getNetworkInterfaces, State, string>
-> = Networking.getNetworkInterfaces
+const mockGetNetworkInterfaces = Networking.getNetworkInterfaces as jest.MockedFunction<
+  typeof Networking.getNetworkInterfaces
+>
 
 describe('ConnectionCard', () => {
-  let render
+  let render: (robot?: ViewableRobot) => ReturnType<typeof mountWithProviders>
 
   beforeEach(() => {
     jest.useFakeTimers()
@@ -88,11 +84,11 @@ describe('ConnectionCard', () => {
   it('passes type ConnectionStatusMessage based on robot.local', () => {
     mockGetInternetStatus.mockReturnValue(Networking.STATUS_FULL)
 
-    const localRobot: ViewableRobot = ({ ...mockRobot, local: true }: any)
+    const localRobot: ViewableRobot = { ...mockRobot, local: true } as any
     const { wrapper: localWrapper } = render(localRobot)
     const localStatus = localWrapper.find(ConnectionStatusMessage)
 
-    const wifiRobot: ViewableRobot = ({ ...mockRobot, local: false }: any)
+    const wifiRobot: ViewableRobot = { ...mockRobot, local: false } as any
     const { wrapper: wifiWrapper } = render(wifiRobot)
     const wifiStatus = wifiWrapper.find(ConnectionStatusMessage)
 
diff --git a/app/src/pages/Robots/RobotSettings/__tests__/ControlsCard.test.tsx b/app/src/pages/Robots/RobotSettings/__tests__/ControlsCard.test.tsx
index 637145106b5..76f989c87d4 100644
--- a/app/src/pages/Robots/RobotSettings/__tests__/ControlsCard.test.tsx
+++ b/app/src/pages/Robots/RobotSettings/__tests__/ControlsCard.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { mountWithProviders } from '@opentrons/components/__utils__'
 
@@ -10,6 +9,7 @@ import * as RobotSelectors from '../../../../redux/robot/selectors'
 import { ControlsCard } from '../ControlsCard'
 import { CONNECTABLE, UNREACHABLE } from '../../../../redux/discovery'
 
+import type { HTMLAttributes, ReactWrapper } from 'enzyme'
 import type { State, Action } from '../../../../redux/types'
 import type { ViewableRobot } from '../../../../redux/discovery/types'
 
@@ -22,46 +22,51 @@ jest.mock('../CheckCalibrationControl', () => ({
   CheckCalibrationControl: () => <></>,
 }))
 
-const mockRobot: ViewableRobot = ({
+const mockRobot: ViewableRobot = {
   name: 'robot-name',
   connected: true,
   status: CONNECTABLE,
-}: any)
+} as any
 
-const mockUnconnectableRobot: ViewableRobot = ({
+const mockUnconnectableRobot: ViewableRobot = {
   name: 'robot-name',
   connected: true,
   status: UNREACHABLE,
-}: any)
+} as any
 
-const mockGetLightsOn: JestMockFn<
-  [State, string],
-  $Call<typeof RobotControls.getLightsOn, State, string>
-> = RobotControls.getLightsOn
+const mockGetLightsOn = RobotControls.getLightsOn as jest.MockedFunction<
+  typeof RobotControls.getLightsOn
+>
 
-const mockGetIsRunning: JestMockFn<
-  [State],
-  $Call<typeof RobotSelectors.getIsRunning, State>
-> = RobotSelectors.getIsRunning
+const mockGetIsRunning = RobotSelectors.getIsRunning as jest.MockedFunction<
+  typeof RobotSelectors.getIsRunning
+>
 
-const MOCK_STATE: State = ({ mockState: true }: any)
+const MOCK_STATE: State = { mockState: true } as any
 
 describe('ControlsCard', () => {
   const render = (robot: ViewableRobot = mockRobot) => {
-    return mountWithProviders<_, State, Action>(
-      <ControlsCard robot={robot} />,
-      {
-        initialState: MOCK_STATE,
-        i18n,
-      }
-    )
+    return mountWithProviders<
+      React.ComponentProps<typeof ControlsCard>,
+      State,
+      Action
+    >(<ControlsCard robot={robot} />, {
+      initialState: MOCK_STATE,
+      i18n,
+    })
   }
 
-  const getHomeButton = wrapper => wrapper.find('button[children="home"]')
+  const getHomeButton = (
+    wrapper: ReactWrapper<React.ComponentProps<typeof ControlsCard>>
+  ): ReactWrapper<HTMLAttributes> => wrapper.find('button[children="home"]')
 
-  const getRestartButton = wrapper => wrapper.find('button[children="restart"]')
+  const getRestartButton = (
+    wrapper: ReactWrapper<React.ComponentProps<typeof ControlsCard>>
+  ): ReactWrapper<HTMLAttributes> => wrapper.find('button[children="restart"]')
 
-  const getLightsButton = wrapper => wrapper.find('ToggleBtn[label="lights"]')
+  const getLightsButton = (
+    wrapper: ReactWrapper<React.ComponentProps<typeof ControlsCard>>
+  ): ReactWrapper<HTMLAttributes> => wrapper.find('ToggleBtn[label="lights"]')
 
   beforeEach(() => {
     jest.useFakeTimers()
@@ -86,7 +91,7 @@ describe('ControlsCard', () => {
 
     const { wrapper, store } = render()
 
-    getLightsButton(wrapper).invoke('onClick')()
+    getLightsButton(wrapper).invoke('onClick')?.({} as React.MouseEvent)
 
     expect(store.dispatch).toHaveBeenCalledWith(
       RobotControls.updateLights(mockRobot.name, false)
@@ -96,7 +101,7 @@ describe('ControlsCard', () => {
   it('calls restartRobot on button click', () => {
     const { wrapper, store } = render()
 
-    getRestartButton(wrapper).invoke('onClick')()
+    getRestartButton(wrapper).invoke('onClick')?.({} as React.MouseEvent)
 
     expect(store.dispatch).toHaveBeenCalledWith(
       RobotAdmin.restartRobot(mockRobot.name)
@@ -106,7 +111,7 @@ describe('ControlsCard', () => {
   it('calls home on button click', () => {
     const { wrapper, store } = render()
 
-    getHomeButton(wrapper).invoke('onClick')()
+    getHomeButton(wrapper).invoke('onClick')?.({} as React.MouseEvent)
 
     expect(store.dispatch).toHaveBeenCalledWith(
       RobotControls.home(mockRobot.name, RobotControls.ROBOT)
@@ -130,11 +135,11 @@ describe('ControlsCard', () => {
   })
 
   it('home, and restart buttons disabled if not connected', () => {
-    const mockRobotNotConnected: ViewableRobot = ({
+    const mockRobotNotConnected: ViewableRobot = {
       name: 'robot-name',
       connected: false,
       status: CONNECTABLE,
-    }: any)
+    } as any
 
     const { wrapper } = render(mockRobotNotConnected)
 
diff --git a/app/src/pages/Robots/RobotSettings/__tests__/DeckCalibrationControl.test.tsx b/app/src/pages/Robots/RobotSettings/__tests__/DeckCalibrationControl.test.tsx
index fe5801ad958..88c469996cd 100644
--- a/app/src/pages/Robots/RobotSettings/__tests__/DeckCalibrationControl.test.tsx
+++ b/app/src/pages/Robots/RobotSettings/__tests__/DeckCalibrationControl.test.tsx
@@ -1,6 +1,8 @@
-// @flow
 import * as React from 'react'
-import { mountWithProviders } from '@opentrons/components/__utils__'
+import {
+  mountWithProviders,
+  WrapperWithStore,
+} from '@opentrons/components/__utils__'
 
 import { i18n } from '../../../../i18n'
 
@@ -18,34 +20,48 @@ import {
   CALIBRATION_SOURCE_UNKNOWN,
 } from '../../../../redux/calibration'
 import { DeckCalibrationControl } from '../DeckCalibrationControl'
-import { InlineCalibrationWarning } from '../../../../molecules/InlineCalibrationWarning'
 
-import type { State } from '../../../../redux/types'
+import type { HTMLAttributes, ReactWrapper } from 'enzyme'
+import type { Action, State } from '../../../../redux/types'
 
 jest.mock('../../../../redux/robot-api/selectors')
 jest.mock('../../../../redux/sessions/selectors')
 
-const mockGetRequestById: JestMockFn<
-  [State, string],
-  $Call<typeof RobotApi.getRequestById, State, string>
-> = RobotApi.getRequestById
+const mockGetRequestById = RobotApi.getRequestById as jest.MockedFunction<
+  typeof RobotApi.getRequestById
+>
 
 describe('DeckCalibrationControl', () => {
-  let render
-
-  const getDeckCalButton = wrapper =>
+  let render: (
+    props?: Partial<React.ComponentProps<typeof DeckCalibrationControl>>
+  ) => WrapperWithStore<
+    React.ComponentProps<typeof DeckCalibrationControl>,
+    State,
+    Action
+  >
+
+  const getDeckCalButton = (
+    wrapper: ReactWrapper<React.ComponentProps<typeof DeckCalibrationControl>>
+  ): ReactWrapper<HTMLAttributes> =>
     wrapper.find('DeckCalibrationControl').find('button')
 
-  const getCancelDeckCalButton = wrapper =>
+  const getCancelDeckCalButton = (
+    wrapper: ReactWrapper<React.ComponentProps<typeof DeckCalibrationControl>>
+  ): ReactWrapper<HTMLAttributes> =>
     wrapper.find('OutlineButton[children="cancel"]').find('button')
 
-  const getConfirmDeckCalButton = wrapper =>
+  const getConfirmDeckCalButton = (
+    wrapper: ReactWrapper<React.ComponentProps<typeof DeckCalibrationControl>>
+  ): ReactWrapper<HTMLAttributes> =>
     wrapper.find('OutlineButton[children="continue"]').find('button')
 
-  const getCalibrationWarning = wrapper =>
-    wrapper.find(InlineCalibrationWarning)
+  const getCalibrationWarning = (
+    wrapper: ReactWrapper<React.ComponentProps<typeof DeckCalibrationControl>>
+  ): ReactWrapper => wrapper.find('InlineCalibrationWarning')
 
-  const getFailedStartModal = wrapper =>
+  const getFailedStartModal = (
+    wrapper: ReactWrapper<React.ComponentProps<typeof DeckCalibrationControl>>
+  ): ReactWrapper =>
     wrapper.find('AlertModal[heading="Failed to start deck calibration"]')
 
   beforeEach(() => {
@@ -76,7 +92,11 @@ describe('DeckCalibrationControl', () => {
         },
         pipOffsetDataPresent = true,
       } = props
-      return mountWithProviders(
+      return mountWithProviders<
+        React.ComponentProps<typeof DeckCalibrationControl>,
+        State,
+        Action
+      >(
         <DeckCalibrationControl
           robotName={robotName}
           disabledReason={disabledReason}
@@ -132,7 +152,11 @@ describe('DeckCalibrationControl', () => {
         },
       })
       expect(
-        wrapper.findWhere(elem => elem.prop('fontStyle') === 'italic').html()
+        wrapper
+          .findWhere(
+            (elem: ReactWrapper) => elem.prop('fontStyle') === 'italic'
+          )
+          .html()
       ).toMatch(spec.shouldMatch)
     })
   })
@@ -140,11 +164,11 @@ describe('DeckCalibrationControl', () => {
   it('button launches new deck calibration after confirm', () => {
     const { wrapper, store } = render()
     expect(wrapper.find('ConfirmStartDeckCalModal').exists()).toBe(false)
-    getDeckCalButton(wrapper).invoke('onClick')()
+    getDeckCalButton(wrapper).invoke('onClick')?.({} as React.MouseEvent)
     wrapper.update()
     expect(wrapper.find('ConfirmStartDeckCalModal').exists()).toBe(true)
 
-    getConfirmDeckCalButton(wrapper).invoke('onClick')()
+    getConfirmDeckCalButton(wrapper).invoke('onClick')?.({} as React.MouseEvent)
 
     expect(store.dispatch).toHaveBeenCalledWith({
       ...Sessions.ensureSession(
@@ -157,7 +181,7 @@ describe('DeckCalibrationControl', () => {
 
   it('button launches new deck calibration immediately without rendering ConfirmStartDeckCalModal', () => {
     const { wrapper, store } = render({ pipOffsetDataPresent: false })
-    getDeckCalButton(wrapper).invoke('onClick')()
+    getDeckCalButton(wrapper).invoke('onClick')?.({} as React.MouseEvent)
     wrapper.update()
     expect(wrapper.find('ConfirmStartDeckCalModal').exists()).toBe(false)
 
@@ -173,11 +197,11 @@ describe('DeckCalibrationControl', () => {
   it('button launches new deck calibration and cancel closes', () => {
     const { wrapper, store } = render()
     expect(wrapper.find('ConfirmStartDeckCalModal').exists()).toBe(false)
-    getDeckCalButton(wrapper).invoke('onClick')()
+    getDeckCalButton(wrapper).invoke('onClick')?.({} as React.MouseEvent)
     wrapper.update()
     expect(wrapper.find('ConfirmStartDeckCalModal').exists()).toBe(true)
 
-    getCancelDeckCalButton(wrapper).invoke('onClick')()
+    getCancelDeckCalButton(wrapper).invoke('onClick')?.({} as React.MouseEvent)
 
     expect(wrapper.find('ConfirmStartDeckCalModal').exists()).toBe(false)
     expect(store.dispatch).not.toHaveBeenCalledWith({
@@ -272,8 +296,8 @@ describe('DeckCalibrationControl', () => {
       error: { message: 'ruh roh' },
     })
     expect(getFailedStartModal(wrapper).exists()).toBe(false)
-    getDeckCalButton(wrapper).invoke('onClick')()
-    getConfirmDeckCalButton(wrapper).invoke('onClick')()
+    getDeckCalButton(wrapper).invoke('onClick')?.({} as React.MouseEvent)
+    getConfirmDeckCalButton(wrapper).invoke('onClick')?.({} as React.MouseEvent)
     wrapper.update()
     expect(getFailedStartModal(wrapper).exists()).toBe(true)
   })
diff --git a/app/src/pages/Robots/RobotSettings/__tests__/InformationCard.test.tsx b/app/src/pages/Robots/RobotSettings/__tests__/InformationCard.test.tsx
index 7b30bb9779d..f6bde96bc42 100644
--- a/app/src/pages/Robots/RobotSettings/__tests__/InformationCard.test.tsx
+++ b/app/src/pages/Robots/RobotSettings/__tests__/InformationCard.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 // robot information card tests
 import * as React from 'react'
 import { Link } from 'react-router-dom'
@@ -14,9 +13,6 @@ import { checkShellUpdate } from '../../../../redux/shell'
 import { LabeledValue } from '../../../../atoms/structure'
 import { InformationCard } from '../InformationCard'
 
-import type { State } from '../../../../redux/types'
-import type { DiscoveredRobot } from '../../../../redux/discovery/types'
-
 jest.mock('react-router-dom', () => ({
   Link: 'a',
 }))
@@ -24,32 +20,30 @@ jest.mock('react-router-dom', () => ({
 jest.mock('../../../../redux/buildroot/selectors')
 jest.mock('../../../../redux/discovery/selectors')
 
-const getBuildrootUpdateDisplayInfo: JestMockFn<
-  [State, string],
-  $Call<typeof Buildroot.getBuildrootUpdateDisplayInfo, State, string>
-> = Buildroot.getBuildrootUpdateDisplayInfo
+const getBuildrootUpdateDisplayInfo = Buildroot.getBuildrootUpdateDisplayInfo as jest.MockedFunction<
+  typeof Buildroot.getBuildrootUpdateDisplayInfo
+>
 
-const getRobotApiVersion: JestMockFn<
-  [DiscoveredRobot],
-  $Call<typeof Discovery.getRobotApiVersion, DiscoveredRobot>
-> = Discovery.getRobotApiVersion
+const getRobotApiVersion = Discovery.getRobotApiVersion as jest.MockedFunction<
+  typeof Discovery.getRobotApiVersion
+>
 
-const getRobotFirmwareVersion: JestMockFn<
-  [DiscoveredRobot],
-  $Call<typeof Discovery.getRobotFirmwareVersion, DiscoveredRobot>
-> = Discovery.getRobotFirmwareVersion
+const getRobotFirmwareVersion = Discovery.getRobotFirmwareVersion as jest.MockedFunction<
+  typeof Discovery.getRobotFirmwareVersion
+>
 
-const getRobotProtocolApiVersion: JestMockFn<
-  [DiscoveredRobot],
-  $Call<typeof Discovery.getRobotProtocolApiVersion, DiscoveredRobot>
-> = Discovery.getRobotProtocolApiVersion
+const getRobotProtocolApiVersion = Discovery.getRobotProtocolApiVersion as jest.MockedFunction<
+  typeof Discovery.getRobotProtocolApiVersion
+>
 
 const MOCK_ROBOT_VERSION = '1.2.3'
 const MOCK_FIRMWARE_VERSION = '4.5.6'
 const MOCK_MIN_PAPI_VERSION = '1.0'
 const MOCK_MAX_PAPI_VERSION = '2.8'
 describe('InformationCard', () => {
-  const render = (robot = mockConnectableRobot) => {
+  const render = (
+    robot = mockConnectableRobot
+  ): ReturnType<typeof mountWithProviders> => {
     const updateUrl = `/robots/${robot.name}/update`
     return mountWithProviders(
       <InformationCard robot={robot} updateUrl={updateUrl} />,
diff --git a/app/src/pages/Robots/RobotSettings/__tests__/OpenJupyterControl.test.tsx b/app/src/pages/Robots/RobotSettings/__tests__/OpenJupyterControl.test.tsx
index 667afb20fe4..f66955effe8 100644
--- a/app/src/pages/Robots/RobotSettings/__tests__/OpenJupyterControl.test.tsx
+++ b/app/src/pages/Robots/RobotSettings/__tests__/OpenJupyterControl.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { mountWithProviders } from '@opentrons/components/__utils__'
 import { SecondaryBtn } from '@opentrons/components'
@@ -7,15 +6,14 @@ import { i18n } from '../../../../i18n'
 import * as Analytics from '../../../../redux/analytics'
 import { OpenJupyterControl } from '../OpenJupyterControl'
 
-import type { AnalyticsEvent } from '../../../../redux/analytics/types'
-
 jest.mock('../../../../redux/analytics')
 
-const useTrackEvent: JestMockFn<[], (AnalyticsEvent) => void> =
-  Analytics.useTrackEvent
+const useTrackEvent = Analytics.useTrackEvent as jest.MockedFunction<
+  typeof Analytics.useTrackEvent
+>
 
 describe('OpenJupyterControl component', () => {
-  const render = () =>
+  const render = (): ReturnType<typeof mountWithProviders> =>
     mountWithProviders(<OpenJupyterControl robotIp="localhost" />, { i18n })
   const trackEvent = jest.fn()
 
@@ -55,7 +53,9 @@ describe('OpenJupyterControl component', () => {
   it('should send an analytics event on link click', () => {
     const { wrapper } = render()
 
-    wrapper.find('a[href="http://localhost:48888"]').invoke('onClick')()
+    wrapper.find('a[href="http://localhost:48888"]').invoke('onClick')?.(
+      {} as React.MouseEvent
+    )
 
     expect(trackEvent).toHaveBeenCalledWith({
       name: 'jupyterOpen',
diff --git a/app/src/pages/Robots/RobotSettings/__tests__/PipetteOffsetItem.test.tsx b/app/src/pages/Robots/RobotSettings/__tests__/PipetteOffsetItem.test.tsx
index 978b677df43..d7bebc04ee7 100644
--- a/app/src/pages/Robots/RobotSettings/__tests__/PipetteOffsetItem.test.tsx
+++ b/app/src/pages/Robots/RobotSettings/__tests__/PipetteOffsetItem.test.tsx
@@ -1,20 +1,17 @@
-// @flow
-
 import * as React from 'react'
 import { mountWithProviders } from '@opentrons/components/__utils__'
-import type {
-  PipetteModelSpecs,
-  LabwareDefinition2,
-} from '@opentrons/shared-data'
 import { getLabwareDisplayName } from '@opentrons/shared-data'
 import { i18n } from '../../../../i18n'
 import { PipetteOffsetItem } from '../PipetteOffsetItem'
-import { InlineCalibrationWarning } from '../../../../molecules/InlineCalibrationWarning'
 import { findLabwareDefWithCustom } from '../../../../assets/labware/findLabware'
+
+import type { ReactWrapper } from 'enzyme'
+import type { State, Action } from '../../../../redux/types'
+import type { WrapperWithStore } from '@opentrons/components/__utils__'
 import type {
-  PipetteOffsetCalibration,
-  TipLengthCalibration,
-} from '../../../../redux/calibration/types'
+  AttachedPipette,
+  PipetteCalibrations,
+} from '../../../../redux/pipettes/types'
 
 jest.mock('../../../../assets/labware/findLabware')
 
@@ -28,27 +25,46 @@ jest.mock('@opentrons/shared-data', () => ({
   getLabwareDisplayName: jest.fn(),
 }))
 
-const mockFindLabwareDefWithCustom: JestMockFn<
-  [string | null, string | null, string | null, Array<LabwareDefinition2>],
-  LabwareDefinition2 | null
-> = findLabwareDefWithCustom
+const mockFindLabwareDefWithCustom = findLabwareDefWithCustom as jest.MockedFunction<
+  typeof findLabwareDefWithCustom
+>
 
-const mockGetLabwareDisplayName: JestMockFn<
-  [LabwareDefinition2],
-  string
-> = getLabwareDisplayName
+const mockGetLabwareDisplayName = getLabwareDisplayName as jest.MockedFunction<
+  typeof getLabwareDisplayName
+>
 
-const getMountLabel = wrapper => wrapper.find('h4')
+const getMountLabel = (
+  wrapper: ReactWrapper<React.ComponentProps<typeof PipetteOffsetItem>>
+): ReactWrapper => wrapper.find('h4')
 
-const getPipetteName = wrapper => wrapper.find('p').at(1)
-const getNotCalibrated = wrapper => wrapper.find('p').at(1)
-const getCalibrationText = wrapper => wrapper.find('p')
-const getCalibrationTime = wrapper => wrapper.find('p').at(3)
-const getCalibrationTiprack = wrapper => wrapper.find('p').at(5)
-const getCalibrationWarning = wrapper => wrapper.find(InlineCalibrationWarning)
+const getPipetteName = (
+  wrapper: ReactWrapper<React.ComponentProps<typeof PipetteOffsetItem>>
+): ReactWrapper => wrapper.find('p').at(1)
+const getNotCalibrated = (
+  wrapper: ReactWrapper<React.ComponentProps<typeof PipetteOffsetItem>>
+): ReactWrapper => wrapper.find('p').at(1)
+const getCalibrationText = (
+  wrapper: ReactWrapper<React.ComponentProps<typeof PipetteOffsetItem>>
+): ReactWrapper => wrapper.find('p')
+const getCalibrationTime = (
+  wrapper: ReactWrapper<React.ComponentProps<typeof PipetteOffsetItem>>
+): ReactWrapper => wrapper.find('p').at(3)
+const getCalibrationTiprack = (
+  wrapper: ReactWrapper<React.ComponentProps<typeof PipetteOffsetItem>>
+): ReactWrapper => wrapper.find('p').at(5)
+const getCalibrationWarning = (
+  wrapper: ReactWrapper<React.ComponentProps<typeof PipetteOffsetItem>>
+): ReactWrapper => wrapper.find('InlineCalibrationWarning')
 
 describe('PipetteOffsetItem', () => {
-  let render
+  let render: (
+    props?: Partial<React.ComponentProps<typeof PipetteOffsetItem>>
+  ) => WrapperWithStore<
+    React.ComponentProps<typeof PipetteOffsetItem>,
+    State,
+    Action
+  >
+
   beforeEach(() => {
     render = (props = {}) => {
       const {
@@ -60,10 +76,8 @@ describe('PipetteOffsetItem', () => {
           tip_length: 0,
           mount_axis: 'z',
           plunger_axis: 'b',
-          modelSpecs: ({
-            displayName: 'P300 Single GEN2',
-          }: $Shape<PipetteModelSpecs>),
-        },
+          modelSpecs: { displayName: 'P300 Single GEN2' },
+        } as AttachedPipette,
         calibration = {
           offset: {
             pipette: 'pipette-id-11',
@@ -96,7 +110,11 @@ describe('PipetteOffsetItem', () => {
         },
         customLabware = [],
       } = props
-      return mountWithProviders(
+      return mountWithProviders<
+        React.ComponentProps<typeof PipetteOffsetItem>,
+        State,
+        Action
+      >(
         <PipetteOffsetItem
           mount={mount}
           pipette={pipette}
@@ -111,7 +129,7 @@ describe('PipetteOffsetItem', () => {
   it('renders acceptably when talking to a robot with cal data but no status', () => {
     const { wrapper } = render({
       calibration: {
-        offset: ({
+        offset: {
           pipette: 'pipette-id-11',
           mount: 'left',
           offset: [1, 2, 3],
@@ -120,16 +138,16 @@ describe('PipetteOffsetItem', () => {
           lastModified: '2020-09-10T05:13Z',
           source: 'user',
           id: 'a_pip_id',
-        }: $Shape<PipetteOffsetCalibration>),
-        tipLength: ({
+        },
+        tipLength: {
           id: '1',
           tipLength: 30,
           tiprack: 'asdagasdfasdsa',
           pipette: 'pipette-id-11',
           lastModified: '2020-09-10T05:10Z',
           source: 'user',
-        }: $Shape<TipLengthCalibration>),
-      },
+        },
+      } as PipetteCalibrations,
     })
     expect(wrapper.find('PipetteOffsetItem')).not.toBeNull()
   })
@@ -149,9 +167,9 @@ describe('PipetteOffsetItem', () => {
   })
 
   it('displays date and tiprack display name from def', () => {
-    mockFindLabwareDefWithCustom.mockReturnValue(
-      ({ parameters: { loadName: 'opentrons_96_tiprack_300ul' } }: any)
-    )
+    mockFindLabwareDefWithCustom.mockReturnValue({
+      parameters: { loadName: 'opentrons_96_tiprack_300ul' },
+    } as any)
     mockGetLabwareDisplayName.mockReturnValue('Opentrons 96 Tiprack 300 fancy')
 
     const { wrapper } = render()
@@ -174,9 +192,9 @@ describe('PipetteOffsetItem', () => {
   })
 
   it('displays a warning when its offset calibration is marked bad', () => {
-    mockFindLabwareDefWithCustom.mockReturnValue(
-      ({ parameters: { loadName: 'opentrons_96_tiprack_300ul' } }: any)
-    )
+    mockFindLabwareDefWithCustom.mockReturnValue({
+      parameters: { loadName: 'opentrons_96_tiprack_300ul' },
+    } as any)
     mockGetLabwareDisplayName.mockReturnValue('Opentrons 96 Tiprack 300 fancy')
 
     const { wrapper } = render({
@@ -216,9 +234,9 @@ describe('PipetteOffsetItem', () => {
   })
 
   it('displays a warning when its tip length calibration is marked bad', () => {
-    mockFindLabwareDefWithCustom.mockReturnValue(
-      ({ parameters: { loadName: 'opentrons_96_tiprack_300ul' } }: any)
-    )
+    mockFindLabwareDefWithCustom.mockReturnValue({
+      parameters: { loadName: 'opentrons_96_tiprack_300ul' },
+    } as any)
     mockGetLabwareDisplayName.mockReturnValue('Opentrons 96 Tiprack 300 fancy')
 
     const { wrapper } = render({
diff --git a/app/src/pages/Robots/RobotSettings/__tests__/RobotSettings.test.tsx b/app/src/pages/Robots/RobotSettings/__tests__/RobotSettings.test.tsx
index b5426cb421e..c424577f280 100644
--- a/app/src/pages/Robots/RobotSettings/__tests__/RobotSettings.test.tsx
+++ b/app/src/pages/Robots/RobotSettings/__tests__/RobotSettings.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { StaticRouter, Route, Redirect } from 'react-router-dom'
 
@@ -29,7 +28,7 @@ import { UpdateBuildroot } from '../UpdateBuildroot'
 import { ResetRobotModal } from '../ResetRobotModal'
 import { RobotSettings } from '..'
 
-import type { State } from '../../../../redux/types'
+import type { State, Action } from '../../../../redux/types'
 import type { ViewableRobot } from '../../../../redux/discovery/types'
 
 jest.mock('../../../../redux/buildroot/selectors')
@@ -70,51 +69,55 @@ jest.mock('../AdvancedSettingsCard', () => ({
   AdvancedSettingsCard: () => <></>,
 }))
 
-const MOCK_STATE: State = ({ mockState: true }: any)
+const MOCK_STATE: State = { mockState: true } as any
 const ROBOT_URL = `/robots/${mockConnectableRobot.name}`
 
-const getConnectRequest: JestMockFn<
-  [State],
-  $Call<typeof RobotSelectors.getConnectRequest, State>
-> = RobotSelectors.getConnectRequest
+const getConnectRequest = RobotSelectors.getConnectRequest as jest.MockedFunction<
+  typeof RobotSelectors.getConnectRequest
+>
 
-const getBuildrootUpdateSeen: JestMockFn<[State], boolean> =
-  Buildroot.getBuildrootUpdateSeen
+const getBuildrootUpdateSeen = Buildroot.getBuildrootUpdateSeen as jest.MockedFunction<
+  typeof Buildroot.getBuildrootUpdateSeen
+>
 
-const getBuildrootUpdateDisplayInfo: JestMockFn<
-  [State, string],
-  $Call<typeof Buildroot.getBuildrootUpdateDisplayInfo, State, string>
-> = Buildroot.getBuildrootUpdateDisplayInfo
+const getBuildrootUpdateDisplayInfo = Buildroot.getBuildrootUpdateDisplayInfo as jest.MockedFunction<
+  typeof Buildroot.getBuildrootUpdateDisplayInfo
+>
 
-const getBuildrootUpdateInProgress: JestMockFn<
-  [State, ViewableRobot],
-  boolean
-> = Buildroot.getBuildrootUpdateInProgress
+const getBuildrootUpdateInProgress = Buildroot.getBuildrootUpdateInProgress as jest.MockedFunction<
+  typeof Buildroot.getBuildrootUpdateInProgress
+>
 
-const getBuildrootUpdateAvailable: JestMockFn<
-  [State, ViewableRobot],
-  $Call<typeof Buildroot.getBuildrootUpdateAvailable, State, ViewableRobot>
-> = Buildroot.getBuildrootUpdateAvailable
+const getBuildrootUpdateAvailable = Buildroot.getBuildrootUpdateAvailable as jest.MockedFunction<
+  typeof Buildroot.getBuildrootUpdateAvailable
+>
 
-const getRobotRestartRequired: JestMockFn<[State, string | null], boolean> =
-  Settings.getRobotRestartRequired
+const getRobotRestartRequired = Settings.getRobotRestartRequired as jest.MockedFunction<
+  typeof Settings.getRobotRestartRequired
+>
 
-const getMovementStatus: JestMockFn<
-  [State, string],
-  $Call<typeof Controls.getMovementStatus, State, string>
-> = Controls.getMovementStatus
+const getMovementStatus = Controls.getMovementStatus as jest.MockedFunction<
+  typeof Controls.getMovementStatus
+>
 
-const getMovementError: JestMockFn<
-  [State, string],
-  $Call<typeof Controls.getMovementError, State, string>
-> = Controls.getMovementError
+const getMovementError = Controls.getMovementError as jest.MockedFunction<
+  typeof Controls.getMovementError
+>
 
-const getRobotRestarting: JestMockFn<[State, string], boolean> =
-  Admin.getRobotRestarting
+const getRobotRestarting = Admin.getRobotRestarting as jest.MockedFunction<
+  typeof Admin.getRobotRestarting
+>
 
 describe('/robots/:robotName page component', () => {
-  const render = (robot = mockConnectableRobot, url = ROBOT_URL) => {
-    return mountWithProviders(
+  const render = (
+    robot: ViewableRobot = mockConnectableRobot,
+    url = ROBOT_URL
+  ) => {
+    return mountWithProviders<
+      React.ComponentProps<typeof StaticRouter>,
+      State,
+      Action
+    >(
       <StaticRouter location={url} context={{}}>
         <Route path="/robots/:name?">
           <RobotSettings robot={robot} />
@@ -250,7 +253,7 @@ describe('/robots/:robotName page component', () => {
     expect(errorModal.prop('description')).toMatch(/robot was unable to home/i)
     expect(errorModal.prop('error')).toEqual({ message: 'oh no!' })
 
-    errorModal.invoke('close')()
+    errorModal.invoke('close')?.()
     expect(store.dispatch).toHaveBeenCalledWith(
       Controls.clearMovementStatus(mockConnectableRobot.name)
     )
@@ -339,7 +342,7 @@ describe('/robots/:robotName page component', () => {
 
     expect(errorModal.exists()).toBe(true)
 
-    errorModal.invoke('onCloseClick')()
+    errorModal.invoke('onCloseClick')?.()
 
     expect(store.dispatch).toHaveBeenCalledWith(
       RobotActions.clearConnectResponse()
diff --git a/app/src/pages/Robots/RobotSettings/__tests__/StatusCard.test.tsx b/app/src/pages/Robots/RobotSettings/__tests__/StatusCard.test.tsx
index fbd8fb01f99..741633c1217 100644
--- a/app/src/pages/Robots/RobotSettings/__tests__/StatusCard.test.tsx
+++ b/app/src/pages/Robots/RobotSettings/__tests__/StatusCard.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { mountWithProviders } from '@opentrons/components/__utils__'
 import { i18n } from '../../../../i18n'
@@ -11,23 +10,22 @@ import {
 import { SecondaryBtn, Icon } from '@opentrons/components'
 import { StatusCard } from '../StatusCard'
 
-import type { State } from '../../../../redux/types'
 import type { ViewableRobot } from '../../../../redux/discovery/types'
 
 jest.mock('../../../../redux/robot/selectors')
 
-const getSessionStatus: JestMockFn<
-  [State],
-  $Call<typeof RobotSelectors.getSessionStatus, any>
-> = RobotSelectors.getSessionStatus
+const getSessionStatus = RobotSelectors.getSessionStatus as jest.MockedFunction<
+  typeof RobotSelectors.getSessionStatus
+>
 
-const getConnectRequest: JestMockFn<
-  [State],
-  $Call<typeof RobotSelectors.getConnectRequest, any>
-> = RobotSelectors.getConnectRequest
+const getConnectRequest = RobotSelectors.getConnectRequest as jest.MockedFunction<
+  typeof RobotSelectors.getConnectRequest
+>
 
 describe('RobotSettings StatusCard', () => {
-  const render = (robot: ViewableRobot = Fixtures.mockConnectableRobot) => {
+  const render = (
+    robot: ViewableRobot = Fixtures.mockConnectableRobot
+  ): ReturnType<typeof mountWithProviders> => {
     return mountWithProviders(<StatusCard robot={robot} />, {
       i18n,
     })
@@ -57,7 +55,7 @@ describe('RobotSettings StatusCard', () => {
     const { wrapper, store } = render()
     const button = wrapper.find(SecondaryBtn)
 
-    button.invoke('onClick')()
+    button.invoke('onClick')?.({} as React.MouseEvent)
     expect(store.dispatch).toHaveBeenCalledWith(
       RobotActions.connect(Fixtures.mockConnectableRobot.name)
     )
@@ -74,7 +72,7 @@ describe('RobotSettings StatusCard', () => {
     const { wrapper, store } = render(Fixtures.mockConnectedRobot)
     const button = wrapper.find(SecondaryBtn)
 
-    button.invoke('onClick')()
+    button.invoke('onClick')?.({} as React.MouseEvent)
     expect(store.dispatch).toHaveBeenCalledWith(RobotActions.disconnect())
   })
 
diff --git a/app/src/pages/Robots/RobotSettings/connection.tsx b/app/src/pages/Robots/RobotSettings/connection.tsx
index 2c38cb5e7b4..3484d6888a9 100644
--- a/app/src/pages/Robots/RobotSettings/connection.tsx
+++ b/app/src/pages/Robots/RobotSettings/connection.tsx
@@ -1,4 +1,3 @@
-// @flow
 // UI components for displaying connection info
 import * as React from 'react'
 import { useTranslation, Trans } from 'react-i18next'
@@ -21,22 +20,22 @@ import type {
 const USB: 'USB' = 'USB'
 const WI_FI: 'Wi-Fi' = 'Wi-Fi'
 
-const boldProps: React.ElementProps<typeof Text> = {
+const boldProps: React.ComponentProps<typeof Text> = {
   as: 'span',
   fontWeight: FONT_WEIGHT_SEMIBOLD,
   textTransform: TEXT_TRANSFORM_CAPITALIZE,
 }
 
-type ConnectionStatusProps = {|
-  type: typeof USB | typeof WI_FI,
-  ipAddress: string,
-  status: typeof CONNECTABLE | typeof REACHABLE,
-  internetStatus: InternetStatus | null,
-|}
+interface ConnectionStatusProps {
+  type: typeof USB | typeof WI_FI
+  ipAddress: string
+  status: typeof CONNECTABLE | typeof REACHABLE
+  internetStatus: InternetStatus | null
+}
 
 export function ConnectionStatusMessage(
   props: ConnectionStatusProps
-): React.Node {
+): JSX.Element {
   const { type, ipAddress, status, internetStatus } = props
   const { t } = useTranslation(['robot_connection', 'shared'])
 
@@ -62,6 +61,7 @@ export function ConnectionStatusMessage(
           t={t}
           i18nKey="internet_status"
           tOptions={{ context: internetStatus }}
+          // @ts-expect-error TODO: use `defaults` prop instead of `defaultValue`
           defaultValue={t('shared:unknown')}
           components={{ bold: <Text {...boldProps} /> }}
         />
@@ -70,15 +70,15 @@ export function ConnectionStatusMessage(
   )
 }
 
-type ConnectionInfoProps = {
-  connection: SimpleInterfaceStatus | null,
-  title: string,
-  wired?: boolean,
-  children?: React.Node,
-  disabled: ?boolean,
+interface ConnectionInfoProps {
+  connection: SimpleInterfaceStatus | null
+  title: string
+  wired?: boolean
+  children?: React.ReactNode
+  disabled: boolean | null | undefined
 }
 
-export function ConnectionInfo(props: ConnectionInfoProps): React.Node {
+export function ConnectionInfo(props: ConnectionInfoProps): JSX.Element {
   const { connection, title, wired, children, disabled } = props
   const labelStyles = cx(styles.connection_label, {
     [styles.disabled]: disabled,
@@ -101,13 +101,13 @@ export function ConnectionInfo(props: ConnectionInfoProps): React.Node {
   )
 }
 
-type NetworkAddressProps = {
-  connection: SimpleInterfaceStatus | null,
-  wired: ?boolean,
-  disabled: ?boolean,
+interface NetworkAddressProps {
+  connection: SimpleInterfaceStatus | null
+  wired: boolean | null | undefined
+  disabled: boolean | null | undefined
 }
 
-function NetworkAddresses(props: NetworkAddressProps) {
+function NetworkAddresses(props: NetworkAddressProps): JSX.Element {
   const { wired, disabled, connection } = props
   const { t } = useTranslation(['robot_connection', 'shared'])
   const unknown = t('shared:unknown')
diff --git a/app/src/pages/Robots/RobotSettings/index.tsx b/app/src/pages/Robots/RobotSettings/index.tsx
index 5433631a379..3b4ace45346 100644
--- a/app/src/pages/Robots/RobotSettings/index.tsx
+++ b/app/src/pages/Robots/RobotSettings/index.tsx
@@ -1,4 +1,3 @@
-// @flow
 // connect and configure robots page
 import * as React from 'react'
 import { useSelector, useDispatch } from 'react-redux'
@@ -46,16 +45,16 @@ import { CalibrationCard } from './CalibrationCard'
 import type { State, Dispatch } from '../../../redux/types'
 import type { ViewableRobot } from '../../../redux/discovery/types'
 
-type Props = {|
-  robot: ViewableRobot,
-|}
+interface Props {
+  robot: ViewableRobot
+}
 
 // TODO(bc, 2021-02-16): i18n
 const UPDATE_FRAGMENT = 'update'
 const RESET_FRAGMENT = 'reset'
 const INSTRUMENTS_FRAGMENT = 'instruments'
 
-export function RobotSettings(props: Props): React.Node {
+export function RobotSettings(props: Props): JSX.Element {
   const { robot } = props
   const { name: robotName } = robot
 
diff --git a/app/src/pages/Robots/RobotSettings/inputs.tsx b/app/src/pages/Robots/RobotSettings/inputs.tsx
deleted file mode 100644
index 4e8f2295b6d..00000000000
--- a/app/src/pages/Robots/RobotSettings/inputs.tsx
+++ /dev/null
@@ -1,98 +0,0 @@
-// @flow
-// input component convenience wrappers
-// TODO(mc, 2018-10-18): delete this file in favor of Formik
-import * as React from 'react'
-
-import {
-  InputField,
-  DropdownField,
-  type DropdownOption,
-} from '@opentrons/components'
-
-export type FormProps = {
-  onSubmit: () => mixed,
-  disabled?: boolean,
-  children: React.Node,
-  className?: string,
-}
-
-export type InputProps<T> = {
-  name: T,
-  value: ?string,
-  disabled?: boolean,
-  onChange: ({ [name: T]: string }) => mixed,
-  className?: string,
-}
-
-type SelectProps<T> = InputProps<T> & {
-  options: Array<DropdownOption>,
-}
-
-type TextInputProps<T> = InputProps<T> & {
-  type: 'text' | 'password',
-}
-
-export class Form extends React.Component<FormProps> {
-  onSubmit: (event: SyntheticEvent<>) => void = event => {
-    this.props.onSubmit()
-    event.preventDefault()
-  }
-
-  render(): React.Node {
-    const onSubmit = !this.props.disabled ? this.onSubmit : undefined
-
-    return (
-      <form onSubmit={onSubmit} className={this.props.className}>
-        {this.props.children}
-      </form>
-    )
-  }
-}
-
-export class Select<T: string> extends React.Component<SelectProps<T>> {
-  onChange: (event: SyntheticInputEvent<>) => void = event => {
-    if (!this.props.disabled) {
-      this.props.onChange({
-        [this.props.name]: event.target.value,
-      })
-    }
-  }
-
-  render(): React.Node {
-    const { value, options, disabled, className } = this.props
-
-    return (
-      <DropdownField
-        value={value}
-        options={options}
-        disabled={disabled}
-        onChange={this.onChange}
-        className={className}
-      />
-    )
-  }
-}
-
-export class TextInput<T: string> extends React.Component<TextInputProps<T>> {
-  onChange: (event: SyntheticInputEvent<>) => void = event => {
-    if (!this.props.disabled) {
-      this.props.onChange({
-        [this.props.name]: event.target.value,
-      })
-    }
-  }
-
-  render(): React.Node {
-    const { type, value, disabled, className } = this.props
-
-    return (
-      <InputField
-        type={type}
-        value={value}
-        disabled={disabled}
-        onChange={this.onChange}
-        className={className}
-      />
-    )
-  }
-}
diff --git a/app/src/pages/Robots/index.tsx b/app/src/pages/Robots/index.tsx
index 700f47813bf..949893bf4ed 100644
--- a/app/src/pages/Robots/index.tsx
+++ b/app/src/pages/Robots/index.tsx
@@ -1,4 +1,3 @@
-// @flow
 // connect and configure robots page
 import * as React from 'react'
 import { useSelector } from 'react-redux'
@@ -18,8 +17,8 @@ import { RobotSettings } from './RobotSettings'
 import { InstrumentSettings } from './InstrumentSettings'
 import { ModuleSettings } from './ModuleSettings'
 
-export function Robots(): React.Node {
-  const { path, url, params } = useRouteMatch()
+export function Robots(): JSX.Element {
+  const { path, url, params } = useRouteMatch<{ name: string }>()
   const instrumentsMatch = useRouteMatch(`${path}/instruments`)
   const modulesMatch = useRouteMatch(`${path}/modules`)
   const location = useLocation()
diff --git a/app/src/pages/Run/RunLog/CommandList.tsx b/app/src/pages/Run/RunLog/CommandList.tsx
index f645f68966b..64d7ff9ac26 100644
--- a/app/src/pages/Run/RunLog/CommandList.tsx
+++ b/app/src/pages/Run/RunLog/CommandList.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import cx from 'classnames'
 
@@ -7,23 +6,30 @@ import { SessionAlert } from './SessionAlert'
 import { Portal } from '../../../App/portal'
 import styles from './styles.css'
 
-import type { SessionStatus, SessionStatusInfo } from '../../../redux/robot'
+import type {
+  CommandNode,
+  SessionStatus,
+  SessionStatusInfo,
+} from '../../../redux/robot'
 
-export type CommandListProps = {|
-  commands: Array<any>,
-  sessionStatus: SessionStatus,
-  sessionStatusInfo: SessionStatusInfo,
-  showSpinner: boolean,
-  onResetClick: () => mixed,
-|}
+export interface CommandListProps {
+  commands: any[]
+  sessionStatus: SessionStatus
+  sessionStatusInfo: SessionStatusInfo
+  showSpinner: boolean
+  onResetClick: () => unknown
+}
 
 export class CommandList extends React.Component<CommandListProps> {
-  componentDidUpdate() {
+  componentDidUpdate(): void {
     // TODO(mc, 2018-07-24): use new refs
-    if (this.refs.ensureVisible) this.refs.ensureVisible.scrollIntoView(true) // eslint-disable-line react/no-string-refs
+    // eslint-disable-next-line react/no-string-refs
+    if (this.refs.ensureVisible) {
+      ;(this.refs.ensureVisible as React.ElementRef<'li'>).scrollIntoView(true) // eslint-disable-line react/no-string-refs
+    }
   }
 
-  render(): React.Node {
+  render(): JSX.Element {
     const {
       commands,
       sessionStatus,
@@ -31,7 +37,9 @@ export class CommandList extends React.Component<CommandListProps> {
       showSpinner,
       onResetClick,
     } = this.props
-    const makeCommandToTemplateMapper = depth => command => {
+    const makeCommandToTemplateMapper = (depth: number) => (
+      command: CommandNode
+    ): JSX.Element => {
       const {
         id,
         isCurrent,
@@ -51,12 +59,16 @@ export class CommandList extends React.Component<CommandListProps> {
         )
       }
 
-      const liProps: { key: string, className: string, ref?: string } = {
+      const liProps: {
+        key: string | number
+        className: string
+        ref?: string
+      } = {
         key: id,
         className: cx(style, {
-          [styles.executed]: handledAt,
-          [styles.current]: isCurrent,
-          [styles.last_current]: isLast,
+          [styles.executed]: Boolean(handledAt),
+          [styles.current]: Boolean(isCurrent),
+          [styles.last_current]: Boolean(isLast),
         }),
       }
 
@@ -64,6 +76,7 @@ export class CommandList extends React.Component<CommandListProps> {
 
       return (
         <li {...liProps}>
+          {/* @ts-expect-error TODO: this style variable should probably be string and not string[] */}
           <p className={style}>
             [{id}] : {description}
           </p>
diff --git a/app/src/pages/Run/RunLog/ConfirmCancelModal.tsx b/app/src/pages/Run/RunLog/ConfirmCancelModal.tsx
index 3ac43733a90..2a91ac5054a 100644
--- a/app/src/pages/Run/RunLog/ConfirmCancelModal.tsx
+++ b/app/src/pages/Run/RunLog/ConfirmCancelModal.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { useDispatch } from 'react-redux'
 import { AlertModal } from '@opentrons/components'
@@ -12,15 +11,17 @@ const HEADING = 'Are you sure you want to cancel this run?'
 const CANCEL_TEXT = 'cancel run'
 const BACK_TEXT = 'go back'
 
-export type ConfirmCancelModalProps = {|
-  onClose: () => mixed,
-|}
+export interface ConfirmCancelModalProps {
+  onClose: () => unknown
+}
 
-export function ConfirmCancelModal(props: ConfirmCancelModalProps): React.Node {
+export function ConfirmCancelModal(
+  props: ConfirmCancelModalProps
+): JSX.Element {
   const { onClose } = props
   const dispatch = useDispatch<Dispatch>()
 
-  const cancel = () => {
+  const cancel = (): void => {
     dispatch(robotActions.cancel())
     onClose()
   }
diff --git a/app/src/pages/Run/RunLog/SessionAlert.tsx b/app/src/pages/Run/RunLog/SessionAlert.tsx
index 3b6e62d99be..82dc96c1880 100644
--- a/app/src/pages/Run/RunLog/SessionAlert.tsx
+++ b/app/src/pages/Run/RunLog/SessionAlert.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { useSelector } from 'react-redux'
 import { AlertItem } from '@opentrons/components'
@@ -6,23 +5,25 @@ import { getSessionError } from '../../../redux/robot/selectors'
 import type { SessionStatus, SessionStatusInfo } from '../../../redux/robot'
 import styles from './styles.css'
 
-const buildPauseMessage = (message: ?string): string =>
+const buildPauseMessage = (message: string | null | undefined): string =>
   message ? `: ${message}` : ''
 
-const buildPause = (message: ?string): string =>
+const buildPause = (message: string | null | undefined): string =>
   `Run paused${buildPauseMessage(message)}`
 
-const buildPauseUserMessage = (message: ?string) =>
+const buildPauseUserMessage = (
+  message: string | null | undefined
+): string | JSX.Element | null | undefined =>
   message && <div className={styles.pause_user_message}>{message}</div>
 
-export type SessionAlertProps = {|
-  sessionStatus: SessionStatus,
-  sessionStatusInfo: SessionStatusInfo,
-  className?: string,
-  onResetClick: () => mixed,
-|}
+export interface SessionAlertProps {
+  sessionStatus: SessionStatus
+  sessionStatusInfo: SessionStatusInfo
+  className?: string
+  onResetClick: () => unknown
+}
 
-export function SessionAlert(props: SessionAlertProps): React.Node {
+export function SessionAlert(props: SessionAlertProps): JSX.Element | null {
   const { sessionStatus, sessionStatusInfo, className, onResetClick } = props
   const sessionError = useSelector(getSessionError)
 
diff --git a/app/src/pages/Run/RunLog/index.ts b/app/src/pages/Run/RunLog/index.ts
index 7ae3cc7b799..8e674aeb970 100644
--- a/app/src/pages/Run/RunLog/index.ts
+++ b/app/src/pages/Run/RunLog/index.ts
@@ -1,6 +1,4 @@
-// @flow
-import * as React from 'react'
-import { connect } from 'react-redux'
+import { connect, MapDispatchToProps } from 'react-redux'
 
 import {
   actions as robotActions,
@@ -9,34 +7,21 @@ import {
 
 import { CommandList } from './CommandList'
 
-import type { State, Dispatch } from '../../../redux/types'
+import type { State } from '../../../redux/types'
 import type { SessionStatus, SessionStatusInfo } from '../../../redux/robot'
-import type { CommandListProps } from './CommandList'
 
 export { ConfirmCancelModal } from './ConfirmCancelModal'
 
-type SP = {|
-  commands: Array<any>,
-  sessionStatus: SessionStatus,
-  sessionStatusInfo: SessionStatusInfo,
-  showSpinner: boolean,
-|}
-
-type DP = {|
-  onResetClick: () => mixed,
-|}
-
-export const RunLog: React.AbstractComponent<{||}> = connect<
-  CommandListProps,
-  {||},
-  _,
-  _,
-  _,
-  _
->(
-  mapStateToProps,
-  mapDispatchToProps
-)(CommandList)
+interface SP {
+  commands: any[]
+  sessionStatus: SessionStatus
+  sessionStatusInfo: SessionStatusInfo
+  showSpinner: boolean
+}
+
+interface DP {
+  onResetClick: () => unknown
+}
 
 function mapStateToProps(state: State): SP {
   return {
@@ -49,8 +34,10 @@ function mapStateToProps(state: State): SP {
   }
 }
 
-function mapDispatchToProps(dispatch: Dispatch): DP {
+const mapDispatchToProps: MapDispatchToProps<DP, {}> = dispatch => {
   return {
     onResetClick: () => dispatch(robotActions.refreshSession()),
   }
 }
+
+export const RunLog = connect(mapStateToProps, mapDispatchToProps)(CommandList)
diff --git a/app/src/pages/Run/RunPanel/ModuleLiveStatusCards/CardContentRow.tsx b/app/src/pages/Run/RunPanel/ModuleLiveStatusCards/CardContentRow.tsx
index 7e71b369547..9ecc83292de 100644
--- a/app/src/pages/Run/RunPanel/ModuleLiveStatusCards/CardContentRow.tsx
+++ b/app/src/pages/Run/RunPanel/ModuleLiveStatusCards/CardContentRow.tsx
@@ -1,14 +1,13 @@
-// @flow
 import * as React from 'react'
 import cx from 'classnames'
 import styles from './styles.css'
 
-export type CardContentRowProps = {|
-  children: React.Node,
-  className?: string,
-|}
+export interface CardContentRowProps {
+  children: React.ReactNode
+  className?: string
+}
 
-export function CardContentRow(props: CardContentRowProps): React.Node {
+export function CardContentRow(props: CardContentRowProps): JSX.Element {
   return (
     <div className={cx(styles.card_row, props.className)}>{props.children}</div>
   )
diff --git a/app/src/pages/Run/RunPanel/ModuleLiveStatusCards/MagDeckCard.tsx b/app/src/pages/Run/RunPanel/ModuleLiveStatusCards/MagDeckCard.tsx
index 31ee43a92e9..68fa1164508 100644
--- a/app/src/pages/Run/RunPanel/ModuleLiveStatusCards/MagDeckCard.tsx
+++ b/app/src/pages/Run/RunPanel/ModuleLiveStatusCards/MagDeckCard.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { Box, SPACING_3 } from '@opentrons/components'
 import { getModuleDisplayName } from '@opentrons/shared-data'
@@ -12,18 +11,18 @@ import type {
   ModuleCommand,
 } from '../../../../redux/modules/types'
 
-type Props = {|
-  module: MagneticModule,
-  slot: string,
-  isCardExpanded: boolean,
-  toggleCard: boolean => mixed,
+interface Props {
+  module: MagneticModule
+  slot: string
+  isCardExpanded: boolean
+  toggleCard: () => unknown
   sendModuleCommand: (
     moduleId: string,
     command: ModuleCommand,
-    args?: Array<mixed>
-  ) => mixed,
-  controlDisabledReason: string | null,
-|}
+    args?: unknown[]
+  ) => unknown
+  controlDisabledReason: string | null
+}
 
 export const MagDeckCard = ({
   module,
@@ -32,7 +31,7 @@ export const MagDeckCard = ({
   sendModuleCommand,
   controlDisabledReason,
   slot,
-}: Props): React.Node => (
+}: Props): JSX.Element => (
   <StatusCard
     header={slot}
     title={getModuleDisplayName(module.model)}
diff --git a/app/src/pages/Run/RunPanel/ModuleLiveStatusCards/StatusCard.tsx b/app/src/pages/Run/RunPanel/ModuleLiveStatusCards/StatusCard.tsx
index b09914cbbce..9c940aa1fcf 100644
--- a/app/src/pages/Run/RunPanel/ModuleLiveStatusCards/StatusCard.tsx
+++ b/app/src/pages/Run/RunPanel/ModuleLiveStatusCards/StatusCard.tsx
@@ -1,27 +1,25 @@
-// @flow
-//
 import * as React from 'react'
 import styles from './styles.css'
 import { CollapsibleItem } from '@opentrons/components'
 
-type Props = {|
+interface Props {
   /** Slot number the module is in */
-  header: string,
+  header: string
   /** Title for the card */
-  title: string,
+  title: string
   /** Card Content, each child will be separated with a grey bottom border */
-  children: ?React.Node,
+  children?: React.ReactNode
   /** Optional className for card contents */
-  className?: string,
-  isCardExpanded: boolean,
-  toggleCard: boolean => mixed,
-|}
+  className?: string
+  isCardExpanded: boolean
+  toggleCard: () => unknown
+}
 
-export function StatusCard(props: Props): React.Node {
+export function StatusCard(props: Props): JSX.Element {
   return (
     <CollapsibleItem
       className={styles.status_card}
-      onCollapseToggle={() => props.toggleCard(!props.isCardExpanded)}
+      onCollapseToggle={props.toggleCard}
       header={`Slot ${props.header}`}
       title={props.title}
       collapsed={!props.isCardExpanded}
diff --git a/app/src/pages/Run/RunPanel/ModuleLiveStatusCards/StatusItem.tsx b/app/src/pages/Run/RunPanel/ModuleLiveStatusCards/StatusItem.tsx
index bb8231de07f..561dce63df8 100644
--- a/app/src/pages/Run/RunPanel/ModuleLiveStatusCards/StatusItem.tsx
+++ b/app/src/pages/Run/RunPanel/ModuleLiveStatusCards/StatusItem.tsx
@@ -1,10 +1,11 @@
-// @flow
 import * as React from 'react'
 import styles from './styles.css'
 
-type Props = {| status: string |}
+interface Props {
+  status: string
+}
 
-export function StatusItem(props: Props): React.Node {
+export function StatusItem(props: Props): JSX.Element {
   return (
     <div className={styles.status_item_wrapper}>
       <span className={styles.label}>Status: </span>
diff --git a/app/src/pages/Run/RunPanel/ModuleLiveStatusCards/TempDeckCard.tsx b/app/src/pages/Run/RunPanel/ModuleLiveStatusCards/TempDeckCard.tsx
index e9870c49758..7cb9dcfbab6 100644
--- a/app/src/pages/Run/RunPanel/ModuleLiveStatusCards/TempDeckCard.tsx
+++ b/app/src/pages/Run/RunPanel/ModuleLiveStatusCards/TempDeckCard.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { Box, SPACING_3 } from '@opentrons/components'
 import { getModuleDisplayName } from '@opentrons/shared-data'
@@ -14,18 +13,18 @@ import type {
   ModuleCommand,
 } from '../../../../redux/modules/types'
 
-type Props = {|
-  module: TemperatureModule,
+interface Props {
+  module: TemperatureModule
   sendModuleCommand: (
     moduleId: string,
     command: ModuleCommand,
-    args?: Array<mixed>
-  ) => mixed,
-  controlDisabledReason: string | null,
-  isCardExpanded: boolean,
-  toggleCard: boolean => mixed,
-  slot: string,
-|}
+    args?: unknown[]
+  ) => unknown
+  controlDisabledReason: string | null
+  isCardExpanded: boolean
+  toggleCard: () => unknown
+  slot: string
+}
 
 export const TempDeckCard = ({
   module,
@@ -34,7 +33,7 @@ export const TempDeckCard = ({
   isCardExpanded,
   toggleCard,
   slot,
-}: Props): React.Node => (
+}: Props): JSX.Element => (
   <StatusCard
     header={slot}
     title={getModuleDisplayName(module.model)}
diff --git a/app/src/pages/Run/RunPanel/ModuleLiveStatusCards/ThermocyclerCard.tsx b/app/src/pages/Run/RunPanel/ModuleLiveStatusCards/ThermocyclerCard.tsx
index 38139675d04..0d135168725 100644
--- a/app/src/pages/Run/RunPanel/ModuleLiveStatusCards/ThermocyclerCard.tsx
+++ b/app/src/pages/Run/RunPanel/ModuleLiveStatusCards/ThermocyclerCard.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import cx from 'classnames'
 import { Box, LabeledValue, SPACING_3 } from '@opentrons/components'
@@ -25,10 +24,10 @@ const TIME_REMAINING_FOR_STEP = 'Time remaining for step:'
 const TimeRemaining = ({
   holdTime,
   title,
-}: {|
-  holdTime: ?number,
-  title: string,
-|}) => (
+}: {
+  holdTime: number | null | undefined
+  title: string
+}): JSX.Element => (
   <span
     className={cx(styles.inline_labeled_value, styles.time_remaining_wrapper)}
   >
@@ -37,20 +36,20 @@ const TimeRemaining = ({
   </span>
 )
 
-type CycleInfoProps = {|
-  totalCycleCount: ?number,
-  currentCycleIndex: ?number,
-  totalStepCount: ?number,
-  currentStepIndex: ?number,
-  holdTime: ?number,
-|}
+interface CycleInfoProps {
+  totalCycleCount: number | null | undefined
+  currentCycleIndex: number | null | undefined
+  totalStepCount: number | null | undefined
+  currentStepIndex: number | null | undefined
+  holdTime: number | null | undefined
+}
 const CycleInfo = ({
   totalCycleCount,
   currentCycleIndex,
   totalStepCount,
   currentStepIndex,
   holdTime,
-}: CycleInfoProps) => {
+}: CycleInfoProps): JSX.Element | null => {
   if (
     totalCycleCount == null ||
     currentCycleIndex == null ||
@@ -88,18 +87,18 @@ const CycleInfo = ({
   )
 }
 
-type Props = {|
-  module: ThermocyclerModule,
+interface Props {
+  module: ThermocyclerModule
   sendModuleCommand: (
     moduleId: string,
     command: ModuleCommand,
-    args?: Array<mixed>
-  ) => mixed,
-  slot: string,
-  controlDisabledReason: string | null,
-  isCardExpanded: boolean,
-  toggleCard: boolean => mixed,
-|}
+    args?: unknown[]
+  ) => unknown
+  slot: string
+  controlDisabledReason: string | null
+  isCardExpanded: boolean
+  toggleCard: () => unknown
+}
 
 export const ThermocyclerCard = ({
   module,
@@ -108,7 +107,7 @@ export const ThermocyclerCard = ({
   isCardExpanded,
   toggleCard,
   slot,
-}: Props): React.Node => {
+}: Props): JSX.Element => {
   const {
     currentTemp,
     targetTemp,
diff --git a/app/src/pages/Run/RunPanel/ModuleLiveStatusCards/index.tsx b/app/src/pages/Run/RunPanel/ModuleLiveStatusCards/index.tsx
index a4f3e9b1722..fffcd4eda79 100644
--- a/app/src/pages/Run/RunPanel/ModuleLiveStatusCards/index.tsx
+++ b/app/src/pages/Run/RunPanel/ModuleLiveStatusCards/index.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { useSelector } from 'react-redux'
 
@@ -15,7 +14,7 @@ import { TempDeckCard } from './TempDeckCard'
 import { MagDeckCard } from './MagDeckCard'
 import { ThermocyclerCard } from './ThermocyclerCard'
 
-export const ModuleLiveStatusCards = (): React.Node => {
+export const ModuleLiveStatusCards = (): JSX.Element | null => {
   const matchedModules = useSelector(getMatchedModules)
   const sendModuleCommand = useSendModuleCommand()
   const controlDisabledReason = useSelector(getModuleControlsDisabled)
diff --git a/app/src/pages/Run/RunPanel/RunControls.tsx b/app/src/pages/Run/RunPanel/RunControls.tsx
index 79f6a8f624b..d16b59c2985 100644
--- a/app/src/pages/Run/RunPanel/RunControls.tsx
+++ b/app/src/pages/Run/RunPanel/RunControls.tsx
@@ -1,4 +1,3 @@
-// @flow
 // play pause run buttons for sidepanel
 import * as React from 'react'
 import { OutlineButton, HoverTooltip } from '@opentrons/components'
@@ -13,20 +12,20 @@ const DOOR_OPEN_RUN = 'Please close the robot door before running this protocol'
 
 const DOOR_OPEN_RESUME = 'Please close the robot door before resuming'
 
-export type RunControlsProps = {|
-  disabled: boolean,
-  modulesReady: boolean,
-  isReadyToRun: boolean,
-  isPaused: boolean,
-  isRunning: boolean,
-  isBlocked: boolean,
-  onRunClick: () => mixed,
-  onPauseClick: () => mixed,
-  onResumeClick: () => mixed,
-  onResetClick: () => mixed,
-|}
+export interface RunControlsProps {
+  disabled: boolean
+  modulesReady: boolean
+  isReadyToRun: boolean
+  isPaused: boolean
+  isRunning: boolean
+  isBlocked: boolean
+  onRunClick: () => unknown
+  onPauseClick: () => unknown
+  onResumeClick: () => unknown
+  onResetClick: () => unknown
+}
 
-export function RunControls(props: RunControlsProps): React.Node {
+export function RunControls(props: RunControlsProps): JSX.Element {
   const {
     disabled,
     modulesReady,
@@ -45,7 +44,7 @@ export function RunControls(props: RunControlsProps): React.Node {
   const pauseResumeText = isPaused ? 'Resume' : 'Pause'
   const controlsDisabled = isConfirmCancelOpen || disabled
 
-  const handleCancelClick = () => {
+  const handleCancelClick: React.MouseEventHandler = () => {
     onPauseClick()
     setConfirmCancelOpen(true)
   }
diff --git a/app/src/pages/Run/RunPanel/RunTimer.tsx b/app/src/pages/Run/RunPanel/RunTimer.tsx
index 53bf846bc50..fab47dfbbbf 100644
--- a/app/src/pages/Run/RunPanel/RunTimer.tsx
+++ b/app/src/pages/Run/RunPanel/RunTimer.tsx
@@ -1,14 +1,13 @@
-// @flow
 import * as React from 'react'
 
 import styles from './styles.css'
 
-export type RunTimerProps = {|
-  startTime: string | null,
-  runTime: string,
-|}
+export interface RunTimerProps {
+  startTime: string | null
+  runTime: string
+}
 
-export function RunTimer(props: RunTimerProps): React.Node {
+export function RunTimer(props: RunTimerProps): JSX.Element {
   const { startTime, runTime } = props
   const startTimeStamp = startTime ?? ''
 
diff --git a/app/src/pages/Run/RunPanel/__tests__/RunTimer.test.tsx b/app/src/pages/Run/RunPanel/__tests__/RunTimer.test.tsx
index f0ae48401fe..614a6e23a96 100644
--- a/app/src/pages/Run/RunPanel/__tests__/RunTimer.test.tsx
+++ b/app/src/pages/Run/RunPanel/__tests__/RunTimer.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { mount } from 'enzyme'
 
diff --git a/app/src/pages/Run/RunPanel/index.tsx b/app/src/pages/Run/RunPanel/index.tsx
index 43120d029c3..579b9ad5850 100644
--- a/app/src/pages/Run/RunPanel/index.tsx
+++ b/app/src/pages/Run/RunPanel/index.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { connect } from 'react-redux'
 
@@ -13,27 +12,28 @@ import { RunTimer } from './RunTimer'
 import { RunControls } from './RunControls'
 import { ModuleLiveStatusCards } from './ModuleLiveStatusCards'
 
-import type { State, Dispatch } from '../../../redux/types'
+import type { MapDispatchToProps } from 'react-redux'
+import type { State } from '../../../redux/types'
 
-type SP = {|
-  isRunning: boolean,
-  isPaused: boolean,
-  startTime: string | null,
-  isReadyToRun: boolean,
-  isBlocked: boolean,
-  modulesReady: boolean,
-  runTime: string,
-  disabled: boolean,
-|}
+interface SP {
+  isRunning: boolean
+  isPaused: boolean
+  startTime: string | null
+  isReadyToRun: boolean
+  isBlocked: boolean
+  modulesReady: boolean
+  runTime: string
+  disabled: boolean
+}
 
-type DP = {|
-  onRunClick: () => mixed,
-  onPauseClick: () => mixed,
-  onResumeClick: () => mixed,
-  onResetClick: () => mixed,
-|}
+interface DP {
+  onRunClick: () => unknown
+  onPauseClick: () => unknown
+  onResumeClick: () => unknown
+  onResetClick: () => unknown
+}
 
-type Props = {| ...SP, ...DP |}
+type Props = SP & DP
 
 const mapStateToProps = (state: State): SP => ({
   isRunning: robotSelectors.getIsRunning(state),
@@ -49,14 +49,14 @@ const mapStateToProps = (state: State): SP => ({
     robotSelectors.getSessionLoadInProgress(state),
 })
 
-const mapDispatchToProps = (dispatch: Dispatch): DP => ({
+const mapDispatchToProps: MapDispatchToProps<DP, {}> = dispatch => ({
   onRunClick: () => dispatch(robotActions.run()),
   onPauseClick: () => dispatch(robotActions.pause()),
   onResumeClick: () => dispatch(robotActions.resume()),
   onResetClick: () => dispatch(robotActions.refreshSession()),
 })
 
-function RunPanelComponent(props: Props) {
+function RunPanelComponent(props: Props): JSX.Element {
   return (
     <SidePanel title="Execute Run">
       <SidePanelGroup>
@@ -79,14 +79,7 @@ function RunPanelComponent(props: Props) {
   )
 }
 
-export const RunPanel: React.AbstractComponent<{||}> = connect<
-  Props,
-  {||},
-  _,
-  _,
-  _,
-  _
->(
+export const RunPanel = connect(
   mapStateToProps,
   mapDispatchToProps
 )(RunPanelComponent)
diff --git a/app/src/pages/Run/index.tsx b/app/src/pages/Run/index.tsx
index 4fcee4ce829..9d05db0db6c 100644
--- a/app/src/pages/Run/index.tsx
+++ b/app/src/pages/Run/index.tsx
@@ -1,11 +1,10 @@
-// @flow
 // run task component
 import * as React from 'react'
 import { Page } from '../../atoms/Page'
 import { SessionHeader } from '../../organisms/SessionHeader'
 import { RunLog } from './RunLog'
 
-export function Run(): React.Node {
+export function Run(): JSX.Element {
   return (
     <Page titleBarProps={{ title: <SessionHeader /> }}>
       <RunLog />
diff --git a/app/src/pages/Upload/FileInfo/Continue.tsx b/app/src/pages/Upload/FileInfo/Continue.tsx
index d1267eb156f..bbaa9b5798c 100644
--- a/app/src/pages/Upload/FileInfo/Continue.tsx
+++ b/app/src/pages/Upload/FileInfo/Continue.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import cx from 'classnames'
 import { useSelector } from 'react-redux'
@@ -24,7 +23,7 @@ import {
 const PROCEED_TO_CALIBRATE = 'Proceed to Calibrate'
 const VERIFY_CALIBRATIONS = 'Verify pipette and labware calibrations'
 
-export function Continue(): React.Node {
+export function Continue(): JSX.Element {
   const { path, disabledReason } = useSelector(getCalibrateLocation)
   const [targetProps, tooltipProps] = useHoverTooltip({
     placement: TOOLTIP_LEFT,
@@ -36,7 +35,7 @@ export function Continue(): React.Node {
       <PrimaryBtn
         as={Link}
         to={disabledReason ? '#' : path}
-        className={cx({ disabled: disabledReason })}
+        className={cx({ disabled: Boolean(disabledReason) })}
         width={SIZE_5}
         marginBottom={SPACING_1}
         {...targetProps}
diff --git a/app/src/pages/Upload/FileInfo/InfoSection.tsx b/app/src/pages/Upload/FileInfo/InfoSection.tsx
index f6f0afd74ca..f325e2a1ddc 100644
--- a/app/src/pages/Upload/FileInfo/InfoSection.tsx
+++ b/app/src/pages/Upload/FileInfo/InfoSection.tsx
@@ -1,13 +1,12 @@
-// @flow
 import * as React from 'react'
 import styles from './styles.css'
 
-export type InfoSectionProps = {|
-  title: string,
-  children: React.Node,
-|}
+export interface InfoSectionProps {
+  title: string
+  children: React.ReactNode
+}
 
-export function InfoSection(props: InfoSectionProps): React.Node {
+export function InfoSection(props: InfoSectionProps): JSX.Element {
   return (
     <section className={styles.info_section}>
       <h3 className={styles.title}>{props.title}</h3>
diff --git a/app/src/pages/Upload/FileInfo/InformationCard.tsx b/app/src/pages/Upload/FileInfo/InformationCard.tsx
index b6d26f323c9..597142243bc 100644
--- a/app/src/pages/Upload/FileInfo/InformationCard.tsx
+++ b/app/src/pages/Upload/FileInfo/InformationCard.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { connect } from 'react-redux'
 import { format } from 'date-fns'
@@ -15,35 +14,28 @@ import { LabeledValue } from '@opentrons/components'
 import { InfoSection } from './InfoSection'
 import { SectionContentHalf, CardRow } from '../../../atoms/layout'
 
-import type { State, Dispatch } from '../../../redux/types'
+import type { State } from '../../../redux/types'
 
-type OP = {||}
-
-type SP = {|
-  name: ?string,
-  author: ?string,
-  lastUpdated: ?number,
-  method: ?string,
-  description: ?string,
-|}
+interface SP {
+  name?: string | null
+  author?: string | null
+  lastUpdated?: number | null
+  method?: string | null
+  description?: string | null
+}
 
-type Props = {| ...OP, ...SP, dispatch: Dispatch |}
+type Props = SP
 
 const INFO_TITLE = 'Information'
 const DESCRIPTION_TITLE = 'Description'
 const DATE_FORMAT = 'PPpp'
 
-export const InformationCard: React.AbstractComponent<OP> = connect<
-  Props,
-  OP,
-  SP,
-  _,
-  _,
-  _,
-  _
->(mapStateToProps)(InformationCardComponent)
+export const InformationCard = connect(
+  mapStateToProps,
+  {}
+)(InformationCardComponent)
 
-function InformationCardComponent(props: Props) {
+function InformationCardComponent(props: Props): JSX.Element {
   const { name, author, method, description } = props
   const lastUpdated = props.lastUpdated
     ? format(props.lastUpdated, DATE_FORMAT)
diff --git a/app/src/pages/Upload/FileInfo/InstrumentItem.tsx b/app/src/pages/Upload/FileInfo/InstrumentItem.tsx
index 65fb20f2a55..484bfe9a640 100644
--- a/app/src/pages/Upload/FileInfo/InstrumentItem.tsx
+++ b/app/src/pages/Upload/FileInfo/InstrumentItem.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { useTranslation } from 'react-i18next'
 import {
@@ -22,16 +21,16 @@ import type { PipetteCompatibility } from '../../../redux/pipettes/types'
 
 const AXIS_NAMES = ['x', 'y', 'z']
 
-export type InstrumentItemProps = {|
-  compatibility?: PipetteCompatibility,
-  mount?: string,
-  children: React.Node,
-  hidden?: boolean,
-  needsOffsetCalibration: boolean,
-  pipetteOffsetData?: [number, number, number] | null,
-|}
+export interface InstrumentItemProps {
+  compatibility?: PipetteCompatibility
+  mount?: string
+  children: React.ReactNode
+  hidden?: boolean
+  needsOffsetCalibration: boolean
+  pipetteOffsetData?: [number, number, number] | null
+}
 
-export function InstrumentItem(props: InstrumentItemProps): React.Node {
+export function InstrumentItem(props: InstrumentItemProps): JSX.Element | null {
   const {
     compatibility,
     mount,
@@ -42,7 +41,13 @@ export function InstrumentItem(props: InstrumentItemProps): React.Node {
   } = props
   const { t } = useTranslation(['protocol_calibration', 'protocol_info'])
   if (hidden) return null
+  // @ts-expect-error TODO: code change to commented code below
   const match = ['match', 'inexact_match'].includes(compatibility)
+  // const match = compatibility
+  //   ? (['match', 'inexact_match'] as PipetteCompatibility[]).includes(
+  //       compatibility
+  //     )
+  //   : Boolean(compatibility)
   return (
     <>
       <Flex
@@ -85,7 +90,7 @@ export function InstrumentItem(props: InstrumentItemProps): React.Node {
   )
 }
 
-function StatusIcon(props: {| match: boolean |}) {
+function StatusIcon(props: { match: boolean }): JSX.Element {
   const { match } = props
 
   const iconName = match ? 'check-circle' : 'checkbox-blank-circle-outline'
@@ -93,9 +98,9 @@ function StatusIcon(props: {| match: boolean |}) {
   return <Icon name={iconName} className={styles.status_icon} />
 }
 
-function BuildOffsetText(props: {|
-  offsetData: [number, number, number],
-|}): React.Node {
+function BuildOffsetText(props: {
+  offsetData: [number, number, number]
+}): JSX.Element {
   const { offsetData } = props
   const { t } = useTranslation('protocol_info')
   return (
diff --git a/app/src/pages/Upload/FileInfo/MissingItemWarning.tsx b/app/src/pages/Upload/FileInfo/MissingItemWarning.tsx
index b4c569cc6e5..46446d99af9 100644
--- a/app/src/pages/Upload/FileInfo/MissingItemWarning.tsx
+++ b/app/src/pages/Upload/FileInfo/MissingItemWarning.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { Link } from 'react-router-dom'
 import {
@@ -13,14 +12,16 @@ import {
 import styles from './styles.css'
 import { SectionContentHalf } from '../../../atoms/layout'
 
-export type MissingItemWarningProps = {|
-  missingItem: string,
-  urlLabel: string,
-  url: string,
-  isBlocking?: boolean,
-|}
+export interface MissingItemWarningProps {
+  missingItem: string
+  urlLabel: string
+  url: string
+  isBlocking?: boolean
+}
 
-export function MissingItemWarning(props: MissingItemWarningProps): React.Node {
+export function MissingItemWarning(
+  props: MissingItemWarningProps
+): JSX.Element {
   const { missingItem, urlLabel, url, isBlocking = false } = props
   return (
     <SectionContentHalf className={styles.align_center}>
diff --git a/app/src/pages/Upload/FileInfo/ProtocolLabwareCard.tsx b/app/src/pages/Upload/FileInfo/ProtocolLabwareCard.tsx
index 55764f85b39..ce6a5c57926 100644
--- a/app/src/pages/Upload/FileInfo/ProtocolLabwareCard.tsx
+++ b/app/src/pages/Upload/FileInfo/ProtocolLabwareCard.tsx
@@ -1,4 +1,3 @@
-// @flow
 // setup labware component
 import * as React from 'react'
 import { useSelector, useDispatch } from 'react-redux'
@@ -12,14 +11,16 @@ import {
 
 import type { State, Dispatch } from '../../../redux/types'
 
-export type ProtocolLabwareProps = {|
-  robotName: string,
-|}
+export interface ProtocolLabwareProps {
+  robotName: string
+}
 
 // TODO(mc, 2020-07-27): i18n
 const REQUIRED_LABWARE = 'Required Labware'
 
-export function ProtocolLabwareCard(props: ProtocolLabwareProps): React.Node {
+export function ProtocolLabwareCard(
+  props: ProtocolLabwareProps
+): JSX.Element | null {
   const { robotName } = props
   const dispatch = useDispatch<Dispatch>()
   const labwareList = useSelector((state: State) => {
diff --git a/app/src/pages/Upload/FileInfo/ProtocolLabwareList.tsx b/app/src/pages/Upload/FileInfo/ProtocolLabwareList.tsx
index 607d5e05550..ca611d19181 100644
--- a/app/src/pages/Upload/FileInfo/ProtocolLabwareList.tsx
+++ b/app/src/pages/Upload/FileInfo/ProtocolLabwareList.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { useTranslation } from 'react-i18next'
 
@@ -20,15 +19,15 @@ import {
 
 import type { LabwareSummary } from '../../../redux/calibration/types'
 
-export type ProtocolLabwareListProps = {|
-  labware: Array<LabwareSummary>,
-|}
+export interface ProtocolLabwareListProps {
+  labware: LabwareSummary[]
+}
 
 const TYPE_COL_STYLE = { marginRight: SPACING_AUTO }
 const QUANTITY_COL_STYLE = { width: '12.5%', marginX: SPACING_3 }
 const CAL_DATA_COL_STYLE = { width: '25%' }
 
-const renderCalValue = (axis: string, value: number): React.Node => (
+const renderCalValue = (axis: string, value: number): JSX.Element => (
   <>
     <Text as="span" fontWeight={FONT_WEIGHT_SEMIBOLD}>
       {axis.toUpperCase()}
@@ -41,7 +40,7 @@ const renderCalValue = (axis: string, value: number): React.Node => (
 
 export function ProtocolLabwareList(
   props: ProtocolLabwareListProps
-): React.Node {
+): JSX.Element {
   const { labware } = props
   const { t } = useTranslation(['protocol_info', 'protocol_calibration'])
   const [calDescTooltipTargetProps, calDescTooltipProps] = useHoverTooltip({
diff --git a/app/src/pages/Upload/FileInfo/ProtocolModulesCard.tsx b/app/src/pages/Upload/FileInfo/ProtocolModulesCard.tsx
index 158731f919c..1bda9703006 100644
--- a/app/src/pages/Upload/FileInfo/ProtocolModulesCard.tsx
+++ b/app/src/pages/Upload/FileInfo/ProtocolModulesCard.tsx
@@ -1,4 +1,3 @@
-// @flow
 // setup modules component
 import * as React from 'react'
 import { useSelector } from 'react-redux'
@@ -26,7 +25,7 @@ import type { SessionModule } from '../../../redux/robot/types'
 const TYPE_COL_STYLE = { marginRight: SPACING_AUTO }
 const QUANTITY_COL_STYLE = { width: '37.5%', marginX: SPACING_3 }
 
-export function ProtocolModulesCard(): React.Node {
+export function ProtocolModulesCard(): JSX.Element | null {
   const { t } = useTranslation('protocol_info')
   const modules = useSelector((state: State) => {
     return robotSelectors.getModules(state)
@@ -34,15 +33,14 @@ export function ProtocolModulesCard(): React.Node {
 
   if (modules.length < 1) return null
 
-  const moduleDetails: { [ModuleModel]: number } = modules.reduce(
-    (total, module: SessionModule) => {
-      total[module.model] = (total[module.model] || 0) + 1
-      return total
-    },
-    {}
-  )
+  const moduleDetails: { [model in ModuleModel]?: number } = modules.reduce<
+    { [model in ModuleModel]?: number }
+  >((total, module: SessionModule) => {
+    total[module.model] = (total[module.model] || 0) + 1
+    return total
+  }, {})
   const modulesInfo = Object.keys(moduleDetails).map(k => {
-    return { model: k, counts: moduleDetails[k] }
+    return { model: k as ModuleModel, counts: moduleDetails[k as ModuleModel] }
   })
 
   return (
diff --git a/app/src/pages/Upload/FileInfo/ProtocolPipettesCard.tsx b/app/src/pages/Upload/FileInfo/ProtocolPipettesCard.tsx
index 714941f6a65..6bdc6da972d 100644
--- a/app/src/pages/Upload/FileInfo/ProtocolPipettesCard.tsx
+++ b/app/src/pages/Upload/FileInfo/ProtocolPipettesCard.tsx
@@ -1,4 +1,3 @@
-// @flow
 // setup pipettes component
 import * as React from 'react'
 import { useDispatch, useSelector } from 'react-redux'
@@ -23,14 +22,16 @@ import styles from './styles.css'
 
 import type { State, Dispatch } from '../../../redux/types'
 
-export type ProtocolPipettesCardProps = {| robotName: string |}
+export interface ProtocolPipettesCardProps {
+  robotName: string
+}
 
 const inexactPipetteSupportArticle =
   'https://support.opentrons.com/en/articles/3450143-gen2-pipette-compatibility'
 
 export function ProtocolPipettesCard(
   props: ProtocolPipettesCardProps
-): React.Node {
+): JSX.Element | null {
   const { robotName } = props
   const { t } = useTranslation('protocol_info')
   const dispatch = useDispatch<Dispatch>()
@@ -78,14 +79,22 @@ export function ProtocolPipettesCard(
     <InfoSection title={t('instruments_title')}>
       <SectionContentHalf>
         {pipetteItemProps.map(itemProps => (
+          // itemProps && (
           <InstrumentItem
+            // @ts-expect-error TODO: do `itemProps && (` to prevent access when null
             key={itemProps.mount}
+            // @ts-expect-error TODO: do `itemProps && (` to prevent access when null
             compatibility={itemProps.compatibility}
+            // @ts-expect-error TODO: do `itemProps && (` to prevent access when null
             mount={itemProps.mount}
+            // @ts-expect-error TODO: do `itemProps && (` to prevent access when null
             hidden={itemProps.hidden}
+            // @ts-expect-error TODO: do `itemProps && (` to prevent access when null
             needsOffsetCalibration={itemProps.needsOffsetCalibration}
+            // @ts-expect-error TODO: do `itemProps && (` to prevent access when null
             pipetteOffsetData={itemProps.calibrationData?.offset}
           >
+            {/* @ts-expect-error TODO: do `itemProps && (` to prevent access when null */}
             {itemProps.displayName}
           </InstrumentItem>
         ))}
diff --git a/app/src/pages/Upload/FileInfo/__tests__/Continue.test.tsx b/app/src/pages/Upload/FileInfo/__tests__/Continue.test.tsx
index e040a941a96..8e9b08c10cd 100644
--- a/app/src/pages/Upload/FileInfo/__tests__/Continue.test.tsx
+++ b/app/src/pages/Upload/FileInfo/__tests__/Continue.test.tsx
@@ -1,40 +1,35 @@
-// @flow
 import * as React from 'react'
 import { Provider } from 'react-redux'
 import { StaticRouter } from 'react-router-dom'
 import { mount } from 'enzyme'
 import noop from 'lodash/noop'
+import { when } from 'jest-when'
 
 import * as navigation from '../../../../redux/nav'
 import { Tooltip } from '@opentrons/components'
 import { Continue } from '../Continue'
 
 import type { State } from '../../../../redux/types'
+import { NavLocation } from '../../../../redux/nav/types'
 
 jest.mock('../../../../redux/nav')
 
-const MOCK_STATE: State = ({ mockState: true }: any)
+const MOCK_STATE: State = { mockState: true } as any
 
 const MOCK_STORE = {
   getState: () => MOCK_STATE,
   dispatch: noop,
   subscribe: noop,
-}
+} as any
 
-const getCalibrateLocation: JestMockFn<
-  [State],
-  $Call<typeof navigation.getCalibrateLocation, State>
-> = navigation.getCalibrateLocation
-
-function stubSelector<R>(mock: JestMockFn<[State], R>, rVal: R) {
-  mock.mockImplementation(state => {
-    expect(state).toBe(MOCK_STATE)
-    return rVal
-  })
-}
+const getCalibrateLocation = navigation.getCalibrateLocation as jest.MockedFunction<
+  typeof navigation.getCalibrateLocation
+>
 
 describe('Continue to run or calibration button component', () => {
-  const render = (labwareCalibrated: boolean = false) => {
+  const render = (
+    labwareCalibrated: boolean = false
+  ): ReturnType<typeof mount> => {
     return mount(
       <Provider store={MOCK_STORE}>
         <StaticRouter context={{}} location={'/upload/file-info'}>
@@ -44,31 +39,31 @@ describe('Continue to run or calibration button component', () => {
     )
   }
 
-  const CALIBRATE_LOCATION_ENABLED = {
+  const CALIBRATE_LOCATION_ENABLED: NavLocation = {
     id: 'calibrate',
     path: '/calibrate',
     title: 'CALIBRATE',
     iconName: 'ot-calibrate',
     disabledReason: null,
-  }
+  } as any
 
-  const CALIBRATE_SELECTOR_DISABLED = {
+  const CALIBRATE_SELECTOR_DISABLED: NavLocation = {
     id: 'calibrate',
     path: '/calibrate',
     title: 'CALIBRATE',
     iconName: 'ot-calibrate',
     disabledReason: 'check your toolbox!',
-  }
-
-  beforeEach(() => {
-    stubSelector(getCalibrateLocation, CALIBRATE_LOCATION_ENABLED)
-  })
+  } as any
 
   afterEach(() => {
     jest.resetAllMocks()
   })
 
   it('renders a link to /calibrate when calibrate page is enabled', () => {
+    when(getCalibrateLocation)
+      .calledWith(MOCK_STATE)
+      .mockReturnValue(CALIBRATE_LOCATION_ENABLED)
+
     const wrapper = render()
     const link = wrapper.find('a')
     const tooltip = wrapper.find(Tooltip)
@@ -79,7 +74,10 @@ describe('Continue to run or calibration button component', () => {
   })
 
   it('renders a tooltip and a noop link when calibrate page is disabled', () => {
-    stubSelector(getCalibrateLocation, CALIBRATE_SELECTOR_DISABLED)
+    when(getCalibrateLocation)
+      .calledWith(MOCK_STATE)
+      .mockReturnValue(CALIBRATE_SELECTOR_DISABLED)
+
     const wrapper = render()
     const link = wrapper.find('a')
     const tooltip = wrapper.find(Tooltip)
diff --git a/app/src/pages/Upload/FileInfo/__tests__/FileInfo.test.tsx b/app/src/pages/Upload/FileInfo/__tests__/FileInfo.test.tsx
index 3e13defa643..1d39b5131d5 100644
--- a/app/src/pages/Upload/FileInfo/__tests__/FileInfo.test.tsx
+++ b/app/src/pages/Upload/FileInfo/__tests__/FileInfo.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { shallow } from 'enzyme'
 
diff --git a/app/src/pages/Upload/FileInfo/__tests__/ProtocolLabwareCard.test.tsx b/app/src/pages/Upload/FileInfo/__tests__/ProtocolLabwareCard.test.tsx
index 72fad21597d..69bb2e38f7f 100644
--- a/app/src/pages/Upload/FileInfo/__tests__/ProtocolLabwareCard.test.tsx
+++ b/app/src/pages/Upload/FileInfo/__tests__/ProtocolLabwareCard.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { mount } from 'enzyme'
 import { Provider } from 'react-redux'
@@ -13,7 +12,7 @@ import type { State } from '../../../../redux/types'
 
 jest.mock('../../../../redux/calibration')
 
-const MOCK_STATE: State = ({ mockState: true }: any)
+const MOCK_STATE: State = { mockState: true } as any
 
 const MOCK_STORE = {
   getState: () => MOCK_STATE,
@@ -22,28 +21,39 @@ const MOCK_STORE = {
 }
 const ROBOT_NAME = 'robotName'
 
-const getUniqueProtocolLabwareSummaries: JestMockFn<
-  [State, string],
-  $Call<typeof Calibration.getUniqueProtocolLabwareSummaries, State, string>
-> = Calibration.getUniqueProtocolLabwareSummaries
+const getUniqueProtocolLabwareSummaries = Calibration.getUniqueProtocolLabwareSummaries as jest.MockedFunction<
+  typeof Calibration.getUniqueProtocolLabwareSummaries
+>
 
-function stubSelector<R>(mock: JestMockFn<[State, string], R>, rVal: R) {
-  mock.mockImplementation((state, robotName) => {
-    expect(state).toBe(MOCK_STATE)
-    expect(robotName).toBe(ROBOT_NAME)
-    return rVal
-  })
+function stubSelector(
+  mock: jest.MockedFunction<
+    typeof Calibration.getUniqueProtocolLabwareSummaries
+  >,
+  rVal: ReturnType<typeof Calibration.getUniqueProtocolLabwareSummaries>
+): void {
+  mock.mockImplementation(
+    (
+      state,
+      robotName
+    ): ReturnType<typeof Calibration.getUniqueProtocolLabwareSummaries> => {
+      expect(state).toBe(MOCK_STATE)
+      expect(robotName).toBe(ROBOT_NAME)
+      return rVal
+    }
+  )
 }
 
 describe('ProtocolLabwareCard', () => {
-  const render = () => {
+  const render = (): ReturnType<typeof mount> => {
     return mount(<ProtocolLabwareCard robotName={ROBOT_NAME} />, {
       wrappingComponent: Provider,
       wrappingComponentProps: { store: MOCK_STORE },
     })
   }
 
-  const EMPTY_LABWARE = []
+  const EMPTY_LABWARE: ReturnType<
+    typeof Calibration.getUniqueProtocolLabwareSummaries
+  > = []
   const FULL_LABWARE = [
     {
       quantity: 2,
diff --git a/app/src/pages/Upload/FileInfo/__tests__/ProtocolLabwareList.test.tsx b/app/src/pages/Upload/FileInfo/__tests__/ProtocolLabwareList.test.tsx
index f5f1b48e065..e8527921304 100644
--- a/app/src/pages/Upload/FileInfo/__tests__/ProtocolLabwareList.test.tsx
+++ b/app/src/pages/Upload/FileInfo/__tests__/ProtocolLabwareList.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { mountWithProviders } from '@opentrons/components/__utils__'
 
diff --git a/app/src/pages/Upload/FileInfo/index.tsx b/app/src/pages/Upload/FileInfo/index.tsx
index f781552d8f3..7d78a18b209 100644
--- a/app/src/pages/Upload/FileInfo/index.tsx
+++ b/app/src/pages/Upload/FileInfo/index.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { useTranslation } from 'react-i18next'
 import {
@@ -22,17 +21,17 @@ import { ProtocolLabwareCard } from './ProtocolLabwareCard'
 import { Continue } from './Continue'
 import { UploadError } from '../UploadError'
 
-export type FileInfoProps = {|
-  robot: Robot,
-  filename: ?string,
-  uploadInProgress: boolean,
-  uploadError: ?{ message: string },
-  sessionLoaded: boolean,
-  sessionHasSteps: boolean,
-  showCustomLabwareWarning: boolean,
-|}
+export interface FileInfoProps {
+  robot: Robot
+  filename: string | null | undefined
+  uploadInProgress: boolean
+  uploadError: { message: string } | null | undefined
+  sessionLoaded: boolean
+  sessionHasSteps: boolean
+  showCustomLabwareWarning: boolean
+}
 
-export function FileInfo(props: FileInfoProps): React.Node {
+export function FileInfo(props: FileInfoProps): JSX.Element {
   const {
     robot,
     filename,
diff --git a/app/src/pages/Upload/UploadError/index.tsx b/app/src/pages/Upload/UploadError/index.tsx
index c51cbb3c7a0..2e67204df7a 100644
--- a/app/src/pages/Upload/UploadError/index.tsx
+++ b/app/src/pages/Upload/UploadError/index.tsx
@@ -1,4 +1,3 @@
-// @flow
 // upload summary component
 import * as React from 'react'
 import { Icon } from '@opentrons/components'
@@ -7,11 +6,11 @@ import styles from './styles.css'
 
 const UPLOAD_ERROR_MESSAGE = 'Your protocol could not be opened.'
 
-export type UploadErrorProps = {|
-  uploadError: { message: string },
-|}
+export interface UploadErrorProps {
+  uploadError: { message: string }
+}
 
-export function UploadError(props: UploadErrorProps): React.Node {
+export function UploadError(props: UploadErrorProps): JSX.Element {
   const { uploadError } = props
 
   return (
diff --git a/app/src/pages/Upload/UploadPanel/ConfirmUploadModal.tsx b/app/src/pages/Upload/UploadPanel/ConfirmUploadModal.tsx
index 610822126e1..949cd1b39a1 100644
--- a/app/src/pages/Upload/UploadPanel/ConfirmUploadModal.tsx
+++ b/app/src/pages/Upload/UploadPanel/ConfirmUploadModal.tsx
@@ -1,15 +1,16 @@
-// @flow
 import * as React from 'react'
 
 import { AlertModal } from '@opentrons/components'
 import { Portal } from '../../../App/portal'
 
-export type ConfirmUploadModalProps = {|
-  confirm: () => mixed,
-  cancel: () => mixed,
-|}
+export interface ConfirmUploadModalProps {
+  confirm: () => unknown
+  cancel: () => unknown
+}
 
-export function ConfirmUploadModal(props: ConfirmUploadModalProps): React.Node {
+export function ConfirmUploadModal(
+  props: ConfirmUploadModalProps
+): JSX.Element {
   return (
     <Portal>
       <AlertModal
diff --git a/app/src/pages/Upload/UploadPanel/Upload.tsx b/app/src/pages/Upload/UploadPanel/Upload.tsx
index cf76cbb1da7..2dd76e8df5d 100644
--- a/app/src/pages/Upload/UploadPanel/Upload.tsx
+++ b/app/src/pages/Upload/UploadPanel/Upload.tsx
@@ -1,18 +1,17 @@
-// @flow
 import * as React from 'react'
 import { UploadInput } from './UploadInput'
 import { ConfirmUploadModal } from './ConfirmUploadModal'
 import { UploadMenu } from './UploadMenu'
 
-export type UploadProps = {|
-  filename: ?string,
-  sessionLoaded: ?boolean,
-  createSession: (file: File) => mixed,
-|}
+export interface UploadProps {
+  filename: string | null | undefined
+  sessionLoaded: boolean | null | undefined
+  createSession: (file: File) => unknown
+}
 
-type UploadState = {|
-  uploadedFile: ?File,
-|}
+interface UploadState {
+  uploadedFile: File | null | undefined
+}
 
 export class Upload extends React.Component<UploadProps, UploadState> {
   constructor(props: UploadProps) {
@@ -20,24 +19,38 @@ export class Upload extends React.Component<UploadProps, UploadState> {
     this.state = { uploadedFile: null }
   }
 
-  onUpload: (
-    event: SyntheticInputEvent<HTMLInputElement> | SyntheticDragEvent<>
-  ) => void = event => {
-    let files: Array<File> = []
+  onUpload:
+    | React.ChangeEventHandler<HTMLInputElement>
+    | React.DragEventHandler = (
+    event: React.ChangeEvent<HTMLInputElement> | React.DragEvent
+  ) => {
+    let files: File[] = []
+
+    // @ts-expect-error TODO: use commented code below
     if (event.dataTransfer && event.dataTransfer.files) {
-      files = (event.dataTransfer.files: any)
+      // @ts-expect-error TODO: use commented code below
+      files = event.dataTransfer.files as any
+      // @ts-expect-error TODO: use commented code below
     } else if (event.target.files) {
-      files = (event.target.files: any)
+      // @ts-expect-error TODO: use commented code below
+      files = event.target.files as any
     }
 
+    //   if ('dataTransfer' in event && event.dataTransfer.files) {
+    //     files = event.dataTransfer.files as any
+    //   } else if ('files' in event.target && event.target?.files) {
+    //     files = event.target.files as any
+    //   }
+
     if (this.props.sessionLoaded) {
       this.setState({ uploadedFile: files[0] })
     } else {
       this.props.createSession(files[0])
     }
 
-    // $FlowFixMe(mc, 2020-05-31): only clear value for file input, not drag and drop
+    // @ts-expect-error TODO: use commented code below
     event.currentTarget.value = ''
+    // if ('value' in event.currentTarget) event.currentTarget.value = ''
   }
 
   confirmUpload: () => void = () => {
@@ -53,7 +66,7 @@ export class Upload extends React.Component<UploadProps, UploadState> {
     this.setState({ uploadedFile: null })
   }
 
-  render(): React.Node {
+  render(): JSX.Element {
     const { uploadedFile } = this.state
     const { filename } = this.props
 
diff --git a/app/src/pages/Upload/UploadPanel/UploadInput.tsx b/app/src/pages/Upload/UploadPanel/UploadInput.tsx
index 6d3214126c0..75d922df843 100644
--- a/app/src/pages/Upload/UploadPanel/UploadInput.tsx
+++ b/app/src/pages/Upload/UploadPanel/UploadInput.tsx
@@ -1,17 +1,14 @@
-// @flow
 import * as React from 'react'
 
 import { PrimaryButton, Icon } from '@opentrons/components'
 import styles from './upload-panel.css'
 
-export type UploadInputProps = {|
-  onUpload: (
-    SyntheticInputEvent<HTMLInputElement> | SyntheticDragEvent<>
-  ) => void,
-  isButton?: boolean,
-|}
+export interface UploadInputProps {
+  onUpload: React.EventHandler<React.MouseEvent | React.ChangeEvent>
+  isButton?: boolean
+}
 
-export function UploadInput(props: UploadInputProps): React.Node {
+export function UploadInput(props: UploadInputProps): JSX.Element {
   const { isButton, onUpload } = props
 
   const Label = isButton ? PrimaryButton : 'label'
@@ -20,15 +17,18 @@ export function UploadInput(props: UploadInputProps): React.Node {
 
   const labelProps = isButton
     ? {
-        Component: 'label',
-        iconName: 'ot-file',
+        Component: 'label' as React.ComponentProps<
+          typeof PrimaryButton
+        >['Component'],
+        iconName: 'ot-file' as React.ComponentProps<
+          typeof PrimaryButton
+        >['iconName'],
         className: styles.upload_button,
       }
     : { onDrop: onUpload, className: styles.file_drop }
 
   return (
     <div className={styles.upload}>
-      {/* $FlowFixMe(mc, 2021-03-18): resolve with TS conversion */}
       <Label {...labelProps}>
         {!isButton && <Icon name="upload" className={styles.file_drop_icon} />}
         {labelText}
diff --git a/app/src/pages/Upload/UploadPanel/UploadMenu.tsx b/app/src/pages/Upload/UploadPanel/UploadMenu.tsx
index b347a57f251..4df4d67cb7c 100644
--- a/app/src/pages/Upload/UploadPanel/UploadMenu.tsx
+++ b/app/src/pages/Upload/UploadPanel/UploadMenu.tsx
@@ -1,9 +1,8 @@
-// @flow
 import * as React from 'react'
 import { ListItem, Icon } from '@opentrons/components'
 import styles from './upload-panel.css'
 
-export function UploadMenu(): React.Node {
+export function UploadMenu(): JSX.Element {
   return (
     <ol className={styles.menu_list}>
       <ListItem
diff --git a/app/src/pages/Upload/UploadPanel/index.tsx b/app/src/pages/Upload/UploadPanel/index.tsx
index 0c7c4a3358d..6078914ec90 100644
--- a/app/src/pages/Upload/UploadPanel/index.tsx
+++ b/app/src/pages/Upload/UploadPanel/index.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { connect } from 'react-redux'
 
@@ -10,30 +9,18 @@ import { Upload } from './Upload'
 
 import type { State, Dispatch } from '../../../redux/types'
 
-type SP = {|
-  filename: ?string,
-  sessionLoaded: ?boolean,
-|}
-
-type DP = {|
-  createSession: File => mixed,
-|}
-
-type Props = {| ...SP, ...DP |}
-
-export const UploadPanel: React.AbstractComponent<{||}> = connect<
-  Props,
-  {||},
-  _,
-  _,
-  _,
-  _
->(
-  mapStateToProps,
-  mapDispatchToProps
-)(UploadPanelComponent)
+interface SP {
+  filename: string | null | undefined
+  sessionLoaded: boolean | null | undefined
+}
+
+interface DP {
+  createSession: (f: File) => any
+}
 
-function UploadPanelComponent(props: Props) {
+type Props = SP & DP
+
+function UploadPanelComponent(props: Props): JSX.Element {
   return (
     <SidePanel title="Protocol File">
       <Upload {...props} />
@@ -48,8 +35,14 @@ function mapStateToProps(state: State): SP {
   }
 }
 
-function mapDispatchToProps(dispatch: Dispatch): DP {
+const mapDispatchToProps = (dispatch: Dispatch): DP => {
   return {
     createSession: (file: File) => dispatch(openProtocol(file)),
   }
 }
+
+export const UploadPanel = connect(
+  mapStateToProps,
+  // @ts-expect-error TODO: thunk action messes up react-redux mapDispatchToProps type, should use hooks api here anyway
+  mapDispatchToProps
+)(UploadPanelComponent)
diff --git a/app/src/pages/Upload/index.tsx b/app/src/pages/Upload/index.tsx
index b7e547557e0..747357db903 100644
--- a/app/src/pages/Upload/index.tsx
+++ b/app/src/pages/Upload/index.tsx
@@ -1,4 +1,3 @@
-// @flow
 // upload progress container
 import * as React from 'react'
 import { connect } from 'react-redux'
@@ -11,29 +10,25 @@ import { getCustomLabware } from '../../redux/custom-labware'
 
 import { FileInfo } from './FileInfo'
 
-import type { ContextRouter } from 'react-router-dom'
-import type { State, Dispatch } from '../../redux/types'
+import type { RouteComponentProps } from 'react-router-dom'
+import type { State } from '../../redux/types'
 import type { Robot } from '../../redux/discovery/types'
 
-type OP = ContextRouter
+type OP = RouteComponentProps<{ path: string }>
 
-type SP = {|
-  robot: ?Robot,
-  filename: ?string,
-  uploadInProgress: boolean,
-  uploadError: ?{ message: string },
-  sessionLoaded: boolean,
-  sessionHasSteps: boolean,
-  showCustomLabwareWarning: boolean,
-|}
+interface SP {
+  robot: Robot | null | undefined
+  filename: string | null | undefined
+  uploadInProgress: boolean
+  uploadError: { message: string } | null | undefined
+  sessionLoaded: boolean
+  sessionHasSteps: boolean
+  showCustomLabwareWarning: boolean
+}
 
-type Props = {| ...OP, ...SP, dispatch: Dispatch |}
+type Props = OP & SP
 
-export const Upload: React.AbstractComponent<
-  $Diff<OP, ContextRouter>
-> = withRouter(
-  connect<Props, OP, SP, _, _, _>(mapStateToProps)(UploadComponent)
-)
+export const Upload = withRouter(connect(mapStateToProps, {})(UploadComponent))
 
 function mapStateToProps(state: State): SP {
   return {
@@ -51,7 +46,7 @@ function mapStateToProps(state: State): SP {
   }
 }
 
-function UploadComponent(props: Props) {
+function UploadComponent(props: Props): JSX.Element {
   const {
     robot,
     filename,
diff --git a/app/src/redux/alerts/__tests__/actions.test.ts b/app/src/redux/alerts/__tests__/actions.test.ts
index 443b0ac5471..9f93ab2f413 100644
--- a/app/src/redux/alerts/__tests__/actions.test.ts
+++ b/app/src/redux/alerts/__tests__/actions.test.ts
@@ -1,10 +1,9 @@
-// @flow
 import * as Config from '../../config'
 import * as Actions from '../actions'
 
 import type { AlertId } from '../types'
 
-const MOCK_ALERT_ID: AlertId = ('mockAlert': any)
+const MOCK_ALERT_ID: AlertId = 'mockAlert' as any
 
 describe('alerts actions', () => {
   it('should allow an alert to be triggered', () => {
diff --git a/app/src/redux/alerts/__tests__/epic.test.ts b/app/src/redux/alerts/__tests__/epic.test.ts
index 02fd3fdcf51..00c9d420fe0 100644
--- a/app/src/redux/alerts/__tests__/epic.test.ts
+++ b/app/src/redux/alerts/__tests__/epic.test.ts
@@ -1,24 +1,22 @@
-// @flow
 import { TestScheduler } from 'rxjs/testing'
 
 import * as Cfg from '../../config'
 import * as Actions from '../actions'
 import { alertsEpic } from '../epic'
 
-import type { State } from '../../types'
-import type { Config } from '../../config/types'
+import type { Action, State } from '../../types'
 import type { AlertId } from '../types'
 
 jest.mock('../../config/selectors')
 
-const getConfig: JestMockFn<[State], $Shape<Config> | null> = Cfg.getConfig
+const getConfig = Cfg.getConfig as jest.MockedFunction<typeof Cfg.getConfig>
 
-const MOCK_STATE: State = ({ mockState: true }: any)
-const MOCK_ALERT_1: AlertId = ('mockAlert1': any)
-const MOCK_ALERT_2: AlertId = ('mockAlert2': any)
+const MOCK_STATE: State = { mockState: true } as any
+const MOCK_ALERT_1: AlertId = 'mockAlert1' as any
+const MOCK_ALERT_2: AlertId = 'mockAlert2' as any
 
 describe('alerts epic', () => {
-  let testScheduler
+  let testScheduler: TestScheduler
 
   beforeEach(() => {
     testScheduler = new TestScheduler((actual, expected) => {
@@ -31,16 +29,16 @@ describe('alerts epic', () => {
   })
 
   it('should trigger a config:ADD_UNIQUE_VALUE to save persistent alert ignores', () => {
-    getConfig.mockImplementation(state => {
+    getConfig.mockImplementation((state: State) => {
       expect(state).toEqual(MOCK_STATE)
-      return { alerts: { ignored: [MOCK_ALERT_1] } }
+      return { alerts: { ignored: [MOCK_ALERT_1] } } as any
     })
 
     testScheduler.run(({ hot, expectObservable }) => {
-      const action$ = hot('-a', {
+      const action$ = hot<Action>('-a', {
         a: Actions.alertDismissed(MOCK_ALERT_2, true),
       })
-      const state$ = hot('s-', { s: MOCK_STATE })
+      const state$ = hot<State>('s-', { s: MOCK_STATE })
       const output$ = alertsEpic(action$, state$)
 
       expectObservable(output$).toBe('-a', {
diff --git a/app/src/redux/alerts/__tests__/reducer.test.ts b/app/src/redux/alerts/__tests__/reducer.test.ts
index e9f65a8ec0c..2f9e896ea31 100644
--- a/app/src/redux/alerts/__tests__/reducer.test.ts
+++ b/app/src/redux/alerts/__tests__/reducer.test.ts
@@ -1,15 +1,13 @@
-// @flow
-
 import * as Actions from '../actions'
 import { alertsReducer } from '../reducer'
 
-import type { AlertId } from '../types'
+import type { AlertId, AlertsState } from '../types'
 
-const MOCK_ALERT_ID: AlertId = ('mockAlert': any)
+const MOCK_ALERT_ID: AlertId = 'mockAlert' as any
 
 describe('alerts reducer', () => {
   it('should handle ALERT_TRIGGERED', () => {
-    const state = { active: [], ignored: [] }
+    const state: AlertsState = { active: [], ignored: [] } as any
     const action = Actions.alertTriggered(MOCK_ALERT_ID)
 
     expect(alertsReducer(state, action)).toEqual({
@@ -19,7 +17,7 @@ describe('alerts reducer', () => {
   })
 
   it('should handle ALERT_TRIGGERED if alert is already triggered', () => {
-    const state = { active: [MOCK_ALERT_ID], ignored: [] }
+    const state: AlertsState = { active: [MOCK_ALERT_ID], ignored: [] } as any
     const action = Actions.alertTriggered(MOCK_ALERT_ID)
 
     expect(alertsReducer(state, action)).toEqual({
@@ -29,7 +27,7 @@ describe('alerts reducer', () => {
   })
 
   it('should handle ALERT_DISMISSED', () => {
-    const state = { active: [MOCK_ALERT_ID], ignored: [] }
+    const state: AlertsState = { active: [MOCK_ALERT_ID], ignored: [] } as any
     const action = Actions.alertDismissed(MOCK_ALERT_ID)
 
     expect(alertsReducer(state, action)).toEqual({
@@ -39,7 +37,7 @@ describe('alerts reducer', () => {
   })
 
   it('should handle ALERT_DISMISSED if alert is already ignored', () => {
-    const state = { active: [], ignored: [MOCK_ALERT_ID] }
+    const state: AlertsState = { active: [], ignored: [MOCK_ALERT_ID] } as any
     const action = Actions.alertDismissed(MOCK_ALERT_ID)
 
     expect(alertsReducer(state, action)).toEqual({
@@ -49,7 +47,7 @@ describe('alerts reducer', () => {
   })
 
   it('should handle ALERT_TRIGGERED if alert is already ignored', () => {
-    const state = { active: [], ignored: [MOCK_ALERT_ID] }
+    const state: AlertsState = { active: [], ignored: [MOCK_ALERT_ID] } as any
     const action = Actions.alertTriggered(MOCK_ALERT_ID)
 
     expect(alertsReducer(state, action)).toEqual({
diff --git a/app/src/redux/alerts/__tests__/selectors.test.ts b/app/src/redux/alerts/__tests__/selectors.test.ts
index ecb290bb858..2e5ced3df3d 100644
--- a/app/src/redux/alerts/__tests__/selectors.test.ts
+++ b/app/src/redux/alerts/__tests__/selectors.test.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import * as Cfg from '../../config'
 import * as Selectors from '../selectors'
 
@@ -9,19 +7,19 @@ import type { AlertId } from '../types'
 
 jest.mock('../../config/selectors')
 
-const getConfig: JestMockFn<[State], $Shape<Config> | null> = Cfg.getConfig
+const getConfig = Cfg.getConfig as jest.MockedFunction<typeof Cfg.getConfig>
 
-const MOCK_ALERT_1: AlertId = ('mockAlert1': any)
-const MOCK_ALERT_2: AlertId = ('mockAlert2': any)
-const MOCK_IGNORED_ALERT: AlertId = ('mockIgnoredAlert': any)
+const MOCK_ALERT_1: AlertId = 'mockAlert1' as any
+const MOCK_ALERT_2: AlertId = 'mockAlert2' as any
+const MOCK_IGNORED_ALERT: AlertId = 'mockIgnoredAlert' as any
 
-const MOCK_CONFIG: $Shape<Config> = {
+const MOCK_CONFIG: Config = {
   alerts: { ignored: [MOCK_IGNORED_ALERT] },
-}
+} as any
 
 describe('alerts selectors', () => {
   const stubGetConfig = (state: State, value = MOCK_CONFIG) => {
-    getConfig.mockImplementation(s => {
+    getConfig.mockImplementation((s: State) => {
       expect(s).toEqual(state)
       return value
     })
@@ -32,9 +30,9 @@ describe('alerts selectors', () => {
   })
 
   it('should be able to get a list of active alerts', () => {
-    const state = ({
+    const state: State = {
       alerts: { active: [MOCK_ALERT_1, MOCK_ALERT_2], ignored: [] },
-    }: $Shape<State>)
+    } as any
 
     stubGetConfig(state)
 
@@ -45,11 +43,11 @@ describe('alerts selectors', () => {
   })
 
   it('should show no active alerts until config is loaded', () => {
-    const state = ({
+    const state: State = {
       alerts: { active: [MOCK_ALERT_1, MOCK_ALERT_2], ignored: [] },
-    }: $Shape<State>)
+    } as any
 
-    stubGetConfig(state, null)
+    stubGetConfig(state, null as any)
 
     expect(Selectors.getActiveAlerts(state)).toEqual([])
   })
@@ -57,9 +55,9 @@ describe('alerts selectors', () => {
   it('should filter ignored alerts from active alerts', () => {
     // the reducer should never let this state happen, but let's protect
     // against it in the selector, too
-    const state = ({
+    const state: State = {
       alerts: { active: [MOCK_ALERT_1, MOCK_ALERT_2], ignored: [MOCK_ALERT_2] },
-    }: $Shape<State>)
+    } as any
 
     stubGetConfig(state)
 
@@ -67,9 +65,9 @@ describe('alerts selectors', () => {
   })
 
   it('should filter perma-ignored alerts from active alerts', () => {
-    const state = ({
+    const state: State = {
       alerts: { active: [MOCK_ALERT_1, MOCK_IGNORED_ALERT], ignored: [] },
-    }: $Shape<State>)
+    } as any
 
     stubGetConfig(state)
 
@@ -77,7 +75,7 @@ describe('alerts selectors', () => {
   })
 
   it('should be able to tell you if an alert is perma-ignored', () => {
-    const state = ({ alerts: { active: [], ignored: [] } }: $Shape<State>)
+    const state: State = { alerts: { active: [], ignored: [] } } as any
 
     stubGetConfig(state)
 
@@ -91,9 +89,9 @@ describe('alerts selectors', () => {
   })
 
   it('should return null for getAlertIsPermanentlyIgnored if config not initialized', () => {
-    const state = ({ alerts: { active: [], ignored: [] } }: $Shape<State>)
+    const state: State = { alerts: { active: [], ignored: [] } } as any
 
-    stubGetConfig(state, null)
+    stubGetConfig(state, null as any)
 
     expect(
       Selectors.getAlertIsPermanentlyIgnored(state, MOCK_IGNORED_ALERT)
diff --git a/app/src/redux/alerts/actions.ts b/app/src/redux/alerts/actions.ts
index 1a409e6f91c..a1c169c4772 100644
--- a/app/src/redux/alerts/actions.ts
+++ b/app/src/redux/alerts/actions.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import { addUniqueConfigValue, subtractConfigValue } from '../config'
 import * as Constants from './constants'
 import * as Types from './types'
diff --git a/app/src/redux/alerts/constants.ts b/app/src/redux/alerts/constants.ts
index a06ebfb52f0..1a7a862ce3c 100644
--- a/app/src/redux/alerts/constants.ts
+++ b/app/src/redux/alerts/constants.ts
@@ -1,5 +1,3 @@
-// @flow
-
 // config path
 export const CONFIG_PATH_ALERTS_IGNORED = 'alerts.ignored'
 
diff --git a/app/src/redux/alerts/epic.ts b/app/src/redux/alerts/epic.ts
index 7121d2c7ccc..8a1915ccf32 100644
--- a/app/src/redux/alerts/epic.ts
+++ b/app/src/redux/alerts/epic.ts
@@ -1,4 +1,3 @@
-// @flow
 import { filter, map } from 'rxjs/operators'
 
 import { alertPermanentlyIgnored } from './actions'
@@ -12,7 +11,8 @@ import type { AlertDismissedAction } from './types'
 export const alertsEpic: Epic = (action$, state$) => {
   return action$.pipe(
     filter<Action, AlertDismissedAction>(
-      a => a.type === ALERT_DISMISSED && a.payload.remember
+      (a: Action): a is AlertDismissedAction =>
+        a.type === ALERT_DISMISSED && a.payload.remember
     ),
     map(dismiss => alertPermanentlyIgnored(dismiss.payload.alertId))
   )
diff --git a/app/src/redux/alerts/index.ts b/app/src/redux/alerts/index.ts
index a83a8968d29..cbc07bbdc33 100644
--- a/app/src/redux/alerts/index.ts
+++ b/app/src/redux/alerts/index.ts
@@ -1,4 +1,3 @@
-// @flow
 // app-wide alerts module
 // allows alerts to be displayed to the user, potentially in response to
 // asynchronous events, no matter where in the app the user is
diff --git a/app/src/redux/alerts/reducer.ts b/app/src/redux/alerts/reducer.ts
index 9e7efb0953f..e72ba20007b 100644
--- a/app/src/redux/alerts/reducer.ts
+++ b/app/src/redux/alerts/reducer.ts
@@ -1,8 +1,8 @@
-// @flow
 import union from 'lodash/union'
 import without from 'lodash/without'
 import * as Constants from './constants'
 
+import type { Reducer } from 'redux'
 import type { Action } from '../types'
 import type { AlertsState } from './types'
 
@@ -11,10 +11,10 @@ const INITIAL_STATE = {
   ignored: [],
 }
 
-export function alertsReducer(
-  state: AlertsState = INITIAL_STATE,
-  action: Action
-): AlertsState {
+export const alertsReducer: Reducer<AlertsState, Action> = (
+  state = INITIAL_STATE,
+  action
+) => {
   switch (action.type) {
     case Constants.ALERT_TRIGGERED: {
       const { active, ignored } = state
diff --git a/app/src/redux/alerts/selectors.ts b/app/src/redux/alerts/selectors.ts
index d85fc867c02..eb4f6a14d8d 100644
--- a/app/src/redux/alerts/selectors.ts
+++ b/app/src/redux/alerts/selectors.ts
@@ -1,25 +1,23 @@
-// @flow
 import { createSelector } from 'reselect'
 import without from 'lodash/without'
 
 import { getConfig } from '../config'
 
 import type { State } from '../types'
-import type { AlertId } from './types'
+import type { Config } from '../config/types'
+import type { AlertId, AlertsState } from './types'
 
 const getIgnoredAlertsFromConfig: (
   state: State
-) => null | $ReadOnlyArray<string> = createSelector(
+) => null | AlertId[] = createSelector(
   getConfig,
-  config => config?.alerts.ignored ?? null
+  (config: Config | null) => (config?.alerts.ignored as AlertId[]) ?? null
 )
 
-export const getActiveAlerts: (
-  state: State
-) => $ReadOnlyArray<AlertId> = createSelector(
+export const getActiveAlerts: (state: State) => AlertId[] = createSelector(
   state => state.alerts,
   getIgnoredAlertsFromConfig,
-  (alerts, ignoredAlerts) => {
+  (alerts: AlertsState, ignoredAlerts: null | AlertId[]): AlertId[] => {
     // only return active alerts if we know which alerts (if any) have been
     // permanently ignored
     return ignoredAlerts !== null
diff --git a/app/src/redux/alerts/types.ts b/app/src/redux/alerts/types.ts
index 1c18139de49..9c6b1d54339 100644
--- a/app/src/redux/alerts/types.ts
+++ b/app/src/redux/alerts/types.ts
@@ -1,27 +1,27 @@
-// @flow
-
-import typeof {
+import {
   ALERT_U2E_DRIVER_OUTDATED,
   ALERT_APP_UPDATE_AVAILABLE,
   ALERT_TRIGGERED,
   ALERT_DISMISSED,
-} from './constants.js'
+} from './constants'
 
-export type AlertId = ALERT_U2E_DRIVER_OUTDATED | ALERT_APP_UPDATE_AVAILABLE
+export type AlertId =
+  | typeof ALERT_U2E_DRIVER_OUTDATED
+  | typeof ALERT_APP_UPDATE_AVAILABLE
 
-export type AlertTriggeredAction = {|
-  type: ALERT_TRIGGERED,
-  payload: {| alertId: AlertId |},
-|}
+export interface AlertTriggeredAction {
+  type: typeof ALERT_TRIGGERED
+  payload: { alertId: AlertId }
+}
 
-export type AlertDismissedAction = {|
-  type: ALERT_DISMISSED,
-  payload: {| alertId: AlertId, remember: boolean |},
-|}
+export interface AlertDismissedAction {
+  type: typeof ALERT_DISMISSED
+  payload: { alertId: AlertId; remember: boolean }
+}
 
 export type AlertsAction = AlertTriggeredAction | AlertDismissedAction
 
-export type AlertsState = $ReadOnly<{|
-  active: $ReadOnlyArray<AlertId>,
-  ignored: $ReadOnlyArray<AlertId>,
-|}>
+export type AlertsState = Readonly<{
+  active: AlertId[]
+  ignored: AlertId[]
+}>
diff --git a/app/src/redux/analytics/__tests__/actions.test.ts b/app/src/redux/analytics/__tests__/actions.test.ts
index 3bf97cb72bf..5bb51d95550 100644
--- a/app/src/redux/analytics/__tests__/actions.test.ts
+++ b/app/src/redux/analytics/__tests__/actions.test.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import * as Actions from '../actions'
 import * as Constants from '../constants'
 
diff --git a/app/src/redux/analytics/__tests__/alerts-events.test.ts b/app/src/redux/analytics/__tests__/alerts-events.test.ts
index b2e7ba9152c..5bfeeb75f24 100644
--- a/app/src/redux/analytics/__tests__/alerts-events.test.ts
+++ b/app/src/redux/analytics/__tests__/alerts-events.test.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import { makeEvent } from '../make-event'
 
 import * as Alerts from '../../alerts'
@@ -7,8 +5,8 @@ import * as Alerts from '../../alerts'
 import type { State } from '../../types'
 import type { AlertId } from '../../alerts/types'
 
-const MOCK_STATE: State = ({ mockState: true }: any)
-const MOCK_ALERT_ID: AlertId = ('fizzbuzz': any)
+const MOCK_STATE: State = { mockState: true } as any
+const MOCK_ALERT_ID: AlertId = 'fizzbuzz' as any
 
 describe('custom labware analytics events', () => {
   it('should not trigger an event for random alerts', () => {
diff --git a/app/src/redux/analytics/__tests__/custom-labware-events.test.ts b/app/src/redux/analytics/__tests__/custom-labware-events.test.ts
index a56da69f282..1d39bf21d0e 100644
--- a/app/src/redux/analytics/__tests__/custom-labware-events.test.ts
+++ b/app/src/redux/analytics/__tests__/custom-labware-events.test.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import { makeEvent } from '../make-event'
 
 import * as CustomLabware from '../../custom-labware'
@@ -8,13 +6,13 @@ import * as LabwareFixtures from '../../custom-labware/__fixtures__'
 import type { State, Action } from '../../types'
 import type { AnalyticsEvent } from '../types'
 
-type EventSpec = {|
-  name: string,
-  action: Action,
-  expected: AnalyticsEvent,
-|}
+interface EventSpec {
+  name: string
+  action: Action
+  expected: AnalyticsEvent
+}
 
-const SPECS: Array<EventSpec> = [
+const SPECS: EventSpec[] = [
   {
     name: 'addCustomLabware success',
     action: CustomLabware.customLabwareList([], CustomLabware.ADD_LABWARE),
@@ -102,7 +100,7 @@ const SPECS: Array<EventSpec> = [
   },
 ]
 
-const MOCK_STATE: State = ({ mockState: true }: any)
+const MOCK_STATE: State = { mockState: true } as any
 
 describe('custom labware analytics events', () => {
   SPECS.forEach(spec => {
diff --git a/app/src/redux/analytics/__tests__/epic.test.ts b/app/src/redux/analytics/__tests__/epic.test.ts
index 34fb7a8fbbc..ca4f45fa5f0 100644
--- a/app/src/redux/analytics/__tests__/epic.test.ts
+++ b/app/src/redux/analytics/__tests__/epic.test.ts
@@ -10,11 +10,15 @@ import {
 import { makeEvent } from '../make-event'
 import { analyticsEpic } from '../epic'
 
+import type { Action, State } from '../../types'
+
 jest.mock('../make-event')
 jest.mock('../mixpanel')
 
+const makeEventMock = makeEvent as jest.MockedFunction<typeof makeEvent>
+
 describe('analytics epics', () => {
-  let testScheduler
+  let testScheduler: TestScheduler
 
   beforeEach(() => {
     testScheduler = new TestScheduler((actual, expected) => {
@@ -28,11 +32,13 @@ describe('analytics epics', () => {
 
   describe('initializeAnalyticsEpic', () => {
     it('initializes analytics on config:INITIALIZED', () => {
-      const action = Cfg.configInitialized({ analytics: { optedIn: true } })
+      const action = Cfg.configInitialized({
+        analytics: { optedIn: true },
+      } as any)
 
       testScheduler.run(({ hot, expectObservable, flush }) => {
-        const action$ = hot('-a', { a: action })
-        const state$ = hot('--', {})
+        const action$ = hot<Action>('-a', { a: action })
+        const state$ = hot<State>('--', {} as any)
         const output$ = analyticsEpic(action$, state$)
 
         expectObservable(output$).toBe('--')
@@ -51,10 +57,10 @@ describe('analytics epics', () => {
       const event = { name: 'fooEvent', properties: {} }
 
       testScheduler.run(({ hot, expectObservable, flush }) => {
-        makeEvent.mockReturnValueOnce([event])
+        makeEventMock.mockReturnValueOnce([event] as any)
 
-        const action$ = hot('-a', { a: action })
-        const state$ = hot('s-', { s: state })
+        const action$ = hot<Action>('-a', { a: action } as any)
+        const state$ = hot<State>('s-', { s: state } as any)
         const output$ = analyticsEpic(action$, state$)
 
         expectObservable(output$).toBe('--')
@@ -68,10 +74,10 @@ describe('analytics epics', () => {
       const state = { config: { analytics: { optedIn: true } } }
 
       testScheduler.run(({ hot, expectObservable, flush }) => {
-        makeEvent.mockReturnValueOnce([null])
+        makeEventMock.mockReturnValueOnce([null] as any)
 
-        const action$ = hot('-a', { a: action })
-        const state$ = hot('s-', { s: state })
+        const action$ = hot<Action>('-a', { a: action } as any)
+        const state$ = hot<State>('s-', { s: state } as any)
         const output$ = analyticsEpic(action$, state$)
 
         expectObservable(output$).toBe('--')
@@ -85,10 +91,10 @@ describe('analytics epics', () => {
       const state = { config: null }
 
       testScheduler.run(({ hot, expectObservable, flush }) => {
-        makeEvent.mockReturnValueOnce([null])
+        makeEventMock.mockReturnValueOnce([null] as any)
 
-        const action$ = hot('-a', { a: action })
-        const state$ = hot('s-', { s: state })
+        const action$ = hot<Action>('-a', { a: action } as any)
+        const state$ = hot<State>('s-', { s: state } as any)
         const output$ = analyticsEpic(action$, state$)
 
         expectObservable(output$).toBe('--')
@@ -104,8 +110,8 @@ describe('analytics epics', () => {
 
     it('sets opt-in', () => {
       testScheduler.run(({ hot, expectObservable, flush }) => {
-        const action$ = hot('----')
-        const state$ = hot('-a-b', { a: off, b: on })
+        const action$ = hot<Action>('----')
+        const state$ = hot<State>('-a-b', { a: off, b: on } as any)
         const output$ = analyticsEpic(action$, state$)
 
         expectObservable(output$).toBe('----')
@@ -116,8 +122,8 @@ describe('analytics epics', () => {
 
     it('sets opt-out', () => {
       testScheduler.run(({ hot, expectObservable, flush }) => {
-        const action$ = hot('----')
-        const state$ = hot('-a-b', { a: on, b: off })
+        const action$ = hot<Action>('----')
+        const state$ = hot<State>('-a-b', { a: on, b: off } as any)
         const output$ = analyticsEpic(action$, state$)
 
         expectObservable(output$).toBe('----')
@@ -128,8 +134,8 @@ describe('analytics epics', () => {
 
     it('noops on no change in status or if config not yet initialized', () => {
       testScheduler.run(({ hot, expectObservable, flush }) => {
-        const action$ = hot('----')
-        const state$ = hot('-a-b', { a: on, b: on })
+        const action$ = hot<Action>('----')
+        const state$ = hot<State>('-a-b', { a: on, b: on } as any)
         const output$ = analyticsEpic(action$, state$)
 
         expectObservable(output$).toBe('----')
@@ -138,8 +144,8 @@ describe('analytics epics', () => {
       })
 
       testScheduler.run(({ hot, expectObservable, flush }) => {
-        const action$ = hot('----')
-        const state$ = hot('-a-b', { a: off, b: off })
+        const action$ = hot<Action>('----')
+        const state$ = hot<State>('-a-b', { a: off, b: off } as any)
         const output$ = analyticsEpic(action$, state$)
 
         expectObservable(output$).toBe('----')
@@ -148,8 +154,11 @@ describe('analytics epics', () => {
       })
 
       testScheduler.run(({ hot, expectObservable, flush }) => {
-        const action$ = hot('----')
-        const state$ = hot('-a-b', { a: { config: null }, b: { config: null } })
+        const action$ = hot<Action>('----')
+        const state$ = hot<State>('-a-b', {
+          a: { config: null },
+          b: { config: null },
+        } as any)
         const output$ = analyticsEpic(action$, state$)
 
         expectObservable(output$).toBe('----')
@@ -158,8 +167,11 @@ describe('analytics epics', () => {
       })
 
       testScheduler.run(({ hot, expectObservable, flush }) => {
-        const action$ = hot('----')
-        const state$ = hot('-a-b', { a: { config: null }, b: on })
+        const action$ = hot<Action>('----')
+        const state$ = hot<State>('-a-b', {
+          a: { config: null },
+          b: on,
+        } as any)
         const output$ = analyticsEpic(action$, state$)
 
         expectObservable(output$).toBe('----')
diff --git a/app/src/redux/analytics/__tests__/hooks.test.tsx b/app/src/redux/analytics/__tests__/hooks.test.tsx
index ea30bd78d67..b4d23039fe2 100644
--- a/app/src/redux/analytics/__tests__/hooks.test.tsx
+++ b/app/src/redux/analytics/__tests__/hooks.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { Provider } from 'react-redux'
 import { mount } from 'enzyme'
@@ -10,16 +9,16 @@ import { useTrackEvent } from '../hooks'
 
 import type { State } from '../../types'
 import type { Config } from '../../config/types'
-import type { AnalyticsEvent, AnalyticsConfig } from '../types'
 
 jest.mock('../../config')
 jest.mock('../mixpanel')
 
-const getConfig: JestMockFn<[State], $Shape<Config> | null> = Cfg.getConfig
-const trackEvent: JestMockFn<[AnalyticsEvent, AnalyticsConfig], void> =
-  Mixpanel.trackEvent
+const getConfig = Cfg.getConfig as jest.MockedFunction<typeof Cfg.getConfig>
+const trackEvent = Mixpanel.trackEvent as jest.MockedFunction<
+  typeof Mixpanel.trackEvent
+>
 
-const MOCK_STATE: State = ({ mockState: true }: any)
+const MOCK_STATE: State = { mockState: true } as any
 
 const MOCK_ANALYTICS_CONFIG = {
   appId: 'abc',
@@ -29,9 +28,9 @@ const MOCK_ANALYTICS_CONFIG = {
 
 describe('analytics hooks', () => {
   beforeEach(() => {
-    getConfig.mockImplementation(state => {
+    getConfig.mockImplementation((state: State) => {
       expect(state).toBe(MOCK_STATE)
-      return { analytics: MOCK_ANALYTICS_CONFIG }
+      return { analytics: MOCK_ANALYTICS_CONFIG } as Config
     })
   })
 
@@ -40,9 +39,9 @@ describe('analytics hooks', () => {
   })
 
   describe('useTrackEvent', () => {
-    let trackEventResult
+    let trackEventResult: ReturnType<typeof useTrackEvent>
 
-    const TestTrackEvent = () => {
+    const TestTrackEvent = (): JSX.Element => {
       trackEventResult = useTrackEvent()
       return <></>
     }
diff --git a/app/src/redux/analytics/__tests__/make-event.test.ts b/app/src/redux/analytics/__tests__/make-event.test.ts
index 4457f2c3340..6aa21051394 100644
--- a/app/src/redux/analytics/__tests__/make-event.test.ts
+++ b/app/src/redux/analytics/__tests__/make-event.test.ts
@@ -14,13 +14,41 @@ jest.mock('../../discovery/selectors')
 jest.mock('../../pipettes/selectors')
 jest.mock('../../calibration/selectors')
 
+const getConnectedRobot = discoverySelectors.getConnectedRobot as jest.MockedFunction<
+  typeof discoverySelectors.getConnectedRobot
+>
+const getRunSeconds = robotSelectors.getRunSeconds as jest.MockedFunction<
+  typeof robotSelectors.getRunSeconds
+>
+const getAnalyticsSessionExitDetails = selectors.getAnalyticsSessionExitDetails as jest.MockedFunction<
+  typeof selectors.getAnalyticsSessionExitDetails
+>
+const getSessionInstrumentAnalyticsData = selectors.getSessionInstrumentAnalyticsData as jest.MockedFunction<
+  typeof selectors.getSessionInstrumentAnalyticsData
+>
+const getAnalyticsHealthCheckData = selectors.getAnalyticsHealthCheckData as jest.MockedFunction<
+  typeof selectors.getAnalyticsHealthCheckData
+>
+const getAnalyticsDeckCalibrationData = selectors.getAnalyticsDeckCalibrationData as jest.MockedFunction<
+  typeof selectors.getAnalyticsDeckCalibrationData
+>
+const getAnalyticsPipetteCalibrationData = selectors.getAnalyticsPipetteCalibrationData as jest.MockedFunction<
+  typeof selectors.getAnalyticsPipetteCalibrationData
+>
+const getAnalyticsTipLengthCalibrationData = selectors.getAnalyticsTipLengthCalibrationData as jest.MockedFunction<
+  typeof selectors.getAnalyticsTipLengthCalibrationData
+>
+const getProtocolAnalyticsData = selectors.getProtocolAnalyticsData as jest.MockedFunction<
+  typeof selectors.getProtocolAnalyticsData
+>
+
 describe('analytics events map', () => {
   beforeEach(() => {
     jest.resetAllMocks()
   })
 
   it('robot:CONNECT_RESPONSE -> robotConnected event', () => {
-    discoverySelectors.getConnectedRobot.mockImplementation(state => {
+    getConnectedRobot.mockImplementation((state: any): any => {
       if (state === 'wired') {
         return {
           name: 'wired',
@@ -50,26 +78,26 @@ describe('analytics events map', () => {
       return null
     })
 
-    const success = robotActions.connectResponse()
+    const success = robotActions.connectResponse(null)
     const failure = robotActions.connectResponse(new Error('AH'))
 
     return Promise.all([
-      expect(makeEvent(success, 'wired')).resolves.toEqual({
+      expect(makeEvent(success, 'wired' as any)).resolves.toEqual({
         name: 'robotConnect',
         properties: { method: 'usb', success: true, error: '' },
       }),
 
-      expect(makeEvent(failure, 'wired')).resolves.toEqual({
+      expect(makeEvent(failure, 'wired' as any)).resolves.toEqual({
         name: 'robotConnect',
         properties: { method: 'usb', success: false, error: 'AH' },
       }),
 
-      expect(makeEvent(success, 'wireless')).resolves.toEqual({
+      expect(makeEvent(success, 'wireless' as any)).resolves.toEqual({
         name: 'robotConnect',
         properties: { method: 'wifi', success: true, error: '' },
       }),
 
-      expect(makeEvent(failure, 'wireless')).resolves.toEqual({
+      expect(makeEvent(failure, 'wireless' as any)).resolves.toEqual({
         name: 'robotConnect',
         properties: { method: 'wifi', success: false, error: 'AH' },
       }),
@@ -77,15 +105,15 @@ describe('analytics events map', () => {
   })
 
   describe('events with protocol data', () => {
-    const protocolData = { foo: 'bar' }
+    const protocolData = { foo: 'bar' } as any
 
     beforeEach(() => {
-      selectors.getProtocolAnalyticsData.mockResolvedValue(protocolData)
+      getProtocolAnalyticsData.mockResolvedValue(protocolData)
     })
 
     it('robot:PROTOCOL_UPLOAD > protocolUploadRequest', () => {
-      const nextState = {}
-      const success = { type: 'protocol:UPLOAD', payload: {} }
+      const nextState = {} as any
+      const success = { type: 'protocol:UPLOAD', payload: {} } as any
 
       return expect(makeEvent(success, nextState)).resolves.toEqual({
         name: 'protocolUploadRequest',
@@ -94,12 +122,12 @@ describe('analytics events map', () => {
     })
 
     it('robot:SESSION_RESPONSE with upload in flight', () => {
-      const nextState = {}
+      const nextState = {} as any
       const success = {
         type: 'robot:SESSION_RESPONSE',
         payload: {},
         meta: { freshUpload: true },
-      }
+      } as any
 
       return expect(makeEvent(success, nextState)).resolves.toEqual({
         name: 'protocolUploadResponse',
@@ -108,12 +136,12 @@ describe('analytics events map', () => {
     })
 
     it('robot:SESSION_ERROR with upload in flight', () => {
-      const nextState = {}
+      const nextState = {} as any
       const failure = {
         type: 'robot:SESSION_ERROR',
         payload: { error: new Error('AH') },
         meta: { freshUpload: true },
-      }
+      } as any
 
       return expect(makeEvent(failure, nextState)).resolves.toEqual({
         name: 'protocolUploadResponse',
@@ -122,17 +150,17 @@ describe('analytics events map', () => {
     })
 
     it('robot:SESSION_RESPONSE/ERROR with no upload in flight', () => {
-      const nextState = {}
+      const nextState = {} as any
       const success = {
         type: 'robot:SESSION_RESPONSE',
         payload: {},
         meta: { freshUpload: false },
-      }
+      } as any
       const failure = {
         type: 'robot:SESSION_ERROR',
         payload: { error: new Error('AH') },
         meta: { freshUpload: false },
-      }
+      } as any
 
       return Promise.all([
         expect(makeEvent(success, nextState)).resolves.toBeNull(),
@@ -141,8 +169,8 @@ describe('analytics events map', () => {
     })
 
     it('robot:RUN -> runStart event', () => {
-      const state = {}
-      const action = { type: 'robot:RUN' }
+      const state = {} as any
+      const action = { type: 'robot:RUN' } as any
 
       return expect(makeEvent(action, state)).resolves.toEqual({
         name: 'runStart',
@@ -151,10 +179,10 @@ describe('analytics events map', () => {
     })
 
     it('robot:RUN_RESPONSE success -> runFinish event', () => {
-      const state = {}
-      const action = { type: 'robot:RUN_RESPONSE', error: false }
+      const state = {} as any
+      const action = { type: 'robot:RUN_RESPONSE', error: false } as any
 
-      robotSelectors.getRunSeconds.mockReturnValue(4)
+      getRunSeconds.mockReturnValue(4)
 
       return expect(makeEvent(action, state)).resolves.toEqual({
         name: 'runFinish',
@@ -163,14 +191,14 @@ describe('analytics events map', () => {
     })
 
     it('robot:RUN_RESPONSE error -> runFinish event', () => {
-      const state = {}
+      const state = {} as any
       const action = {
         type: 'robot:RUN_RESPONSE',
         error: true,
         payload: new Error('AH'),
-      }
+      } as any
 
-      robotSelectors.getRunSeconds.mockReturnValue(4)
+      getRunSeconds.mockReturnValue(4)
 
       return expect(makeEvent(action, state)).resolves.toEqual({
         name: 'runFinish',
@@ -184,10 +212,10 @@ describe('analytics events map', () => {
     })
 
     it('robot:PAUSE -> runPause event', () => {
-      const state = {}
-      const action = { type: 'robot:PAUSE' }
+      const state = {} as any
+      const action = { type: 'robot:PAUSE' } as any
 
-      robotSelectors.getRunSeconds.mockReturnValue(4)
+      getRunSeconds.mockReturnValue(4)
 
       return expect(makeEvent(action, state)).resolves.toEqual({
         name: 'runPause',
@@ -199,10 +227,10 @@ describe('analytics events map', () => {
     })
 
     it('robot:RESUME -> runResume event', () => {
-      const state = {}
-      const action = { type: 'robot:RESUME' }
+      const state = {} as any
+      const action = { type: 'robot:RESUME' } as any
 
-      robotSelectors.getRunSeconds.mockReturnValue(4)
+      getRunSeconds.mockReturnValue(4)
 
       return expect(makeEvent(action, state)).resolves.toEqual({
         name: 'runResume',
@@ -214,10 +242,10 @@ describe('analytics events map', () => {
     })
 
     it('robot:CANCEL-> runCancel event', () => {
-      const state = {}
-      const action = { type: 'robot:CANCEL' }
+      const state = {} as any
+      const action = { type: 'robot:CANCEL' } as any
 
-      robotSelectors.getRunSeconds.mockReturnValue(4)
+      getRunSeconds.mockReturnValue(4)
 
       return expect(makeEvent(action, state)).resolves.toEqual({
         name: 'runCancel',
@@ -229,7 +257,7 @@ describe('analytics events map', () => {
     })
 
     it('robotAdmin:RESET_CONFIG -> resetRobotConfig event', () => {
-      const state = {}
+      const state = {} as any
       const action = {
         type: 'robotAdmin:RESET_CONFIG',
         payload: {
@@ -239,7 +267,7 @@ describe('analytics events map', () => {
             bar: true,
           },
         },
-      }
+      } as any
       return expect(makeEvent(action, state)).resolves.toEqual({
         name: 'resetRobotConfig',
         properties: {
@@ -251,14 +279,14 @@ describe('analytics events map', () => {
 
   describe('events with calibration data', () => {
     it('analytics:PIPETTE_OFFSET_STARTED -> pipetteOffsetCalibrationStarted event', () => {
-      const state = {}
+      const state = {} as any
       const action = {
         type: 'analytics:PIPETTE_OFFSET_STARTED',
         payload: {
           someStuff: 'some-other-stuff',
         },
-      }
-      selectors.getAnalyticsPipetteCalibrationData.mockReturnValue({
+      } as any
+      getAnalyticsPipetteCalibrationData.mockReturnValue({
         markedBad: true,
         calibrationExists: true,
         pipetteModel: 'my pipette model',
@@ -275,14 +303,14 @@ describe('analytics events map', () => {
     })
 
     it('analytics:TIP_LENGTH_STARTED -> tipLengthCalibrationStarted event', () => {
-      const state = {}
+      const state = {} as any
       const action = {
         type: 'analytics:TIP_LENGTH_STARTED',
         payload: {
           someStuff: 'some-other-stuff',
         },
-      }
-      selectors.getAnalyticsTipLengthCalibrationData.mockReturnValue({
+      } as any
+      getAnalyticsTipLengthCalibrationData.mockReturnValue({
         markedBad: true,
         calibrationExists: true,
         pipetteModel: 'pipette-model',
@@ -299,18 +327,18 @@ describe('analytics events map', () => {
     })
 
     it('sessions:ENSURE_SESSION for deck cal -> deckCalibrationStarted event', () => {
-      const state = {}
+      const state = {} as any
       const action = {
         type: 'sessions:ENSURE_SESSION',
         payload: {
           sessionType: 'deckCalibration',
         },
-      }
-      selectors.getAnalyticsDeckCalibrationData.mockReturnValue({
+      } as any
+      getAnalyticsDeckCalibrationData.mockReturnValue({
         calibrationStatus: 'IDENTITY',
         markedBad: true,
         pipettes: { left: { model: 'my pipette model' } },
-      })
+      } as any)
 
       return expect(makeEvent(action, state)).resolves.toEqual({
         name: 'deckCalibrationStarted',
@@ -323,16 +351,16 @@ describe('analytics events map', () => {
     })
 
     it('sessions:ENSURE_SESSION for health check -> calibrationHealthCheckStarted event', () => {
-      const state = {}
+      const state = {} as any
       const action = {
         type: 'sessions:ENSURE_SESSION',
         payload: {
           sessionType: 'calibrationCheck',
         },
-      }
-      selectors.getAnalyticsHealthCheckData.mockReturnValue({
+      } as any
+      getAnalyticsHealthCheckData.mockReturnValue({
         pipettes: { left: { model: 'my pipette model' } },
-      })
+      } as any)
       return expect(makeEvent(action, state)).resolves.toEqual({
         name: 'calibrationHealthCheckStarted',
         properties: {
@@ -342,18 +370,18 @@ describe('analytics events map', () => {
     })
 
     it('sessions:ENSURE_SESSION for other session -> no event', () => {
-      const state = {}
+      const state = {} as any
       const action = {
         type: 'sessions:ENSURE_SESSION',
         payload: {
           sessionType: 'some-other-session',
         },
-      }
+      } as any
       return expect(makeEvent(action, state)).resolves.toBeNull()
     })
 
     it('sessions:CREATE_SESSION_COMMAND for exit -> {type}Exit', () => {
-      const state = {}
+      const state = {} as any
       const action = {
         type: 'sessions:CREATE_SESSION_COMMAND',
         payload: {
@@ -361,8 +389,8 @@ describe('analytics events map', () => {
           sessionId: 'seshid',
           command: { command: 'calibration.exitSession' },
         },
-      }
-      selectors.getAnalyticsSessionExitDetails.mockReturnValue({
+      } as any
+      getAnalyticsSessionExitDetails.mockReturnValue({
         sessionType: 'my-session-type',
         step: 'session-step',
       })
@@ -374,7 +402,7 @@ describe('analytics events map', () => {
     })
 
     it('sessions:CREATE_SESSION_COMMAND for loadLabware -> {type}Exit', () => {
-      const state = {}
+      const state = {} as any
       const action = {
         type: 'sessions:CREATE_SESSION_COMMAND',
         payload: {
@@ -389,8 +417,8 @@ describe('analytics events map', () => {
             },
           },
         },
-      }
-      selectors.getSessionInstrumentAnalyticsData.mockReturnValue({
+      } as any
+      getSessionInstrumentAnalyticsData.mockReturnValue({
         sessionType: 'my-session-type',
         pipetteModel: 'my-pipette-model',
       })
diff --git a/app/src/redux/analytics/__tests__/selectors.test.ts b/app/src/redux/analytics/__tests__/selectors.test.ts
index f377b9f706b..ba5eb91f67b 100644
--- a/app/src/redux/analytics/__tests__/selectors.test.ts
+++ b/app/src/redux/analytics/__tests__/selectors.test.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import * as Protocol from '../../protocol'
 import * as RobotSelectors from '../../robot/selectors'
 import * as Hash from '../hash'
@@ -14,20 +12,9 @@ import * as SessionFixtures from '../../sessions/__fixtures__'
 import * as SessionTypes from '../../sessions/types'
 
 import type { State } from '../../types'
-import type { Robot } from '../../discovery/types'
-import type { Config } from '../../config/types'
-import type { AttachedPipette } from '../../pipettes/types'
-import type {
-  PipetteOffsetCalibration,
-  TipLengthCalibration,
-  DeckCalibrationInfo,
-  DeckCalibrationStatus,
-} from '../../calibration/types'
 
 import type { DeckCalibrationSessionDetails } from '../../sessions/deck-calibration/types'
 
-type MockState = $Shape<{| ...State, config: null | $Shape<Config> |}>
-
 jest.mock('../../protocol/selectors')
 jest.mock('../../robot/selectors')
 jest.mock('../../calibration/selectors')
@@ -37,10 +24,10 @@ jest.mock('../../pipettes/selectors')
 jest.mock('../hash')
 
 describe('analytics selectors', () => {
-  let mockState: MockState
+  let mockState: State
 
   beforeEach(() => {
-    mockState = ({ mockState: true }: any)
+    mockState = { mockState: true } as any
   })
 
   afterEach(() => {
@@ -49,16 +36,16 @@ describe('analytics selectors', () => {
 
   describe('analytics config selectors', () => {
     it('should return null with getAnalyticsConfig if no config', () => {
-      const mockState: MockState = { config: null }
+      const mockState = { config: null } as any
       expect(Selectors.getAnalyticsConfig(mockState)).toBe(null)
     })
 
     it('should return config.analytics with getAnalyticsConfig', () => {
-      const mockState: MockState = {
+      const mockState = {
         config: {
           analytics: { appId: 'foobar', optedIn: true, seenOptIn: true },
         },
-      }
+      } as any
       expect(Selectors.getAnalyticsConfig(mockState)).toEqual({
         appId: 'foobar',
         optedIn: true,
@@ -67,81 +54,72 @@ describe('analytics selectors', () => {
     })
 
     it('should return false with getAnalyticsOptedIn if no config', () => {
-      const mockState: MockState = { config: null }
+      const mockState = { config: null } as any
       expect(Selectors.getAnalyticsOptedIn(mockState)).toBe(false)
     })
 
     it('should return config.analytics.optedIn with getAnalyticsOptedIn', () => {
-      const mockState: MockState = {
+      const mockState = {
         config: {
           analytics: { appId: 'foobar', optedIn: true, seenOptIn: true },
         },
-      }
+      } as any
       expect(Selectors.getAnalyticsOptedIn(mockState)).toBe(true)
     })
 
     it('should return true for getAnalyticsOptInSeen if no config', () => {
-      const mockState: MockState = { config: null }
+      const mockState = { config: null } as any
       expect(Selectors.getAnalyticsOptInSeen(mockState)).toBe(true)
     })
 
     it('should return config.analytics.seenOptIn with getAnalyticsOptInSeen', () => {
-      const mockState: MockState = {
+      const mockState = {
         config: {
           analytics: { appId: 'foobar', optedIn: false, seenOptIn: false },
         },
-      }
+      } as any
       expect(Selectors.getAnalyticsOptInSeen(mockState)).toBe(false)
     })
   })
 
   describe('get protocol analytics data', () => {
-    const hash: JestMockFn<[string], Promise<string>> = Hash.hash
-
-    const getProtocolType: JestMockFn<
-      [State],
-      $Call<typeof Protocol.getProtocolType, State>
-    > = Protocol.getProtocolType
-
-    const getProtocolCreatorApp: JestMockFn<
-      [State],
-      $Call<typeof Protocol.getProtocolCreatorApp, State>
-    > = Protocol.getProtocolCreatorApp
-
-    const getProtocolApiVersion: JestMockFn<
-      [State],
-      $Call<typeof Protocol.getProtocolApiVersion, State>
-    > = Protocol.getProtocolApiVersion
-
-    const getProtocolName: JestMockFn<
-      [State],
-      $Call<typeof Protocol.getProtocolName, State>
-    > = Protocol.getProtocolName
-
-    const getProtocolSource: JestMockFn<
-      [State],
-      $Call<typeof Protocol.getProtocolSource, State>
-    > = Protocol.getProtocolSource
-
-    const getProtocolAuthor: JestMockFn<
-      [State],
-      $Call<typeof Protocol.getProtocolAuthor, State>
-    > = Protocol.getProtocolAuthor
-
-    const getProtocolContents: JestMockFn<
-      [State],
-      $Call<typeof Protocol.getProtocolContents, State>
-    > = Protocol.getProtocolContents
-
-    const getModules: JestMockFn<
-      [State],
-      $Call<typeof RobotSelectors.getModules, State>
-    > = RobotSelectors.getModules
-
-    const getPipettes: JestMockFn<
-      [State],
-      $Call<typeof RobotSelectors.getPipettes, State>
-    > = RobotSelectors.getPipettes
+    const hash = Hash.hash as jest.MockedFunction<typeof Hash.hash>
+
+    const getProtocolType = Protocol.getProtocolType as jest.MockedFunction<
+      typeof Protocol.getProtocolType
+    >
+
+    const getProtocolCreatorApp = Protocol.getProtocolCreatorApp as jest.MockedFunction<
+      typeof Protocol.getProtocolCreatorApp
+    >
+
+    const getProtocolApiVersion = Protocol.getProtocolApiVersion as jest.MockedFunction<
+      typeof Protocol.getProtocolApiVersion
+    >
+
+    const getProtocolName = Protocol.getProtocolName as jest.MockedFunction<
+      typeof Protocol.getProtocolName
+    >
+
+    const getProtocolSource = Protocol.getProtocolSource as jest.MockedFunction<
+      typeof Protocol.getProtocolSource
+    >
+
+    const getProtocolAuthor = Protocol.getProtocolAuthor as jest.MockedFunction<
+      typeof Protocol.getProtocolAuthor
+    >
+
+    const getProtocolContents = Protocol.getProtocolContents as jest.MockedFunction<
+      typeof Protocol.getProtocolContents
+    >
+
+    const getModules = RobotSelectors.getModules as jest.MockedFunction<
+      typeof RobotSelectors.getModules
+    >
+
+    const getPipettes = RobotSelectors.getPipettes as jest.MockedFunction<
+      typeof RobotSelectors.getPipettes
+    >
 
     beforeEach(() => {
       hash.mockImplementation(source => Promise.resolve(`hash:${source}`))
@@ -266,36 +244,21 @@ describe('analytics selectors', () => {
   })
 
   describe('analytics calibration selectors', () => {
-    const mockGetConnectedRobot: JestMockFn<
-      [$Shape<State>],
-      $Shape<Robot> | null
-    > = DiscoverySelectors.getConnectedRobot
-    const mockGetAttachedPipettes: JestMockFn<
-      [State, string],
-      {|
-        left: null | $Shape<AttachedPipette>,
-        right: null | $Shape<AttachedPipette>,
-      |}
-    > = PipetteSelectors.getAttachedPipettes
+    const mockGetConnectedRobot = DiscoverySelectors.getConnectedRobot as jest.MockedFunction<
+      typeof DiscoverySelectors.getConnectedRobot
+    >
+    const mockGetAttachedPipettes = PipetteSelectors.getAttachedPipettes as jest.MockedFunction<
+      typeof PipetteSelectors.getAttachedPipettes
+    >
     describe('getAnalyticsPipetteCalibrationData', () => {
-      const mockGetAttachedPipetteCalibrations: JestMockFn<
-        [State, string],
-        {|
-          left: {|
-            offset: $Shape<PipetteOffsetCalibration> | null,
-            tipLength: any,
-          |},
-          right: {|
-            offset: $Shape<PipetteOffsetCalibration> | null,
-            tipLength: any,
-          |},
-        |}
-      > = PipetteSelectors.getAttachedPipetteCalibrations
+      const mockGetAttachedPipetteCalibrations = PipetteSelectors.getAttachedPipetteCalibrations as jest.MockedFunction<
+        typeof PipetteSelectors.getAttachedPipetteCalibrations
+      >
       it('should get data if robot connected', () => {
-        const mockState = ({}: $Shape<State>)
+        const mockState: State = {} as any
         mockGetConnectedRobot.mockReturnValue({
           name: 'my robot',
-        })
+        } as any)
         mockGetAttachedPipetteCalibrations.mockReturnValue({
           left: {
             offset: {
@@ -304,11 +267,11 @@ describe('analytics selectors', () => {
             tipLength: null,
           },
           right: { offset: null, tipLength: null },
-        })
+        } as any)
         mockGetAttachedPipettes.mockReturnValue({
           left: { model: 'my pipette model' },
           right: null,
-        })
+        } as any)
         expect(
           Selectors.getAnalyticsPipetteCalibrationData(mockState, 'left')
         ).toEqual({
@@ -318,7 +281,7 @@ describe('analytics selectors', () => {
         })
       })
       it('should return null if no robot connected', () => {
-        const mockState = ({}: $Shape<State>)
+        const mockState: State = {} as any
         mockGetConnectedRobot.mockReturnValue(null)
         expect(
           Selectors.getAnalyticsPipetteCalibrationData(mockState, 'right')
@@ -327,25 +290,15 @@ describe('analytics selectors', () => {
     })
 
     describe('getAnalyticsTipLengthCalibrationData', () => {
-      const mockGetAttachedPipetteCalibrations: JestMockFn<
-        [State, string],
-        {|
-          left: {|
-            offset: any,
-            tipLength: $Shape<TipLengthCalibration> | null,
-          |},
-          right: {|
-            offset: any,
-            tipLength: $Shape<TipLengthCalibration> | null,
-          |},
-        |}
-      > = PipetteSelectors.getAttachedPipetteCalibrations
+      const mockGetAttachedPipetteCalibrations = PipetteSelectors.getAttachedPipetteCalibrations as jest.MockedFunction<
+        typeof PipetteSelectors.getAttachedPipetteCalibrations
+      >
 
       it('should get data if robot connected', () => {
-        const mockState = ({}: $Shape<State>)
+        const mockState: State = {} as any
         mockGetConnectedRobot.mockReturnValue({
           name: 'my robot',
-        })
+        } as any)
         mockGetAttachedPipetteCalibrations.mockReturnValue({
           right: {
             tipLength: {
@@ -354,11 +307,11 @@ describe('analytics selectors', () => {
             offset: null,
           },
           left: { offset: null, tipLength: null },
-        })
+        } as any)
         mockGetAttachedPipettes.mockReturnValue({
           right: { model: 'my pipette model' },
           left: null,
-        })
+        } as any)
         expect(
           Selectors.getAnalyticsTipLengthCalibrationData(mockState, 'right')
         ).toEqual({
@@ -368,7 +321,7 @@ describe('analytics selectors', () => {
         })
       })
       it('should return null if no robot connected', () => {
-        const mockState = ({}: $Shape<State>)
+        const mockState: State = {} as any
         mockGetConnectedRobot.mockReturnValue(null)
         expect(
           Selectors.getAnalyticsTipLengthCalibrationData(mockState, 'left')
@@ -376,29 +329,25 @@ describe('analytics selectors', () => {
       })
     })
     describe('getAnalyticsDeckCalibrationData', () => {
-      const mockGetDeckCalibrationData: JestMockFn<
-        [State, string],
-        $Call<typeof CalibrationSelectors.getDeckCalibrationData, State, string>
-      > = CalibrationSelectors.getDeckCalibrationData
-      const mockGetDeckCalibrationStatus: JestMockFn<
-        [State, string],
-        DeckCalibrationStatus | null
-      > = CalibrationSelectors.getDeckCalibrationStatus
+      const mockGetDeckCalibrationData = CalibrationSelectors.getDeckCalibrationData as jest.MockedFunction<
+        typeof CalibrationSelectors.getDeckCalibrationData
+      >
+      const mockGetDeckCalibrationStatus = CalibrationSelectors.getDeckCalibrationStatus as jest.MockedFunction<
+        typeof CalibrationSelectors.getDeckCalibrationStatus
+      >
       it('should get data if robot connected and format ok', () => {
-        const mockState = ({}: $Shape<State>)
+        const mockState: State = {} as any
         mockGetConnectedRobot.mockReturnValue({
           name: 'my robot',
-        })
-        mockGetDeckCalibrationData.mockReturnValue(
-          ({
-            status: { markedBad: true, markedAt: null, source: null },
-          }: $Shape<DeckCalibrationInfo>)
-        )
+        } as any)
+        mockGetDeckCalibrationData.mockReturnValue({
+          status: { markedBad: true, markedAt: null, source: null },
+        } as any)
         mockGetDeckCalibrationStatus.mockReturnValue('IDENTITY')
         mockGetAttachedPipettes.mockReturnValue({
           right: { model: 'my pipette model' },
           left: { model: 'my other pipette' },
-        })
+        } as any)
         expect(Selectors.getAnalyticsDeckCalibrationData(mockState)).toEqual({
           calibrationStatus: 'IDENTITY',
           markedBad: true,
@@ -409,14 +358,14 @@ describe('analytics selectors', () => {
         })
       })
       it('should return null if no robot connected', () => {
-        const mockState = ({}: $Shape<State>)
+        const mockState: State = {} as any
         mockGetConnectedRobot.mockReturnValue(null)
         expect(Selectors.getAnalyticsDeckCalibrationData(mockState)).toBeNull()
       })
       it('should handle old deck cal data', () => {
         mockGetConnectedRobot.mockReturnValue({
           name: 'my robot',
-        })
+        } as any)
         mockGetDeckCalibrationData.mockReturnValue([
           [0, 1, 2, 3],
           [4, 5, 6, 7],
@@ -427,7 +376,7 @@ describe('analytics selectors', () => {
         mockGetAttachedPipettes.mockReturnValue({
           right: { model: 'my pipette model' },
           left: { model: 'my other pipette' },
-        })
+        } as any)
         expect(Selectors.getAnalyticsDeckCalibrationData(mockState)).toEqual({
           calibrationStatus: 'IDENTITY',
           markedBad: null,
@@ -439,15 +388,9 @@ describe('analytics selectors', () => {
       })
     })
     describe('getAnalyticsHealthCheckData', () => {
-      const getRobotSessionOfType: JestMockFn<
-        [State, string, SessionTypes.SessionType],
-        $Call<
-          typeof SessionsSelectors.getRobotSessionOfType,
-          State,
-          string,
-          SessionTypes.SessionType
-        >
-      > = SessionsSelectors.getRobotSessionOfType
+      const getRobotSessionOfType = SessionsSelectors.getRobotSessionOfType as jest.MockedFunction<
+        typeof SessionsSelectors.getRobotSessionOfType
+      >
       it('should get data if robot connected', () => {
         const mockCalibrationCheckSession: SessionTypes.CalibrationCheckSession = {
           id: 'fake_check_session_id',
@@ -456,7 +399,7 @@ describe('analytics selectors', () => {
         getRobotSessionOfType.mockReturnValue(mockCalibrationCheckSession)
         mockGetConnectedRobot.mockReturnValue({
           name: 'my robot',
-        })
+        } as any)
         const comparisonsLeft =
           SessionFixtures.mockCalibrationCheckSessionAttributes.details
             .comparisonsByPipette.first
@@ -479,31 +422,25 @@ describe('analytics selectors', () => {
         })
       })
       it('should return null if no robot connected', () => {
-        const mockState = ({}: $Shape<State>)
+        const mockState: State = {} as any
         mockGetConnectedRobot.mockReturnValue(null)
         expect(Selectors.getAnalyticsHealthCheckData(mockState)).toBeNull()
       })
     })
     describe('getAnalyticsSessionExitDetails', () => {
-      const mockGetRobotSessionById: JestMockFn<
-        [State, string, string],
-        $Call<
-          typeof SessionsSelectors.getRobotSessionById,
-          State,
-          string,
-          string
-        >
-      > = SessionsSelectors.getRobotSessionById
+      const mockGetRobotSessionById = SessionsSelectors.getRobotSessionById as jest.MockedFunction<
+        typeof SessionsSelectors.getRobotSessionById
+      >
       it('returns data if the session exists', () => {
-        const mockState = ({}: $Shape<State>)
+        const mockState: State = {} as any
         mockGetRobotSessionById.mockReturnValue({
           sessionType: 'deckCalibration',
-          details: ({
+          details: {
             currentStep: 'inspectingTip',
-          }: $Shape<DeckCalibrationSessionDetails>),
+          } as Partial<DeckCalibrationSessionDetails>,
           createParams: {},
           id: 'blah-bloo-blah',
-        })
+        } as any)
         expect(
           Selectors.getAnalyticsSessionExitDetails(
             mockState,
@@ -519,7 +456,7 @@ describe('analytics selectors', () => {
       })
       it('returns null if the session cannot be found', () => {
         mockGetRobotSessionById.mockReturnValue(null)
-        const mockState = ({}: $Shape<State>)
+        const mockState: State = {} as any
         expect(
           Selectors.getAnalyticsSessionExitDetails(
             mockState,
diff --git a/app/src/redux/analytics/__tests__/system-info-events.test.ts b/app/src/redux/analytics/__tests__/system-info-events.test.ts
index 7e518d282f7..8137a8b4935 100644
--- a/app/src/redux/analytics/__tests__/system-info-events.test.ts
+++ b/app/src/redux/analytics/__tests__/system-info-events.test.ts
@@ -1,21 +1,17 @@
-// @flow
-
 import { makeEvent } from '../make-event'
 
 import * as SystemInfo from '../../system-info'
 import * as Fixtures from '../../system-info/__fixtures__'
 
 import type { State } from '../../types'
-import type { U2EAnalyticsProps } from '../../system-info/types'
 
 jest.mock('../../system-info/selectors')
 
-const getU2EDeviceAnalyticsProps: JestMockFn<
-  [State],
-  U2EAnalyticsProps | null
-> = SystemInfo.getU2EDeviceAnalyticsProps
+const getU2EDeviceAnalyticsProps = SystemInfo.getU2EDeviceAnalyticsProps as jest.MockedFunction<
+  typeof SystemInfo.getU2EDeviceAnalyticsProps
+>
 
-const MOCK_STATE: State = ({ mockState: true }: any)
+const MOCK_STATE: State = { mockState: true } as any
 const MOCK_ANALYTICS_PROPS = {
   'U2E Vendor ID': Fixtures.mockRealtekDevice.vendorId,
   'U2E Product ID': Fixtures.mockRealtekDevice.productId,
diff --git a/app/src/redux/analytics/actions.ts b/app/src/redux/analytics/actions.ts
index 955c2934229..0ea3fa10d31 100644
--- a/app/src/redux/analytics/actions.ts
+++ b/app/src/redux/analytics/actions.ts
@@ -1,5 +1,3 @@
-// @flow
-
 // Actions for triggering analytics events that don't work well as epics looking
 // for unrelated events
 
diff --git a/app/src/redux/analytics/constants.ts b/app/src/redux/analytics/constants.ts
index 37d2c060268..9144158a279 100644
--- a/app/src/redux/analytics/constants.ts
+++ b/app/src/redux/analytics/constants.ts
@@ -1,5 +1,3 @@
-// @flow
-
 export const ANALYTICS_PIPETTE_OFFSET_STARTED: 'analytics:PIPETTE_OFFSET_STARTED' =
   'analytics:PIPETTE_OFFSET_STARTED'
 export const ANALYTICS_TIP_LENGTH_STARTED: 'analytics:TIP_LENGTH_STARTED' =
diff --git a/app/src/redux/analytics/epic.ts b/app/src/redux/analytics/epic.ts
index 298ed35e6a2..23945b7bcb6 100644
--- a/app/src/redux/analytics/epic.ts
+++ b/app/src/redux/analytics/epic.ts
@@ -1,4 +1,3 @@
-// @flow
 // analytics epics
 import { combineEpics, ofType } from 'redux-observable'
 import { of, from, zip } from 'rxjs'
@@ -17,13 +16,14 @@ import { getAnalyticsConfig } from './selectors'
 import { initializeMixpanel, setMixpanelTracking, trackEvent } from './mixpanel'
 import { makeEvent } from './make-event'
 
+import type { Observable } from 'rxjs'
 import type { State, Action, Epic } from '../types'
 import type { ConfigInitializedAction } from '../config/types'
 import type { TrackEventArgs, AnalyticsEvent, AnalyticsConfig } from './types'
 
 const initializeAnalyticsEpic: Epic = (action$, state$) => {
   return action$.pipe(
-    ofType(Cfg.INITIALIZED),
+    ofType<Action, ConfigInitializedAction>(Cfg.INITIALIZED),
     tap((initAction: ConfigInitializedAction) => {
       const { config } = initAction.payload
       initializeMixpanel(config.analytics)
@@ -37,13 +37,17 @@ const sendAnalyticsEventEpic: Epic = (action$, state$) => {
     withLatestFrom(state$),
     // use a merge map to ensure actions dispatched in the same tick do
     // not clobber each other
-    mergeMap<[Action, State], _, TrackEventArgs>(([action, state]) => {
+    mergeMap<[Action, State], Observable<TrackEventArgs>>(([action, state]) => {
       const event$ = from(makeEvent(action, state))
       return zip(event$, of(getAnalyticsConfig(state)))
     }),
-    filter(([maybeEvent, maybeConfig]: TrackEventArgs) =>
-      Boolean(maybeEvent && maybeConfig)
-    ),
+    filter<TrackEventArgs, [AnalyticsEvent, AnalyticsConfig]>((args): args is [
+      AnalyticsEvent,
+      AnalyticsConfig
+    ] => {
+      const [maybeEvent, maybeConfig] = args
+      return Boolean(maybeEvent && maybeConfig)
+    }),
     tap(([event, config]: [AnalyticsEvent, AnalyticsConfig]) =>
       trackEvent(event, config)
     ),
@@ -57,16 +61,18 @@ const optIntoAnalyticsEpic: Epic = (_, state$) => {
     // this epic is for runtime changes in opt-in (not initialization)
     // ensure config exists so it doesn't conflict with initializeAnalyticsEpic
     filter<AnalyticsConfig | null, AnalyticsConfig>(
-      maybeConfig => maybeConfig !== null
+      (maybeConfig): maybeConfig is AnalyticsConfig => maybeConfig !== null
     ),
     pairwise(),
     filter(([prev, next]) => prev.optedIn !== next.optedIn),
-    tap(([_, config]: [mixed, AnalyticsConfig]) => setMixpanelTracking(config)),
+    tap(([_, config]: [unknown, AnalyticsConfig]) =>
+      setMixpanelTracking(config)
+    ),
     ignoreElements()
   )
 }
 
-export const analyticsEpic: Epic = combineEpics(
+export const analyticsEpic: Epic = combineEpics<Epic>(
   initializeAnalyticsEpic,
   sendAnalyticsEventEpic,
   optIntoAnalyticsEpic
diff --git a/app/src/redux/analytics/hash.ts b/app/src/redux/analytics/hash.ts
index 6fe43f36216..20f312dc7d0 100644
--- a/app/src/redux/analytics/hash.ts
+++ b/app/src/redux/analytics/hash.ts
@@ -1,4 +1,3 @@
-// @flow
 // hash strings for an amount of anonymity
 // note: values will be _hashed_, not _enctrypted_; hashed values should not be
 // considered secure nor should they ever be released publicly
@@ -9,7 +8,7 @@ export function hash(source: string): Promise<string> {
   const data = encoder.encode(source)
 
   // https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/digest
-  return global.crypto.subtle
+  return (global.crypto as any).subtle
     .digest(ALGORITHM, data)
     .then((digest: ArrayBuffer) => arrayBufferToHex(digest))
 }
diff --git a/app/src/redux/analytics/hooks.ts b/app/src/redux/analytics/hooks.ts
index 97a1e866363..023c867241e 100644
--- a/app/src/redux/analytics/hooks.ts
+++ b/app/src/redux/analytics/hooks.ts
@@ -1,10 +1,10 @@
-// @flow
 import { useSelector } from 'react-redux'
 
 import { getConfig } from '../config'
 import { trackEvent } from './mixpanel'
 
 import type { State } from '../types'
+import type { Config } from '../config/types'
 import type { AnalyticsEvent } from './types'
 
 /**
@@ -12,7 +12,9 @@ import type { AnalyticsEvent } from './types'
  *
  * @returns {AnalyticsEvent => void} track event function
  */
-export function useTrackEvent(): AnalyticsEvent => void {
-  const config = useSelector((state: State) => getConfig(state)?.analytics)
+export function useTrackEvent(): (e: AnalyticsEvent) => void {
+  const config: Config['analytics'] | undefined = useSelector(
+    (state: State) => getConfig(state)?.analytics
+  )
   return event => config && trackEvent(event, config)
 }
diff --git a/app/src/redux/analytics/index.ts b/app/src/redux/analytics/index.ts
index dd5e5fc0573..dcf0b784d1e 100644
--- a/app/src/redux/analytics/index.ts
+++ b/app/src/redux/analytics/index.ts
@@ -1,4 +1,3 @@
-// @flow
 // analytics module
 import { toggleConfigValue, updateConfigValue } from '../config'
 
diff --git a/app/src/redux/analytics/make-event.ts b/app/src/redux/analytics/make-event.ts
index ebb12302f8c..5e7732acd5d 100644
--- a/app/src/redux/analytics/make-event.ts
+++ b/app/src/redux/analytics/make-event.ts
@@ -1,4 +1,3 @@
-// @flow
 // redux action types to analytics events map
 import { createLogger } from '../../logger'
 import { selectors as robotSelectors } from '../robot'
@@ -26,6 +25,7 @@ import {
 
 import type { State, Action } from '../types'
 import type { AnalyticsEvent } from './types'
+import type { Mount } from '../pipettes/types'
 
 const log = createLogger(__filename)
 
@@ -81,6 +81,7 @@ export function makeEvent(
           ...getRobotAnalyticsData(state),
           ...data,
           success: actionType === 'robot:SESSION_RESPONSE',
+          // @ts-expect-error even if we used the in operator, TS cant narrow error to anything more specific than 'unknown' https://github.com/microsoft/TypeScript/issues/25720
           error: (actionPayload.error && actionPayload.error.message) || '',
         },
       }))
@@ -343,8 +344,10 @@ export function makeEvent(
                     name: `${instrData.sessionType}TipRackSelect`,
                     properties: {
                       pipetteModel: instrData.pipetteModel,
+                      // @ts-expect-error TODO: use in operator and add test case for no tiprackDefiniton on CommandData
                       tipRackDisplayName: commandData.tiprackDefinition
-                        ? commandData.tiprackDefinition.metadata.displayName
+                        ? // @ts-expect-error TODO: use in operator and add test case for no tiprackDefiniton on CommandData
+                          commandData.tiprackDefinition.metadata.displayName
                         : null,
                     },
                   }
@@ -376,7 +379,10 @@ export function makeEvent(
         name: 'pipetteOffsetCalibrationStarted',
         properties: {
           ...action.payload,
-          ...getAnalyticsPipetteCalibrationData(state, action.payload.mount),
+          ...getAnalyticsPipetteCalibrationData(
+            state,
+            action.payload.mount as Mount
+          ),
         },
       })
     }
@@ -386,7 +392,10 @@ export function makeEvent(
         name: 'tipLengthCalibrationStarted',
         properties: {
           ...action.payload,
-          ...getAnalyticsTipLengthCalibrationData(state, action.payload.mount),
+          ...getAnalyticsTipLengthCalibrationData(
+            state,
+            action.payload.mount as Mount
+          ),
         },
       })
     }
diff --git a/app/src/redux/analytics/mixpanel.ts b/app/src/redux/analytics/mixpanel.ts
index 74c69fd0516..62fabce3048 100644
--- a/app/src/redux/analytics/mixpanel.ts
+++ b/app/src/redux/analytics/mixpanel.ts
@@ -1,4 +1,3 @@
-// @flow
 // mixpanel actions
 import mixpanel from 'mixpanel-browser'
 
@@ -21,7 +20,7 @@ const MIXPANEL_OPTS = {
   track_pageview: false,
 }
 
-export function initializeMixpanel(config: AnalyticsConfig) {
+export function initializeMixpanel(config: AnalyticsConfig): void {
   if (MIXPANEL_ID) {
     log.debug('Initializing Mixpanel', { config })
 
@@ -33,17 +32,21 @@ export function initializeMixpanel(config: AnalyticsConfig) {
   }
 }
 
-export function trackEvent(event: AnalyticsEvent, config: AnalyticsConfig) {
+export function trackEvent(
+  event: AnalyticsEvent,
+  config: AnalyticsConfig
+): void {
   const { optedIn } = config
 
   log.debug('Trackable event', { event, optedIn })
   if (MIXPANEL_ID && optedIn) {
     if (event.superProperties) mixpanel.register(event.superProperties)
+    // @ts-expect-error TODO protect for no name on event and add test case
     if (event.name) mixpanel.track(event.name, event.properties)
   }
 }
 
-export function setMixpanelTracking(config: AnalyticsConfig) {
+export function setMixpanelTracking(config: AnalyticsConfig): void {
   if (MIXPANEL_ID) {
     if (config.optedIn) {
       log.debug('User has opted into analytics; tracking with Mixpanel')
diff --git a/app/src/redux/analytics/selectors.ts b/app/src/redux/analytics/selectors.ts
index df337d2fec1..ba1ced0e7e9 100644
--- a/app/src/redux/analytics/selectors.ts
+++ b/app/src/redux/analytics/selectors.ts
@@ -1,4 +1,3 @@
-// @flow
 import { createSelector } from 'reselect'
 import pick from 'lodash/pick'
 import some from 'lodash/some'
@@ -43,9 +42,13 @@ import { getCalibrationCheckSession } from '../sessions/calibration-check/select
 
 import { hash } from './hash'
 
-import type { OutputSelector } from 'reselect'
+import type { Selector } from 'reselect'
 import type { State } from '../types'
-import type { CalibrationCheckInstrument } from '../sessions/calibration-check/types'
+import type {
+  CalibrationCheckComparisonsPerCalibration,
+  CalibrationCheckInstrument,
+} from '../sessions/calibration-check/types'
+import type { Mount } from '../pipettes/types'
 
 import type {
   AnalyticsConfig,
@@ -62,11 +65,12 @@ import type {
   SessionInstrumentAnalyticsData,
 } from './types'
 
-type ProtocolDataSelector = OutputSelector<State, void, ProtocolAnalyticsData>
-
 export const FF_PREFIX = 'robotFF_'
 
-const _getUnhashedProtocolAnalyticsData: ProtocolDataSelector = createSelector(
+const _getUnhashedProtocolAnalyticsData: Selector<
+  State,
+  ProtocolAnalyticsData
+> = createSelector(
   getProtocolType,
   getProtocolCreatorApp,
   getProtocolApiVersion,
@@ -100,18 +104,21 @@ const _getUnhashedProtocolAnalyticsData: ProtocolDataSelector = createSelector(
   })
 )
 
-export const getProtocolAnalyticsData: State => Promise<ProtocolAnalyticsData> = createSelector(
-  _getUnhashedProtocolAnalyticsData,
-  data => {
-    const hashTasks = [hash(data.protocolAuthor), hash(data.protocolText)]
+export const getProtocolAnalyticsData: (
+  state: State
+) => Promise<ProtocolAnalyticsData> = createSelector<
+  State,
+  ProtocolAnalyticsData,
+  Promise<ProtocolAnalyticsData>
+>(_getUnhashedProtocolAnalyticsData, (data: ProtocolAnalyticsData) => {
+  const hashTasks = [hash(data.protocolAuthor), hash(data.protocolText)]
 
-    return Promise.all(hashTasks).then(([protocolAuthor, protocolText]) => ({
-      ...data,
-      protocolAuthor: data.protocolAuthor !== '' ? protocolAuthor : '',
-      protocolText: data.protocolText !== '' ? protocolText : '',
-    }))
-  }
-)
+  return Promise.all(hashTasks).then(([protocolAuthor, protocolText]) => ({
+    ...data,
+    protocolAuthor: data.protocolAuthor !== '' ? protocolAuthor : '',
+    protocolText: data.protocolText !== '' ? protocolText : '',
+  }))
+})
 
 export function getRobotAnalyticsData(state: State): RobotAnalyticsData | null {
   const robot = getConnectedRobot(state)
@@ -120,11 +127,13 @@ export function getRobotAnalyticsData(state: State): RobotAnalyticsData | null {
     const pipettes = getAttachedPipettes(state, robot.name)
     const settings = getRobotSettings(state, robot.name)
 
-    return settings.reduce(
+    // @ts-expect-error RobotAnalyticsData type needs boolean values should it be boolean | string
+    return settings.reduce<RobotAnalyticsData>(
       (result, setting) => ({
         ...result,
         [`${FF_PREFIX}${setting.id}`]: !!setting.value,
       }),
+      // @ts-expect-error RobotAnalyticsData type needs boolean values should it be boolean | string
       {
         robotApiServerVersion: getRobotApiVersion(robot) || '',
         robotSmoothieVersion: getRobotFirmwareVersion(robot) || '',
@@ -175,7 +184,7 @@ export function getAnalyticsOptInSeen(state: State): boolean {
 
 export function getAnalyticsPipetteCalibrationData(
   state: State,
-  mount: string
+  mount: Mount
 ): PipetteOffsetCalibrationAnalyticsData | null {
   const robot = getConnectedRobot(state)
 
@@ -186,6 +195,7 @@ export function getAnalyticsPipetteCalibrationData(
     return {
       calibrationExists: Boolean(pipcal),
       markedBad: pipcal?.status?.markedBad ?? false,
+      // @ts-expect-error protect for cases where model is not on pip
       pipetteModel: pip.model,
     }
   }
@@ -194,7 +204,7 @@ export function getAnalyticsPipetteCalibrationData(
 
 export function getAnalyticsTipLengthCalibrationData(
   state: State,
-  mount: string
+  mount: Mount
 ): TipLengthCalibrationAnalyticsData | null {
   const robot = getConnectedRobot(state)
 
@@ -206,6 +216,7 @@ export function getAnalyticsTipLengthCalibrationData(
     return {
       calibrationExists: Boolean(tipcal),
       markedBad: tipcal?.status?.markedBad ?? false,
+      // @ts-expect-error protect for cases where model is not on pip
       pipetteModel: pip.model,
     }
   }
@@ -213,15 +224,16 @@ export function getAnalyticsTipLengthCalibrationData(
 }
 
 function getPipetteModels(state: State, robotName: string): ModelsByMount {
-  return Object.entries(getAttachedPipettes(state, robotName)).reduce(
-    (obj, [mount, pipData]) => {
-      if (pipData) {
-        obj[mount] = pick(pipData, ['model'])
-      }
-      return obj
-    },
-    ({}: $Shape<ModelsByMount>)
-  )
+  // @ts-expect-error ensure that both mount keys exist on returned object
+  return Object.entries(
+    getAttachedPipettes(state, robotName)
+  ).reduce<ModelsByMount>((obj, [mount, pipData]): ModelsByMount => {
+    if (pipData) {
+      obj[mount as Mount] = pick(pipData, ['model'])
+    }
+    return obj
+    // @ts-expect-error ensure that both mount keys exist on returned object
+  }, {})
 }
 
 function getCalibrationCheckData(
@@ -233,20 +245,27 @@ function getCalibrationCheckData(
     return null
   }
   const { comparisonsByPipette, instruments } = session.details
-  return instruments.reduce((obj, instrument: CalibrationCheckInstrument) => {
-    const { rank, mount, model } = instrument
-    const succeeded = !some(
-      Object.keys(comparisonsByPipette[rank]).map(k =>
-        Boolean(comparisonsByPipette[rank][k]?.status === 'OUTSIDE_THRESHOLD')
+  return instruments.reduce<CalibrationCheckByMount>(
+    (obj, instrument: CalibrationCheckInstrument) => {
+      const { rank, mount, model } = instrument
+      const succeeded = !some(
+        Object.keys(comparisonsByPipette[rank]).map(k =>
+          Boolean(
+            comparisonsByPipette[rank][
+              k as keyof CalibrationCheckComparisonsPerCalibration
+            ]?.status === 'OUTSIDE_THRESHOLD'
+          )
+        )
       )
-    )
-    obj[mount] = {
-      comparisons: comparisonsByPipette[rank],
-      succeeded: succeeded,
-      model: model,
-    }
-    return obj
-  }, ({ left: null, right: null }: $Shape<CalibrationCheckByMount>))
+      obj[mount] = {
+        comparisons: comparisonsByPipette[rank],
+        succeeded: succeeded,
+        model: model,
+      }
+      return obj
+    },
+    { left: null, right: null }
+  )
 }
 
 export function getAnalyticsDeckCalibrationData(
diff --git a/app/src/redux/analytics/types.ts b/app/src/redux/analytics/types.ts
index 3e7a1916a7f..6172657b319 100644
--- a/app/src/redux/analytics/types.ts
+++ b/app/src/redux/analytics/types.ts
@@ -1,7 +1,5 @@
-// @flow
-
 import type { Config } from '../config/types'
-import typeof {
+import {
   ANALYTICS_PIPETTE_OFFSET_STARTED,
   ANALYTICS_TIP_LENGTH_STARTED,
 } from './constants'
@@ -9,121 +7,123 @@ import * as CalUITypes from '../../organisms/CalibrationPanels/types'
 
 import type { CalibrationCheckComparisonsPerCalibration } from '../sessions/types'
 import type { DeckCalibrationStatus } from '../calibration/types'
-
-export type AnalyticsConfig = $PropertyType<Config, 'analytics'>
-
-export type ProtocolAnalyticsData = {|
-  protocolType: string,
-  protocolAppName: string,
-  protocolAppVersion: string,
-  protocolApiVersion: string,
-  protocolSource: string,
-  protocolName: string,
-  protocolAuthor: string,
-  protocolText: string,
-  pipettes: string,
-  modules: string,
-|}
-
-export type RobotAnalyticsData = {|
-  robotApiServerVersion: string,
-  robotSmoothieVersion: string,
-  robotLeftPipette: string,
-  robotRightPipette: string,
-
+import type { Mount } from '@opentrons/components'
+
+export type AnalyticsConfig = Config['analytics']
+
+export interface ProtocolAnalyticsData {
+  protocolType: string
+  protocolAppName: string
+  protocolAppVersion: string
+  protocolApiVersion: string
+  protocolSource: string
+  protocolName: string
+  protocolAuthor: string
+  protocolText: string
+  pipettes: string
+  modules: string
+}
+
+export type RobotAnalyticsData = {
+  robotApiServerVersion: string
+  robotSmoothieVersion: string
+  robotLeftPipette: string
+  robotRightPipette: string
+} & {
   // feature flags
   // e.g. robotFF_settingName
-  [ffName: string]: boolean,
-|}
-
-export type BuildrootAnalyticsData = {|
-  currentVersion: string,
-  currentSystem: string,
-  updateVersion: string,
-  error: string | null,
-|}
-
-export type PipetteOffsetCalibrationAnalyticsData = {|
-  calibrationExists: boolean,
-  markedBad: boolean | null,
-  pipetteModel: string,
-|}
-
-export type TipLengthCalibrationAnalyticsData = {|
-  calibrationExists: boolean,
-  markedBad: boolean | null,
-  pipetteModel: string,
-|}
-
-export type ModelsByMount = {|
-  left: { model: string } | null,
-  right: { model: string } | null,
-|}
-
-export type DeckCalibrationAnalyticsData = {|
-  calibrationStatus: DeckCalibrationStatus | null,
-  markedBad: boolean | null,
-  pipettes: ModelsByMount,
-|}
-
-export type CalibrationCheckByMount = {|
+  [ffName: string]: boolean
+}
+
+export interface BuildrootAnalyticsData {
+  currentVersion: string
+  currentSystem: string
+  updateVersion: string
+  error: string | null
+}
+
+export interface PipetteOffsetCalibrationAnalyticsData {
+  calibrationExists: boolean
+  markedBad: boolean | null
+  pipetteModel: string
+}
+
+export interface TipLengthCalibrationAnalyticsData {
+  calibrationExists: boolean
+  markedBad: boolean | null
+  pipetteModel: string
+}
+
+export type ModelsByMount = {
+  [mount in Mount]: { model: string } | null
+}
+
+// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
+export type DeckCalibrationAnalyticsData = {
+  calibrationStatus: DeckCalibrationStatus | null
+  markedBad: boolean | null
+  pipettes: ModelsByMount
+}
+
+export interface CalibrationCheckByMount {
   left: {
-    model: string,
-    comparisons: CalibrationCheckComparisonsPerCalibration,
-    succeeded: boolean,
-  } | null,
+    model: string
+    comparisons: CalibrationCheckComparisonsPerCalibration
+    succeeded: boolean
+  } | null
   right: {
-    model: string,
-    comparisons: CalibrationCheckComparisonsPerCalibration,
-    succeeded: boolean,
-  } | null,
-|}
-
-export type CalibrationHealthCheckAnalyticsData = {|
-  pipettes: CalibrationCheckByMount | null,
-|}
-
-export type AnalyticsSessionExitDetails = {|
-  sessionType: string,
-  step: string,
-|}
+    model: string
+    comparisons: CalibrationCheckComparisonsPerCalibration
+    succeeded: boolean
+  } | null
+}
+
+// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
+export type CalibrationHealthCheckAnalyticsData = {
+  pipettes: CalibrationCheckByMount | null
+}
+
+export interface AnalyticsSessionExitDetails {
+  sessionType: string
+  step: string
+}
 
 export type AnalyticsEvent =
-  | {|
-      name: string,
-      properties: { ... },
-      superProperties?: { ... },
-    |}
-  | {| superProperties: { ... } |}
+  | {
+      name: string
+      properties: { [key: string]: unknown }
+      superProperties?: { [key: string]: unknown }
+    }
+  | { superProperties: { [key: string]: unknown } }
 
 export type TrackEventArgs = [AnalyticsEvent | null, AnalyticsConfig | null]
 
-export type PipetteOffsetStartedAnalyticsAction = {|
-  type: ANALYTICS_PIPETTE_OFFSET_STARTED,
-  payload: {|
-    intent: CalUITypes.PipetteOffsetIntent,
-    mount: string,
-    calBlock: boolean,
-    shouldPerformTipLength: boolean,
-    tipRackURI: string | null,
-  |},
-|}
-
-export type TipLengthStartedAnalyticsAction = {|
-  type: ANALYTICS_TIP_LENGTH_STARTED,
-  payload: {|
-    intent: CalUITypes.PipetteOffsetIntent,
-    mount: string,
-    calBlock: boolean,
-    tipRackURI: string,
-  |},
-|}
+export interface PipetteOffsetStartedAnalyticsAction {
+  type: typeof ANALYTICS_PIPETTE_OFFSET_STARTED
+  payload: {
+    intent: CalUITypes.PipetteOffsetIntent
+    mount: string
+    calBlock: boolean
+    shouldPerformTipLength: boolean
+    tipRackURI: string | null
+  }
+}
+
+export interface TipLengthStartedAnalyticsAction {
+  type: typeof ANALYTICS_TIP_LENGTH_STARTED
+  payload: {
+    intent: CalUITypes.PipetteOffsetIntent
+    mount: string
+    calBlock: boolean
+    tipRackURI: string
+  }
+}
 
 export type AnalyticsTriggerAction =
   | PipetteOffsetStartedAnalyticsAction
   | TipLengthStartedAnalyticsAction
 
-export type SessionInstrumentAnalyticsData = {|
-  sessionType: string,
-  pipetteModel: string,
-|}
+export interface SessionInstrumentAnalyticsData {
+  sessionType: string
+  pipetteModel: string
+}
diff --git a/app/src/redux/buildroot/__fixtures__/index.ts b/app/src/redux/buildroot/__fixtures__/index.ts
index 25f116f1d38..3689789da90 100644
--- a/app/src/redux/buildroot/__fixtures__/index.ts
+++ b/app/src/redux/buildroot/__fixtures__/index.ts
@@ -1,7 +1,7 @@
-// @flow
-
 import { mockRobot } from '../../robot-api/__fixtures__'
 
+import type { RobotApiResponse } from '../../robot-api/types'
+
 export {
   mockRestartSuccess,
   mockRestartFailure,
@@ -9,7 +9,7 @@ export {
 
 // POST /server/update/begin
 
-export const mockUpdateBeginSuccess = {
+export const mockUpdateBeginSuccess: RobotApiResponse = {
   method: 'POST',
   path: '/server/update/begin',
   ok: true,
@@ -18,7 +18,7 @@ export const mockUpdateBeginSuccess = {
   body: { token: 'foobar' },
 }
 
-export const mockUpdateBeginConflict = {
+export const mockUpdateBeginConflict: RobotApiResponse = {
   method: 'POST',
   path: '/server/update/begin',
   ok: false,
@@ -27,7 +27,7 @@ export const mockUpdateBeginConflict = {
   body: { message: 'Session in progress' },
 }
 
-export const mockUpdateBeginFailure = {
+export const mockUpdateBeginFailure: RobotApiResponse = {
   method: 'POST',
   path: '/server/update/begin',
   ok: false,
@@ -36,7 +36,7 @@ export const mockUpdateBeginFailure = {
   body: { message: 'AH' },
 }
 
-export const mockUpdateCancelSuccess = {
+export const mockUpdateCancelSuccess: RobotApiResponse = {
   method: 'POST',
   path: '/server/update/cancel',
   ok: true,
@@ -45,7 +45,7 @@ export const mockUpdateCancelSuccess = {
   body: { message: 'cancelled' },
 }
 
-export const mockUpdateCancelFailure = {
+export const mockUpdateCancelFailure: RobotApiResponse = {
   method: 'POST',
   path: '/server/update/cancel',
   ok: false,
@@ -54,7 +54,7 @@ export const mockUpdateCancelFailure = {
   body: { message: 'AH' },
 }
 
-export const mockStatusSuccess = {
+export const mockStatusSuccess: RobotApiResponse = {
   method: 'GET',
   path: '/server/update/foobar/status',
   ok: true,
@@ -63,7 +63,7 @@ export const mockStatusSuccess = {
   body: { stage: 'awaiting-file', message: 'Awaiting File', progress: 0.1 },
 }
 
-export const mockCommitSuccess = {
+export const mockCommitSuccess: RobotApiResponse = {
   method: 'POST',
   path: '/server/update/foobar/commit',
   ok: true,
@@ -72,7 +72,7 @@ export const mockCommitSuccess = {
   body: { message: 'Committed' },
 }
 
-export const mockCommitFailure = {
+export const mockCommitFailure: RobotApiResponse = {
   method: 'POST',
   path: '/server/update/foobar/commit',
   ok: false,
diff --git a/app/src/redux/buildroot/__tests__/actions.test.ts b/app/src/redux/buildroot/__tests__/actions.test.ts
index 5f7c66c5444..286551a1045 100644
--- a/app/src/redux/buildroot/__tests__/actions.test.ts
+++ b/app/src/redux/buildroot/__tests__/actions.test.ts
@@ -1,18 +1,17 @@
-// @flow
 import { mockRobot } from '../../robot-api/__fixtures__'
 import * as actions from '../actions'
 
 import type { BuildrootAction } from '../types'
 
-type ActionSpec = {|
-  name: string,
-  creator: (...Array<any>) => BuildrootAction,
-  args: Array<mixed>,
-  expected: BuildrootAction,
-|}
+interface ActionSpec {
+  name: string
+  creator: (...args: any[]) => BuildrootAction
+  args: unknown[]
+  expected: BuildrootAction
+}
 
 describe('buildroot action creators', () => {
-  const SPECS: Array<ActionSpec> = [
+  const SPECS: ActionSpec[] = [
     {
       name: 'buildroot:SET_UPDATE_SEEN',
       creator: actions.setBuildrootUpdateSeen,
diff --git a/app/src/redux/buildroot/__tests__/epic.test.ts b/app/src/redux/buildroot/__tests__/epic.test.ts
index bc4a89117f5..201aa62183d 100644
--- a/app/src/redux/buildroot/__tests__/epic.test.ts
+++ b/app/src/redux/buildroot/__tests__/epic.test.ts
@@ -11,12 +11,26 @@ import * as selectors from '../selectors'
 
 import { INITIAL_STATE } from '../reducer'
 
+import type { Action, State } from '../../types'
+import { RobotApiResponse } from '../../robot-api/types'
+
 jest.mock('../selectors')
 jest.mock('../../robot-api/http')
 
-const mockFetchRobotApi = RobotApiHttp.fetchRobotApi
-
-const balenaRobot = { ...robot, serverHealth: {} }
+const mockFetchRobotApi = RobotApiHttp.fetchRobotApi as jest.MockedFunction<
+  typeof RobotApiHttp.fetchRobotApi
+>
+const getBuildrootRobot = selectors.getBuildrootRobot as jest.MockedFunction<
+  typeof selectors.getBuildrootRobot
+>
+const getBuildrootRobotName = selectors.getBuildrootRobotName as jest.MockedFunction<
+  typeof selectors.getBuildrootRobotName
+>
+const getBuildrootSession = selectors.getBuildrootSession as jest.MockedFunction<
+  typeof selectors.getBuildrootSession
+>
+
+const balenaRobot = { ...robot, serverHealth: {} } as any
 
 const brReadyRobot = {
   ...robot,
@@ -26,7 +40,7 @@ const brReadyRobot = {
       restart: '/server/update/restart',
     },
   },
-}
+} as any
 
 const brRobot = {
   ...robot,
@@ -36,14 +50,14 @@ const brRobot = {
       restart: '/server/restart',
     },
   },
-}
+} as any
 
 describe('buildroot update epics', () => {
-  let state
-  let testScheduler
+  let state: State
+  let testScheduler: TestScheduler
 
   beforeEach(() => {
-    state = { shell: { buildroot: { ...INITIAL_STATE } } }
+    state = { shell: { buildroot: { ...INITIAL_STATE } } } as any
     testScheduler = new TestScheduler((actual, expected) => {
       expect(actual).toEqual(expected)
     })
@@ -56,12 +70,12 @@ describe('buildroot update epics', () => {
   describe('startUpdateEpic', () => {
     it('with BR robot sends CREATE_SESSION', () => {
       testScheduler.run(({ hot, cold, expectObservable }) => {
-        selectors.getBuildrootRobot.mockReturnValueOnce(brRobot)
+        getBuildrootRobot.mockReturnValueOnce(brRobot)
 
-        const action$ = hot('-a', {
+        const action$ = hot<Action>('-a', {
           a: actions.startBuildrootUpdate(robot.name),
         })
-        const state$ = hot('a-', { a: state })
+        const state$ = hot<State>('a-', { a: state } as any)
         const output$ = epics.startUpdateEpic(action$, state$)
 
         expectObservable(output$).toBe('-a', {
@@ -72,12 +86,12 @@ describe('buildroot update epics', () => {
 
     it('with BR-ready robot sends CREATE_SESSION', () => {
       testScheduler.run(({ hot, cold, expectObservable }) => {
-        selectors.getBuildrootRobot.mockReturnValueOnce(brReadyRobot)
+        getBuildrootRobot.mockReturnValueOnce(brReadyRobot)
 
-        const action$ = hot('-a', {
+        const action$ = hot<Action>('-a', {
           a: actions.startBuildrootUpdate(robot.name),
         })
-        const state$ = hot('a-', { a: state })
+        const state$ = hot<State>('a-', { a: state } as any)
         const output$ = epics.startUpdateEpic(action$, state$)
 
         expectObservable(output$).toBe('-a', {
@@ -93,10 +107,10 @@ describe('buildroot update epics', () => {
       testScheduler.run(({ hot, expectObservable }) => {
         const action = actions.startBuildrootUpdate(robot.name)
 
-        selectors.getBuildrootRobot.mockReturnValueOnce(balenaRobot)
+        getBuildrootRobot.mockReturnValueOnce(balenaRobot)
 
-        const action$ = hot('-a', { a: action })
-        const state$ = hot('a-', { a: state })
+        const action$ = hot<Action>('-a', { a: action })
+        const state$ = hot<State>('a-', { a: state } as any)
         const output$ = epics.startUpdateEpic(action$, state$)
 
         expectObservable(output$).toBe('-a', {
@@ -112,10 +126,10 @@ describe('buildroot update epics', () => {
           '/path/to/system.zip'
         )
 
-        selectors.getBuildrootRobot.mockReturnValueOnce(balenaRobot)
+        getBuildrootRobot.mockReturnValueOnce(balenaRobot)
 
-        const action$ = hot('-a', { a: action })
-        const state$ = hot('a-', { a: state })
+        const action$ = hot<Action>('-a', { a: action })
+        const state$ = hot<State>('a-', { a: state } as any)
         const output$ = epics.startUpdateEpic(action$, state$)
 
         expectObservable(output$).toBe('-a', {
@@ -128,10 +142,10 @@ describe('buildroot update epics', () => {
       testScheduler.run(({ hot, expectObservable }) => {
         const action = actions.startBuildrootUpdate(robot.name)
 
-        selectors.getBuildrootRobot.mockReturnValueOnce(robot)
+        getBuildrootRobot.mockReturnValueOnce(robot as any)
 
-        const action$ = hot('-a', { a: action })
-        const state$ = hot('a-', { a: state })
+        const action$ = hot<Action>('-a', { a: action })
+        const state$ = hot<State>('a-', { a: state } as any)
         const output$ = epics.startUpdateEpic(action$, state$)
 
         expectObservable(output$).toBe('-a', {
@@ -149,11 +163,11 @@ describe('buildroot update epics', () => {
         const action = actions.createSession(robot, '/server/update/begin')
 
         mockFetchRobotApi.mockReturnValue(
-          cold('r', { r: Fixtures.mockUpdateBeginSuccess })
+          cold<RobotApiResponse>('r', { r: Fixtures.mockUpdateBeginSuccess })
         )
 
-        const action$ = hot('-a', { a: action })
-        const state$ = hot('a-', { a: state })
+        const action$ = hot<Action>('-a', { a: action })
+        const state$ = hot<State>('a-', { a: state } as any)
         const output$ = epics.createSessionEpic(action$, state$)
 
         expectObservable(output$).toBe('-s', {
@@ -178,14 +192,14 @@ describe('buildroot update epics', () => {
 
         mockFetchRobotApi
           .mockReturnValueOnce(
-            cold('r', { r: Fixtures.mockUpdateBeginConflict })
+            cold<RobotApiResponse>('r', { r: Fixtures.mockUpdateBeginConflict })
           )
           .mockReturnValueOnce(
-            cold('r', { r: Fixtures.mockUpdateCancelSuccess })
+            cold<RobotApiResponse>('r', { r: Fixtures.mockUpdateCancelSuccess })
           )
 
-        const action$ = hot('-a', { a: action })
-        const state$ = hot('a-', { a: state })
+        const action$ = hot<Action>('-a', { a: action })
+        const state$ = hot<State>('a-', { a: state } as any)
         const output$ = epics.createSessionEpic(action$, state$)
 
         expectObservable(output$).toBe('-a', { a: action })
@@ -205,8 +219,8 @@ describe('buildroot update epics', () => {
           cold('r', { r: Fixtures.mockUpdateBeginFailure })
         )
 
-        const action$ = hot('-a', { a: action })
-        const state$ = hot('a-', { a: state })
+        const action$ = hot<Action>('-a', { a: action })
+        const state$ = hot<State>('a-', { a: state } as any)
         const output$ = epics.createSessionEpic(action$, state$)
 
         expectObservable(output$).toBe('-e', {
@@ -227,8 +241,8 @@ describe('buildroot update epics', () => {
             cold('r', { r: Fixtures.mockUpdateCancelFailure })
           )
 
-        const action$ = hot('-a', { a: action })
-        const state$ = hot('a-', { a: state })
+        const action$ = hot<Action>('-a', { a: action })
+        const state$ = hot<State>('a-', { a: state } as any)
         const output$ = epics.createSessionEpic(action$, state$)
 
         expectObservable(output$).toBe('-e', {
@@ -242,15 +256,15 @@ describe('buildroot update epics', () => {
 
   it('retryAfterPremigrationEpic', () => {
     testScheduler.run(({ hot, expectObservable }) => {
-      selectors.getBuildrootRobot.mockReturnValueOnce(brReadyRobot)
-      selectors.getBuildrootRobotName.mockReturnValueOnce(brReadyRobot.name)
-      selectors.getBuildrootSession.mockReturnValueOnce({
+      getBuildrootRobot.mockReturnValueOnce(brReadyRobot)
+      getBuildrootRobotName.mockReturnValueOnce(brReadyRobot.name)
+      getBuildrootSession.mockReturnValueOnce({
         robot: brReadyRobot.name,
         step: 'premigrationRestart',
-      })
+      } as any)
 
-      const state$ = hot('-a', { a: state })
-      const output$ = epics.retryAfterPremigrationEpic(null, state$)
+      const state$ = hot<State>('-a', { a: state })
+      const output$ = epics.retryAfterPremigrationEpic(null as any, state$)
 
       expectObservable(output$).toBe('-a', {
         a: actions.startBuildrootUpdate(brReadyRobot.name),
@@ -270,16 +284,19 @@ describe('buildroot update epics', () => {
           },
         }
 
-        selectors.getBuildrootSession
-          .mockReturnValue({ stage: 'ready-for-restart' })
-          .mockReturnValueOnce({ stage: null })
+        getBuildrootSession
+          .mockReturnValue({ stage: 'ready-for-restart' } as any)
+          .mockReturnValueOnce({ stage: null } as any)
 
         mockFetchRobotApi.mockReturnValue(
           cold('r', { r: Fixtures.mockStatusSuccess })
         )
 
-        const action$ = hot('-a', { a: action })
-        const state$ = hot('-x 4s y 2s y #', { x: state, y: state })
+        const action$ = hot<Action>('-a', { a: action } as any)
+        const state$ = hot<State>('-x 4s y 2s y #', {
+          x: state,
+          y: state,
+        })
         const output$ = epics.statusPollEpic(action$, state$)
         const { stage, message, progress } = Fixtures.mockStatusSuccess.body
         const expectedAction = actions.buildrootStatus(
@@ -303,18 +320,18 @@ describe('buildroot update epics', () => {
 
   it('uploadFileEpic', () => {
     testScheduler.run(({ hot, expectObservable }) => {
-      const session = {
+      const session: ReturnType<typeof getBuildrootSession> = {
         pathPrefix: '/server/update/migration',
         token: 'tok',
         stage: 'awaiting-file',
         step: 'getToken',
-      }
+      } as any
 
-      selectors.getBuildrootRobot.mockReturnValue(brReadyRobot)
-      selectors.getBuildrootSession.mockReturnValue(session)
+      getBuildrootRobot.mockReturnValue(brReadyRobot)
+      getBuildrootSession.mockReturnValue(session)
 
-      const action$ = null
-      const state$ = hot('-a', { a: state })
+      const action$ = null as any
+      const state$ = hot<State>('-a', { a: state })
       const output$ = epics.uploadFileEpic(action$, state$)
 
       expectObservable(output$).toBe('-a', {
@@ -333,19 +350,19 @@ describe('buildroot update epics', () => {
       token: 'foobar',
       stage: 'done',
       step: 'processFile',
-    }
+    } as any
 
     it('commit request success', () => {
       testScheduler.run(({ hot, cold, expectObservable, flush }) => {
-        selectors.getBuildrootRobot.mockReturnValue(brRobot)
-        selectors.getBuildrootSession.mockReturnValue(session)
+        getBuildrootRobot.mockReturnValue(brRobot)
+        getBuildrootSession.mockReturnValue(session)
 
         mockFetchRobotApi.mockReturnValue(
           cold('-r', { r: Fixtures.mockCommitSuccess })
         )
 
-        const action$ = hot('--')
-        const state$ = hot('-a', { a: state })
+        const action$ = hot<Action>('--')
+        const state$ = hot<State>('-a', { a: state })
         const output$ = epics.commitUpdateEpic(action$, state$)
 
         expectObservable(output$).toBe('-a', {
@@ -362,15 +379,15 @@ describe('buildroot update epics', () => {
 
     it('commit request failure', () => {
       testScheduler.run(({ hot, cold, expectObservable }) => {
-        selectors.getBuildrootRobot.mockReturnValue(brRobot)
-        selectors.getBuildrootSession.mockReturnValue(session)
+        getBuildrootRobot.mockReturnValue(brRobot)
+        getBuildrootSession.mockReturnValue(session)
 
         mockFetchRobotApi.mockReturnValue(
           cold('-r', { r: Fixtures.mockCommitFailure })
         )
 
-        const action$ = hot('--')
-        const state$ = hot('-a', { a: state })
+        const action$ = hot<Action>('--')
+        const state$ = hot<State>('-a', { a: state })
         const output$ = epics.commitUpdateEpic(action$, state$)
 
         expectObservable(output$).toBe('-ab', {
@@ -387,25 +404,25 @@ describe('buildroot update epics', () => {
       token: 'foobar',
       stage: 'ready-for-restart',
       step: 'commitUpdate',
-    }
+    } as any
 
     it('restart request success', () => {
       testScheduler.run(({ hot, cold, expectObservable, flush }) => {
-        selectors.getBuildrootRobot.mockReturnValue(brRobot)
-        selectors.getBuildrootSession.mockReturnValue(session)
+        getBuildrootRobot.mockReturnValue(brRobot)
+        getBuildrootSession.mockReturnValue(session)
 
         mockFetchRobotApi.mockReturnValue(
           cold('-r', { r: Fixtures.mockRestartSuccess })
         )
 
-        const action$ = hot('--')
-        const state$ = hot('-a', { a: state })
+        const action$ = hot<Action>('--')
+        const state$ = hot<State>('-a', { a: state })
         const output$ = epics.restartAfterCommitEpic(action$, state$)
 
         expectObservable(output$).toBe('-a(bc)', {
           a: actions.setBuildrootSessionStep('restart'),
           b: startDiscovery(1200000),
-          c: restartRobotSuccess(robot.name, {}),
+          c: restartRobotSuccess(robot.name, {} as any),
         })
 
         flush()
@@ -418,15 +435,15 @@ describe('buildroot update epics', () => {
 
     it('restart request failure', () => {
       testScheduler.run(({ hot, cold, expectObservable }) => {
-        selectors.getBuildrootRobot.mockReturnValue(brRobot)
-        selectors.getBuildrootSession.mockReturnValue(session)
+        getBuildrootRobot.mockReturnValue(brRobot)
+        getBuildrootSession.mockReturnValue(session)
 
         mockFetchRobotApi.mockReturnValue(
           cold('-r', { r: Fixtures.mockRestartFailure })
         )
 
-        const action$ = hot('--')
-        const state$ = hot('-a', { a: state })
+        const action$ = hot<Action>('--')
+        const state$ = hot<State>('-a', { a: state })
         const output$ = epics.restartAfterCommitEpic(action$, state$)
 
         expectObservable(output$).toBe('-ab', {
@@ -440,10 +457,12 @@ describe('buildroot update epics', () => {
   describe('user file upload epics', () => {
     it('retryAfterUserFileInfoEpic', () => {
       testScheduler.run(({ hot, cold, expectObservable }) => {
-        selectors.getBuildrootRobotName.mockReturnValue(balenaRobot.name)
+        getBuildrootRobotName.mockReturnValue(balenaRobot.name)
 
-        const action$ = hot('-a', { a: { type: 'buildroot:USER_FILE_INFO' } })
-        const state$ = hot('a-', { a: state })
+        const action$ = hot<Action>('-a', {
+          a: { type: 'buildroot:USER_FILE_INFO' },
+        } as any)
+        const state$ = hot<State>('a-', { a: state } as any)
         const output$ = epics.retryAfterUserFileInfoEpic(action$, state$)
 
         expectObservable(output$).toBe('-a', {
@@ -460,13 +479,13 @@ describe('buildroot update epics', () => {
           stage: 'awaiting-file',
           step: 'getToken',
           userFileInfo: { systemFile: '/path/to/system.zip' },
-        }
+        } as any
 
-        selectors.getBuildrootRobot.mockReturnValue(brReadyRobot)
-        selectors.getBuildrootSession.mockReturnValue(session)
+        getBuildrootRobot.mockReturnValue(brReadyRobot)
+        getBuildrootSession.mockReturnValue(session)
 
-        const action$ = null
-        const state$ = hot('-a', { a: state })
+        const action$ = null as any
+        const state$ = hot<State>('-a', { a: state })
         const output$ = epics.uploadFileEpic(action$, state$)
 
         expectObservable(output$).toBe('-a', {
diff --git a/app/src/redux/buildroot/__tests__/reducer.test.ts b/app/src/redux/buildroot/__tests__/reducer.test.ts
index 491121edd94..e038c686cbc 100644
--- a/app/src/redux/buildroot/__tests__/reducer.test.ts
+++ b/app/src/redux/buildroot/__tests__/reducer.test.ts
@@ -1,5 +1,7 @@
 import { mockRobot } from '../../robot-api/__fixtures__'
 import { INITIAL_STATE, buildrootReducer } from '../reducer'
+import type { Action } from '../../types'
+import type { BuildrootState } from '../types'
 
 const BASE_SESSION = {
   robotName: mockRobot.name,
@@ -261,7 +263,9 @@ describe('buildroot reducer', () => {
   SPECS.forEach(spec => {
     const { name, action, initialState, expected } = spec
     it(name, () =>
-      expect(buildrootReducer(initialState, action)).toEqual(expected)
+      expect(
+        buildrootReducer(initialState as BuildrootState, action as Action)
+      ).toEqual(expected)
     )
   })
 })
diff --git a/app/src/redux/buildroot/__tests__/selectors.test.ts b/app/src/redux/buildroot/__tests__/selectors.test.ts
index 8a0f4224252..c2e1f9bad6c 100644
--- a/app/src/redux/buildroot/__tests__/selectors.test.ts
+++ b/app/src/redux/buildroot/__tests__/selectors.test.ts
@@ -1,15 +1,23 @@
 import * as selectors from '../selectors'
 import * as Constants from '../constants'
 import { mockReachableRobot } from '../../discovery/__fixtures__'
-import {
-  HEALTH_STATUS_NOT_OK,
-  getViewableRobots,
-  getRobotApiVersion,
-  getRobotByName,
-} from '../../discovery'
+import { HEALTH_STATUS_NOT_OK } from '../../discovery'
+import * as discoSelectors from '../../discovery/selectors'
+
+import type { State } from '../../types'
 
 jest.mock('../../discovery/selectors')
 
+const getViewableRobots = discoSelectors.getViewableRobots as jest.MockedFunction<
+  typeof discoSelectors.getViewableRobots
+>
+const getRobotApiVersion = discoSelectors.getRobotApiVersion as jest.MockedFunction<
+  typeof discoSelectors.getRobotApiVersion
+>
+const getRobotByName = discoSelectors.getRobotByName as jest.MockedFunction<
+  typeof discoSelectors.getRobotByName
+>
+
 describe('buildroot selectors', () => {
   beforeEach(() => {
     getViewableRobots.mockReturnValue([])
@@ -22,57 +30,59 @@ describe('buildroot selectors', () => {
   })
 
   it('should get buildroot update info', () => {
-    const state = {
+    const state: State = {
       buildroot: { info: { releaseNotes: 'some release notes' } },
-    }
+    } as any
     const result = selectors.getBuildrootUpdateInfo(state)
 
     expect(result).toEqual({ releaseNotes: 'some release notes' })
   })
 
   it('should get the update version from the auto-downloaded file', () => {
-    const state = { buildroot: { version: '1.0.0' } }
+    const state: State = { buildroot: { version: '1.0.0' } } as any
     const result = selectors.getBuildrootTargetVersion(state)
 
     expect(result).toBe('1.0.0')
   })
 
   it('should get the update version from the user-provided file', () => {
-    const state = {
+    const state: State = {
       buildroot: {
         version: '1.0.0',
         session: { userFileInfo: { version: '1.0.1' } },
       },
-    }
+    } as any
     const result = selectors.getBuildrootTargetVersion(state)
 
     expect(result).toBe('1.0.1')
   })
 
   it('should get the update download error', () => {
-    const state = { buildroot: { downloadError: 'error with download' } }
+    const state: State = {
+      buildroot: { downloadError: 'error with download' },
+    } as any
     const result = selectors.getBuildrootDownloadError(state)
 
     expect(result).toBe('error with download')
   })
 
   it('should get the update download progress', () => {
-    const state = { buildroot: { downloadProgress: 10 } }
+    const state: State = { buildroot: { downloadProgress: 10 } } as any
     const result = selectors.getBuildrootDownloadProgress(state)
 
     expect(result).toBe(10)
   })
 
   it('should get the update seen flag', () => {
-    const state = { buildroot: { seen: false } }
+    const state: State = { buildroot: { seen: false } } as any
     const result = selectors.getBuildrootUpdateSeen(state)
 
     expect(result).toBe(false)
   })
 
   it('should return "upgrade" update type when robot is behind the update', () => {
-    const state = { buildroot: { version: '1.0.0' } }
-    const robot = { name: 'robot-name' }
+    const state: State = { buildroot: { version: '1.0.0' } } as any
+    const robot = { name: 'robot-name' } as any
 
     getRobotApiVersion.mockImplementation(inputRobot => {
       expect(inputRobot).toBe(robot)
@@ -85,8 +95,8 @@ describe('buildroot selectors', () => {
   })
 
   it('should return "downgrade" update type when robot is ahead of the update', () => {
-    const state = { buildroot: { version: '1.0.0' } }
-    const robot = { name: 'robot-name' }
+    const state: State = { buildroot: { version: '1.0.0' } } as any
+    const robot = { name: 'robot-name' } as any
 
     getRobotApiVersion.mockReturnValue('1.0.1')
 
@@ -96,8 +106,8 @@ describe('buildroot selectors', () => {
   })
 
   it('should get "reinstall" update type when robot matches the update', () => {
-    const state = { buildroot: { version: '1.0.0' } }
-    const robot = { name: 'robot-name' }
+    const state: State = { buildroot: { version: '1.0.0' } } as any
+    const robot = { name: 'robot-name' } as any
 
     getRobotApiVersion.mockReturnValue('1.0.0')
 
@@ -107,8 +117,8 @@ describe('buildroot selectors', () => {
   })
 
   it('should return null update type when no update available', () => {
-    const state = { buildroot: { version: null } }
-    const robot = { name: 'robot-name' }
+    const state: State = { buildroot: { version: null } } as any
+    const robot = { name: 'robot-name' } as any
 
     getRobotApiVersion.mockReturnValue('1.0.0')
 
@@ -118,8 +128,8 @@ describe('buildroot selectors', () => {
   })
 
   it('should return null update type when no robot version available', () => {
-    const state = { buildroot: { version: '1.0.0' } }
-    const robot = { name: 'robot-name' }
+    const state: State = { buildroot: { version: '1.0.0' } } as any
+    const robot = { name: 'robot-name' } as any
 
     getRobotApiVersion.mockReturnValue(null)
 
@@ -129,11 +139,11 @@ describe('buildroot selectors', () => {
   })
 
   it('should get the buildroot update session', () => {
-    const state = {
+    const state: State = {
       buildroot: {
         session: { robotName: 'robot-name', token: null, pathPrefix: null },
       },
-    }
+    } as any
     const result = selectors.getBuildrootSession(state)
 
     expect(result).toEqual({
@@ -144,22 +154,22 @@ describe('buildroot selectors', () => {
   })
 
   it('should get the robot name from the update session', () => {
-    const state = {
+    const state: State = {
       buildroot: {
         session: { robotName: 'robot-name', token: null, pathPrefix: null },
       },
-    }
+    } as any
     const result = selectors.getBuildrootRobotName(state)
 
     expect(result).toBe('robot-name')
   })
 
   it('should get the full robot from the update session', () => {
-    const state = {
+    const state: State = {
       buildroot: {
         session: { robotName: 'robot-name' },
       },
-    }
+    } as any
 
     getViewableRobots.mockImplementation(inputState => {
       expect(inputState).toBe(state)
@@ -167,7 +177,7 @@ describe('buildroot selectors', () => {
         { name: 'other-robot-name', host: '10.10.0.1', port: 31950 },
         { name: 'robot-name', host: '10.10.0.0', port: 31950 },
         { name: 'another-robot-name', host: '10.10.0.2', port: 31950 },
-      ]
+      ] as any
     })
 
     const result = selectors.getBuildrootRobot(state)
@@ -179,11 +189,11 @@ describe('buildroot selectors', () => {
   })
 
   it('should get the robot from session after migration with opentrons- name prefix', () => {
-    const state = {
+    const state: State = {
       buildroot: {
         session: { robotName: 'opentrons-robot-name' },
       },
-    }
+    } as any
 
     getViewableRobots.mockReturnValue([
       { name: 'other-robot-name', host: '10.10.0.1', port: 31950 },
@@ -194,7 +204,7 @@ describe('buildroot selectors', () => {
         serverHealth: { capabilities: { buildrootUpdate: '/' } },
       },
       { name: 'another-robot-name', host: '10.10.0.2', port: 31950 },
-    ])
+    ] as any[])
 
     const result = selectors.getBuildrootRobot(state)
     expect(result).toEqual({
@@ -211,13 +221,13 @@ describe('buildroot selectors', () => {
       host: '10.10.0.0',
       port: 31950,
       serverHealth: { capabilities: { buildrootUpdate: '/' } },
-    }
+    } as any
 
     getViewableRobots.mockReturnValue([
       { name: 'other-robot-name', host: '10.10.0.1', port: 31950 },
       robot,
       { name: 'another-robot-name', host: '10.10.0.2', port: 31950 },
-    ])
+    ] as any[])
 
     expect(
       selectors.getBuildrootUpdateInProgress(
@@ -225,11 +235,11 @@ describe('buildroot selectors', () => {
           buildroot: {
             session: {
               robotName: 'opentrons-robot-name',
-              step: Constants.RESTARTING,
+              step: Constants.RESTART,
               error: null,
             },
           },
-        },
+        } as any,
         robot
       )
     ).toBe(true)
@@ -240,11 +250,11 @@ describe('buildroot selectors', () => {
           buildroot: {
             session: {
               robotName: 'opentrons-robot-name',
-              step: Constants.RESTARTING,
+              step: Constants.RESTART,
               error: { message: 'oh no!' },
             },
           },
-        },
+        } as any,
         robot
       )
     ).toBe(false)
@@ -259,21 +269,21 @@ describe('buildroot selectors', () => {
               error: null,
             },
           },
-        },
+        } as any,
         robot
       )
     ).toBe(false)
 
     expect(
       selectors.getBuildrootUpdateInProgress(
-        { buildroot: { session: null } },
+        { buildroot: { session: null } } as any,
         robot
       )
     ).toBe(false)
   })
 
   it('should return update disabled because not responding if no robot', () => {
-    const state = { buildroot: {} }
+    const state: State = { buildroot: {} } as any
     const robotName = 'robot-name'
 
     getRobotByName.mockImplementation((inputState, inputName) => {
@@ -295,7 +305,7 @@ describe('buildroot selectors', () => {
   })
 
   it('should return update disabled if robot has unhealthy update sever', () => {
-    const state = { buildroot: {} }
+    const state: State = { buildroot: {} } as any
     const robotName = 'robot-name'
 
     getRobotByName.mockReturnValue({
@@ -316,7 +326,9 @@ describe('buildroot selectors', () => {
   })
 
   it('should return update disabled because other robot updating', () => {
-    const state = { buildroot: { session: { robotName: 'other-name' } } }
+    const state: State = {
+      buildroot: { session: { robotName: 'other-name' } },
+    } as any
     const robotName = 'robot-name'
     const robot = { ...mockReachableRobot, name: robotName }
     const otherRobot = { ...mockReachableRobot, name: 'other-name' }
@@ -341,7 +353,7 @@ describe('buildroot selectors', () => {
   })
 
   it('should return auto-update disabled but from-file enabled if no downloaded files', () => {
-    const state = { buildroot: {} }
+    const state: State = { buildroot: {} } as any
     const robotName = 'robot-name'
     const robot = { ...mockReachableRobot, name: robotName }
 
@@ -360,7 +372,7 @@ describe('buildroot selectors', () => {
   })
 
   it('should return all updates allowed if update files exist and robot is healthy', () => {
-    const state = { buildroot: { version: '1.0.0' } }
+    const state: State = { buildroot: { version: '1.0.0' } } as any
     const robotName = 'robot-name'
     const robot = { ...mockReachableRobot, name: robotName }
 
diff --git a/app/src/redux/buildroot/actions.ts b/app/src/redux/buildroot/actions.ts
index 0e0aca9684d..857b29b7c0c 100644
--- a/app/src/redux/buildroot/actions.ts
+++ b/app/src/redux/buildroot/actions.ts
@@ -1,4 +1,3 @@
-// @flow
 import * as Constants from './constants'
 
 import type { RobotHost } from '../robot-api/types'
@@ -6,6 +5,7 @@ import type {
   BuildrootAction,
   UpdateSessionStep,
   UpdateSessionStage,
+  BuildrootStatusAction,
 } from './types'
 
 export function setBuildrootUpdateSeen(robotName: string): BuildrootAction {
@@ -64,7 +64,7 @@ export function buildrootStatus(
   stage: UpdateSessionStage,
   message: string,
   progress: number | null
-): BuildrootAction {
+): BuildrootStatusAction {
   return { type: Constants.BR_STATUS, payload: { stage, message, progress } }
 }
 
diff --git a/app/src/redux/buildroot/constants.ts b/app/src/redux/buildroot/constants.ts
index b79ca578434..34dd38ba423 100644
--- a/app/src/redux/buildroot/constants.ts
+++ b/app/src/redux/buildroot/constants.ts
@@ -1,5 +1,3 @@
-// @flow
-
 // session steps
 
 export const PREMIGRATION: 'premigration' = 'premigration'
diff --git a/app/src/redux/buildroot/epic.ts b/app/src/redux/buildroot/epic.ts
index c9f1936ec27..741b924f4f7 100644
--- a/app/src/redux/buildroot/epic.ts
+++ b/app/src/redux/buildroot/epic.ts
@@ -1,4 +1,3 @@
-// @flow
 // epics to control the buildroot migration / update flow
 import every from 'lodash/every'
 import { combineEpics, ofType } from 'redux-observable'
@@ -68,7 +67,8 @@ import {
   BR_CREATE_SESSION_SUCCESS,
 } from './constants'
 
-import type { State, Epic } from '../types'
+import type { Observable } from 'rxjs'
+import type { State, Action, Epic } from '../types'
 import type { ViewableRobot } from '../discovery/types'
 import type { RobotApiResponse } from '../robot-api/types'
 import type { RestartStatusChangedAction } from '../robot-admin/types'
@@ -79,6 +79,7 @@ import type {
   CreateSessionAction,
   CreateSessionSuccessAction,
   BuildrootUpdateSession,
+  BuildrootStatusAction,
 } from './types'
 
 export const POLL_INTERVAL_MS = 2000
@@ -105,9 +106,9 @@ const CHECK_TO_VERIFY_UPDATE =
 //   if  migrated, kickoff regular buildroot update
 export const startUpdateEpic: Epic = (action$, state$) =>
   action$.pipe(
-    ofType(BR_START_UPDATE),
+    ofType<Action, StartBuildrootUpdateAction>(BR_START_UPDATE),
     withLatestFrom(state$),
-    map<[StartBuildrootUpdateAction, State], _>(([action, state]) => {
+    map<[StartBuildrootUpdateAction, State], any>(([action, state]) => {
       // BR_START_UPDATE will set the active updating robot in state
       const { robotName, systemFile } = action.payload
       const host = getBuildrootRobot(state)
@@ -129,6 +130,7 @@ export const startUpdateEpic: Epic = (action$, state$) =>
 
       // if capabilities is empty, the robot requires premigration
       if (capabilities === null) {
+        // @ts-expect-error TODO: host is actually of type Robot|ReachableRobot but this action expects a RobotHost
         return startBuildrootPremigration(host)
       }
 
@@ -143,6 +145,7 @@ export const startUpdateEpic: Epic = (action$, state$) =>
         )
       }
 
+      // @ts-expect-error TODO: host is actually of type Robot|ReachableRobot but this action expects a RobotHost
       return createSession(host, sessionPath)
     })
   )
@@ -167,8 +170,8 @@ export const retryAfterUserFileInfoEpic: Epic = (action$, state$) => {
   return action$.pipe(
     ofType(BR_USER_FILE_INFO),
     withLatestFrom(state$, (_, state) => getBuildrootRobotName(state)),
-    filter(robotName => robotName !== null),
-    map<string, _>(robotName => startBuildrootUpdate(robotName))
+    filter((robotName): robotName is string => robotName !== null),
+    map<string, any>(robotName => startBuildrootUpdate(robotName))
   )
 }
 
@@ -177,10 +180,12 @@ export const retryAfterUserFileInfoEpic: Epic = (action$, state$) => {
 export const createSessionEpic: Epic = action$ => {
   return action$.pipe(
     ofType(BR_CREATE_SESSION),
-    switchMap<CreateSessionAction, _, _>(createAction => {
-      const { host, sessionPath } = createAction.payload
-      return fetchRobotApi(host, { method: POST, path: sessionPath })
-    }),
+    switchMap<CreateSessionAction, ReturnType<typeof fetchRobotApi>>(
+      createAction => {
+        const { host, sessionPath } = createAction.payload
+        return fetchRobotApi(host, { method: POST, path: sessionPath })
+      }
+    ),
     switchMap(resp => {
       const { host, path, ok, status } = resp
       const pathPrefix = path.replace('/begin', '')
@@ -212,41 +217,44 @@ export const createSessionEpic: Epic = action$ => {
 export const statusPollEpic: Epic = (action$, state$) => {
   return action$.pipe(
     ofType(BR_CREATE_SESSION_SUCCESS),
-    mergeMap<CreateSessionSuccessAction, _, _>(action => {
-      const { host, token, pathPrefix } = action.payload
-      const request = { method: GET, path: `${pathPrefix}/${token}/status` }
-
-      return interval(POLL_INTERVAL_MS).pipe(
-        takeUntil(
-          state$.pipe(
-            filter<State, _>(state => {
-              const session = getBuildrootSession(state)
-              return (
-                session?.stage === READY_FOR_RESTART ||
-                session?.error === true ||
-                session === null
-              )
-            })
-          )
-        ),
-        switchMap(() => fetchRobotApi(host, request)),
-        filter(resp => resp.ok),
-        map<RobotApiResponse, BuildrootAction>(successResp =>
-          buildrootStatus(
-            successResp.body.stage,
-            successResp.body.message,
-            successResp.body.progress != null
-              ? Math.round(successResp.body.progress * 100)
-              : null
+    mergeMap<CreateSessionSuccessAction, Observable<BuildrootStatusAction>>(
+      action => {
+        const { host, token, pathPrefix } = action.payload
+        const request = { method: GET, path: `${pathPrefix}/${token}/status` }
+
+        return interval(POLL_INTERVAL_MS).pipe(
+          takeUntil(
+            state$.pipe(
+              filter(state => {
+                const session = getBuildrootSession(state)
+                return (
+                  session?.stage === READY_FOR_RESTART ||
+                  // @ts-expect-error TODO: `session?.error === true` always returns false, remove it?
+                  session?.error === true ||
+                  session === null
+                )
+              })
+            )
+          ),
+          switchMap(() => fetchRobotApi(host, request)),
+          filter(resp => resp.ok),
+          map<RobotApiResponse, BuildrootStatusAction>(successResp =>
+            buildrootStatus(
+              successResp.body.stage,
+              successResp.body.message,
+              successResp.body.progress != null
+                ? Math.round(successResp.body.progress * 100)
+                : null
+            )
           )
         )
-      )
-    })
+      }
+    )
   )
 }
 
 // filter for an active session with given properties
-const passActiveSession = (props: $Shape<BuildrootUpdateSession>) => (
+const passActiveSession = (props: Partial<BuildrootUpdateSession>) => (
   state: State
 ): boolean => {
   const robot = getBuildrootRobot(state)
@@ -257,7 +265,10 @@ const passActiveSession = (props: $Shape<BuildrootUpdateSession>) => (
     !session?.error &&
     typeof session?.pathPrefix === 'string' &&
     typeof session?.token === 'string' &&
-    every(props, (value, key) => session?.[key] === value)
+    every(
+      props,
+      (value, key) => session?.[key as keyof BuildrootUpdateSession] === value
+    )
   )
 }
 
@@ -265,14 +276,15 @@ const passActiveSession = (props: $Shape<BuildrootUpdateSession>) => (
 export const uploadFileEpic: Epic = (_, state$) => {
   return state$.pipe(
     filter(passActiveSession({ stage: AWAITING_FILE, step: GET_TOKEN })),
-    map<State, _>(stateWithSession => {
-      const host: ViewableRobot = (getBuildrootRobot(stateWithSession): any)
+    map<State, ReturnType<typeof uploadBuildrootFile>>(stateWithSession => {
+      const host: ViewableRobot = getBuildrootRobot(stateWithSession) as any
       const session = getBuildrootSession(stateWithSession)
-      const pathPrefix: string = (session?.pathPrefix: any)
-      const token: string = (session?.token: any)
+      const pathPrefix: string = session?.pathPrefix as any
+      const token: string = session?.token as any
       const systemFile = session?.userFileInfo?.systemFile || null
 
       return uploadBuildrootFile(
+        // @ts-expect-error TODO: host is actually of type Robot|ReachableRobot but this action expects a RobotHost
         host,
         `${pathPrefix}/${token}/file`,
         systemFile
@@ -285,12 +297,13 @@ export const uploadFileEpic: Epic = (_, state$) => {
 export const commitUpdateEpic: Epic = (_, state$) => {
   return state$.pipe(
     filter(passActiveSession({ stage: DONE, step: PROCESS_FILE })),
-    switchMap<State, _, BuildrootAction>(stateWithSession => {
-      const host: ViewableRobot = (getBuildrootRobot(stateWithSession): any)
+    switchMap<State, Observable<BuildrootAction>>(stateWithSession => {
+      const host: ViewableRobot = getBuildrootRobot(stateWithSession) as any
       const session = getBuildrootSession(stateWithSession)
-      const pathPrefix: string = (session?.pathPrefix: any)
-      const token: string = (session?.token: any)
+      const pathPrefix: string = session?.pathPrefix as any
+      const token: string = session?.token as any
       const path = `${pathPrefix}/${token}/commit`
+      // @ts-expect-error TODO: host is actually of type Robot|ReachableRobot but this action expects a RobotHost
       const request$ = fetchRobotApi(host, { method: POST, path }).pipe(
         filter(resp => !resp.ok),
         map(resp => {
@@ -311,9 +324,10 @@ export const restartAfterCommitEpic: Epic = (_, state$) => {
     filter(
       passActiveSession({ stage: READY_FOR_RESTART, step: COMMIT_UPDATE })
     ),
-    switchMap<State, _, _>(stateWithSession => {
-      const host: ViewableRobot = (getBuildrootRobot(stateWithSession): any)
+    switchMap<State, Observable<any>>(stateWithSession => {
+      const host: ViewableRobot = getBuildrootRobot(stateWithSession) as any
       const path = host.serverHealth?.capabilities?.restart || RESTART_PATH
+      // @ts-expect-error TODO: host is actually of type Robot|ReachableRobot but this action expects a RobotHost
       const request$ = fetchRobotApi(host, { method: POST, path }).pipe(
         switchMap(resp => {
           return resp.ok
@@ -337,8 +351,11 @@ export const restartAfterCommitEpic: Epic = (_, state$) => {
 export const finishAfterRestartEpic: Epic = (action$, state$) => {
   return action$.pipe(
     ofType(RESTART_STATUS_CHANGED),
-    withLatestFrom<RestartStatusChangedAction, State>(state$),
-    filter(([action, state]) => {
+    withLatestFrom<
+      RestartStatusChangedAction,
+      [RestartStatusChangedAction, State]
+    >(state$),
+    filter(([action, state]: [RestartStatusChangedAction, State]) => {
       const session = getBuildrootSession(state)
       const robot = getBuildrootRobot(state)
       const restartDone =
@@ -354,7 +371,7 @@ export const finishAfterRestartEpic: Epic = (action$, state$) => {
     }),
     switchMap(([action, stateWithRobot]) => {
       const targetVersion = getBuildrootTargetVersion(stateWithRobot)
-      const robot: ViewableRobot = (getBuildrootRobot(stateWithRobot): any)
+      const robot: ViewableRobot = getBuildrootRobot(stateWithRobot) as any
       const robotVersion = getRobotApiVersion(robot)
       const timedOut = action.payload.restartStatus === RESTART_TIMED_OUT_STATUS
       const actual = robotVersion ?? UNKNOWN
@@ -400,8 +417,8 @@ export const removeMigratedRobotsEpic: Epic = (_, state$) => {
         allRobots.some(r => r.name === robotName)
       )
     }),
-    map<State, _>(stateWithRobotName => {
-      const robotName: string = (getBuildrootRobotName(stateWithRobotName): any)
+    map<State, ReturnType<typeof removeRobot>>(stateWithRobotName => {
+      const robotName: string = getBuildrootRobotName(stateWithRobotName) as any
       return removeRobot(robotName)
     })
   )
@@ -411,7 +428,7 @@ export const disconnectRpcOnStartEpic: Epic = action$ => {
   return action$.pipe(ofType(BR_START_UPDATE), mapTo(robotActions.disconnect()))
 }
 
-export const buildrootEpic: Epic = combineEpics(
+export const buildrootEpic = combineEpics<Epic>(
   startUpdateEpic,
   retryAfterPremigrationEpic,
   retryAfterUserFileInfoEpic,
diff --git a/app/src/redux/buildroot/index.ts b/app/src/redux/buildroot/index.ts
index 375ed43fe48..497c8935180 100644
--- a/app/src/redux/buildroot/index.ts
+++ b/app/src/redux/buildroot/index.ts
@@ -1,5 +1,3 @@
-// @flow
-
 export * from './actions'
 export * from './constants'
 export * from './selectors'
diff --git a/app/src/redux/buildroot/reducer.ts b/app/src/redux/buildroot/reducer.ts
index c01c6ae6a31..b16a922dae8 100644
--- a/app/src/redux/buildroot/reducer.ts
+++ b/app/src/redux/buildroot/reducer.ts
@@ -1,6 +1,6 @@
-// @flow
 import * as Constants from './constants'
 
+import type { Reducer } from 'redux'
 import type { Action } from '../types'
 import type { BuildrootState, BuildrootUpdateSession } from './types'
 
@@ -27,10 +27,10 @@ export const initialSession = (
   error: null,
 })
 
-export function buildrootReducer(
-  state: BuildrootState = INITIAL_STATE,
-  action: Action
-): BuildrootState {
+export const buildrootReducer: Reducer<BuildrootState, Action> = (
+  state = INITIAL_STATE,
+  action
+) => {
   switch (action.type) {
     case Constants.BR_UPDATE_VERSION: {
       return { ...state, version: action.payload }
diff --git a/app/src/redux/buildroot/selectors.ts b/app/src/redux/buildroot/selectors.ts
index 7e03b7a7ec1..e6033775372 100644
--- a/app/src/redux/buildroot/selectors.ts
+++ b/app/src/redux/buildroot/selectors.ts
@@ -1,4 +1,3 @@
-// @flow
 import semver from 'semver'
 import { createSelector } from 'reselect'
 
@@ -82,7 +81,9 @@ export function getBuildrootRobotName(state: State): string | null {
   return state.buildroot.session?.robotName || null
 }
 
-export const getBuildrootRobot: State => ViewableRobot | null = createSelector(
+export const getBuildrootRobot: (
+  state: State
+) => ViewableRobot | null = createSelector(
   getViewableRobots,
   getBuildrootRobotName,
   (robots, robotName) => {
@@ -135,11 +136,11 @@ export function getBuildrootUpdateAvailable(
 export const getBuildrootUpdateDisplayInfo: (
   state: State,
   robotName: string
-) => {|
-  autoUpdateAction: string,
-  autoUpdateDisabledReason: string | null,
-  updateFromFileDisabledReason: string | null,
-|} = createSelector(
+) => {
+  autoUpdateAction: string
+  autoUpdateDisabledReason: string | null
+  updateFromFileDisabledReason: string | null
+} = createSelector(
   getRobotByName,
   state => getBuildrootRobot(state),
   state => getBuildrootUpdateVersion(state),
diff --git a/app/src/redux/buildroot/types.ts b/app/src/redux/buildroot/types.ts
index ec0be4ed0b5..d08cd1483fd 100644
--- a/app/src/redux/buildroot/types.ts
+++ b/app/src/redux/buildroot/types.ts
@@ -1,18 +1,17 @@
-// @flow
 import type { RobotHost } from '../robot-api/types'
 
 export type BuildrootUpdateType = 'upgrade' | 'downgrade' | 'reinstall'
 
 export type RobotSystemType = 'balena' | 'buildroot'
 
-export type BuildrootUpdateInfo = {|
-  releaseNotes: string,
-|}
+export interface BuildrootUpdateInfo {
+  releaseNotes: string
+}
 
-export type BuildrootUserFileInfo = {|
-  systemFile: string,
-  version: string,
-|}
+export interface BuildrootUserFileInfo {
+  systemFile: string
+  version: string
+}
 
 export type BuildrootStatus = 'balena' | 'migrating' | 'buildroot'
 
@@ -38,54 +37,54 @@ export type UpdateSessionStep =
   | 'restarting'
   | 'finished'
 
-export type BuildrootUpdateSession = {|
-  robotName: string,
-  userFileInfo: BuildrootUserFileInfo | null,
-  token: string | null,
-  pathPrefix: string | null,
-  step: UpdateSessionStep | null,
-  stage: UpdateSessionStage | null,
-  progress: number | null,
-  error: string | null,
-|}
+export interface BuildrootUpdateSession {
+  robotName: string
+  userFileInfo: BuildrootUserFileInfo | null
+  token: string | null
+  pathPrefix: string | null
+  step: UpdateSessionStep | null
+  stage: UpdateSessionStage | null
+  progress: number | null
+  error: string | null
+}
 
-export type BuildrootState = {|
-  seen: boolean,
-  downloadProgress: number | null,
-  downloadError: string | null,
-  version: string | null,
-  info: BuildrootUpdateInfo | null,
-  session: BuildrootUpdateSession | null,
-|}
+export interface BuildrootState {
+  seen: boolean
+  downloadProgress: number | null
+  downloadError: string | null
+  version: string | null
+  info: BuildrootUpdateInfo | null
+  session: BuildrootUpdateSession | null
+}
 
-export type StartBuildrootUpdateAction = {|
-  type: 'buildroot:START_UPDATE',
-  payload: {| robotName: string, systemFile: string | null |},
-|}
+export interface StartBuildrootUpdateAction {
+  type: 'buildroot:START_UPDATE'
+  payload: { robotName: string; systemFile: string | null }
+}
 
-export type CreateSessionAction = {|
-  type: 'buildroot:CREATE_SESSION',
-  payload: {| host: RobotHost, sessionPath: string |},
-|}
+export interface CreateSessionAction {
+  type: 'buildroot:CREATE_SESSION'
+  payload: { host: RobotHost; sessionPath: string }
+}
 
-export type CreateSessionSuccessAction = {|
-  type: 'buildroot:CREATE_SESSION_SUCCESS',
-  payload: {| host: RobotHost, token: string, pathPrefix: string |},
-|}
+export interface CreateSessionSuccessAction {
+  type: 'buildroot:CREATE_SESSION_SUCCESS'
+  payload: { host: RobotHost; token: string; pathPrefix: string }
+}
 
-export type BuildrootStatusAction = {|
-  type: 'buildroot:STATUS',
-  payload: {|
-    stage: UpdateSessionStage,
-    message: string,
-    progress: number | null,
-  |},
-|}
+export interface BuildrootStatusAction {
+  type: 'buildroot:STATUS'
+  payload: {
+    stage: UpdateSessionStage
+    message: string
+    progress: number | null
+  }
+}
 
-export type UnexpectedBuildrootError = {|
-  type: 'buildroot:UNEXPECTED_ERROR',
-  payload: {| message: string |},
-|}
+export interface UnexpectedBuildrootError {
+  type: 'buildroot:UNEXPECTED_ERROR'
+  payload: { message: string }
+}
 
 export type BuildrootAction =
   | StartBuildrootUpdateAction
@@ -93,31 +92,31 @@ export type BuildrootAction =
   | CreateSessionSuccessAction
   | BuildrootStatusAction
   | UnexpectedBuildrootError
-  | {| type: 'buildroot:DOWNLOAD_PROGRESS', payload: number |}
-  | {| type: 'buildroot:DOWNLOAD_ERROR', payload: string |}
-  | {| type: 'buildroot:UPDATE_VERSION', payload: string |}
-  | {| type: 'buildroot:UPDATE_INFO', payload: BuildrootUpdateInfo |}
-  | {| type: 'buildroot:USER_FILE_INFO', payload: BuildrootUserFileInfo |}
-  | {| type: 'buildroot:SET_UPDATE_SEEN', meta: {| robotName: string |} |}
-  | {| type: 'buildroot:CHANGELOG_SEEN', meta: {| robotName: string |} |}
-  | {| type: 'buildroot:UPDATE_IGNORED', meta: {| robotName: string |} |}
-  | {|
-      type: 'buildroot:START_PREMIGRATION',
-      payload: RobotHost,
-      meta: {| shell: true |},
-    |}
-  | {| type: 'buildroot:PREMIGRATION_DONE', payload: string |}
-  | {| type: 'buildroot:PREMIGRATION_ERROR', payload: {| message: string |} |}
-  | {|
-      type: 'buildroot:READ_USER_FILE',
-      payload: {| systemFile: string |},
-      meta: {| shell: true |},
-    |}
-  | {|
-      type: 'buildroot:UPLOAD_FILE',
-      payload: {| host: RobotHost, path: string, systemFile: string | null |},
-      meta: {| shell: true |},
-    |}
-  | {| type: 'buildroot:FILE_UPLOAD_DONE', payload: string |}
-  | {| type: 'buildroot:SET_SESSION_STEP', payload: UpdateSessionStep |}
-  | {| type: 'buildroot:CLEAR_SESSION' |}
+  | { type: 'buildroot:DOWNLOAD_PROGRESS'; payload: number }
+  | { type: 'buildroot:DOWNLOAD_ERROR'; payload: string }
+  | { type: 'buildroot:UPDATE_VERSION'; payload: string }
+  | { type: 'buildroot:UPDATE_INFO'; payload: BuildrootUpdateInfo }
+  | { type: 'buildroot:USER_FILE_INFO'; payload: BuildrootUserFileInfo }
+  | { type: 'buildroot:SET_UPDATE_SEEN'; meta: { robotName: string } }
+  | { type: 'buildroot:CHANGELOG_SEEN'; meta: { robotName: string } }
+  | { type: 'buildroot:UPDATE_IGNORED'; meta: { robotName: string } }
+  | {
+      type: 'buildroot:START_PREMIGRATION'
+      payload: RobotHost
+      meta: { shell: true }
+    }
+  | { type: 'buildroot:PREMIGRATION_DONE'; payload: string }
+  | { type: 'buildroot:PREMIGRATION_ERROR'; payload: { message: string } }
+  | {
+      type: 'buildroot:READ_USER_FILE'
+      payload: { systemFile: string }
+      meta: { shell: true }
+    }
+  | {
+      type: 'buildroot:UPLOAD_FILE'
+      payload: { host: RobotHost; path: string; systemFile: string | null }
+      meta: { shell: true }
+    }
+  | { type: 'buildroot:FILE_UPLOAD_DONE'; payload: string }
+  | { type: 'buildroot:SET_SESSION_STEP'; payload: UpdateSessionStep }
+  | { type: 'buildroot:CLEAR_SESSION' }
diff --git a/app/src/redux/calibration/__fixtures__/calibration-status.ts b/app/src/redux/calibration/__fixtures__/calibration-status.ts
index 718d8690649..2d013421a2a 100644
--- a/app/src/redux/calibration/__fixtures__/calibration-status.ts
+++ b/app/src/redux/calibration/__fixtures__/calibration-status.ts
@@ -1,4 +1,3 @@
-// @flow
 import { GET } from '../../robot-api'
 import {
   makeResponseFixtures,
@@ -50,7 +49,7 @@ export const {
   failure: mockFetchCalibrationStatusFailure,
 }: ResponseFixtures<
   CalibrationStatus,
-  {| message: string |}
+  { message: string }
 > = makeResponseFixtures({
   method: GET,
   path: CALIBRATION_STATUS_PATH,
diff --git a/app/src/redux/calibration/__fixtures__/index.ts b/app/src/redux/calibration/__fixtures__/index.ts
index 5f8338ae488..6c3b250624a 100644
--- a/app/src/redux/calibration/__fixtures__/index.ts
+++ b/app/src/redux/calibration/__fixtures__/index.ts
@@ -1,2 +1 @@
-// @flow
 export * from './calibration-status'
diff --git a/app/src/redux/calibration/__tests__/actions.test.ts b/app/src/redux/calibration/__tests__/actions.test.ts
index 1126daefe8c..c0cda12a40e 100644
--- a/app/src/redux/calibration/__tests__/actions.test.ts
+++ b/app/src/redux/calibration/__tests__/actions.test.ts
@@ -1,17 +1,15 @@
-// @flow
-
 import * as Fixtures from '../__fixtures__'
 import * as Actions from '../actions'
 import type { CalibrationAction } from '../types'
 
-type ActionSpec = {|
-  should: string,
-  creator: (...Array<any>) => CalibrationAction,
-  args: Array<mixed>,
-  expected: CalibrationAction,
-|}
+interface ActionSpec {
+  should: string
+  creator: (...args: any[]) => CalibrationAction
+  args: unknown[]
+  expected: CalibrationAction
+}
 
-const SPECS: Array<ActionSpec> = [
+const SPECS: ActionSpec[] = [
   {
     should: 'create a fetchCalibrationStatus action',
     creator: Actions.fetchCalibrationStatus,
@@ -19,7 +17,7 @@ const SPECS: Array<ActionSpec> = [
     expected: {
       type: 'calibration:FETCH_CALIBRATION_STATUS',
       payload: { robotName: 'robot-name' },
-      meta: {},
+      meta: {} as any,
     },
   },
   {
@@ -36,7 +34,7 @@ const SPECS: Array<ActionSpec> = [
         robotName: 'robot-name',
         calibrationStatus: Fixtures.mockCalibrationStatus,
       },
-      meta: { requestId: '123' },
+      meta: { requestId: '123' } as any,
     },
   },
   {
@@ -53,7 +51,7 @@ const SPECS: Array<ActionSpec> = [
         robotName: 'robot-name',
         error: Fixtures.mockFetchCalibrationStatusFailure.body,
       },
-      meta: { requestId: '123' },
+      meta: { requestId: '123' } as any,
     },
   },
 ]
diff --git a/app/src/redux/calibration/__tests__/reducer.test.ts b/app/src/redux/calibration/__tests__/reducer.test.ts
index 998f4841f2e..6ef698df983 100644
--- a/app/src/redux/calibration/__tests__/reducer.test.ts
+++ b/app/src/redux/calibration/__tests__/reducer.test.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import * as Fixtures from '../__fixtures__'
 import * as LabwareFixtures from '../labware/__fixtures__'
 import * as Labware from '../labware'
@@ -15,7 +13,7 @@ describe('calibration reducer', () => {
     const action = Actions.fetchCalibrationStatusSuccess(
       'robot-name',
       Fixtures.mockCalibrationStatus,
-      {}
+      {} as any
     )
 
     expect(calibrationReducer({}, action)).toEqual({
@@ -32,7 +30,7 @@ describe('calibration reducer', () => {
     const action = Labware.fetchLabwareCalibrationsSuccess(
       'robot-name',
       LabwareFixtures.mockAllLabwareCalibration,
-      {}
+      {} as any
     )
 
     expect(calibrationReducer({}, action)).toEqual({
@@ -49,7 +47,7 @@ describe('calibration reducer', () => {
     const action = PipetteOffset.fetchPipetteOffsetCalibrationsSuccess(
       'robot-name',
       PipetteOffsetFixtures.mockAllPipetteOffsetsCalibration,
-      {}
+      {} as any
     )
 
     expect(calibrationReducer({}, action)).toEqual({
@@ -67,7 +65,7 @@ describe('calibration reducer', () => {
     const action = TipLength.fetchTipLengthCalibrationsSuccess(
       'robot-name',
       TipLengthFixtures.mockAllTipLengthCalibrations,
-      {}
+      {} as any
     )
 
     expect(calibrationReducer({}, action)).toEqual({
diff --git a/app/src/redux/calibration/__tests__/selectors.test.ts b/app/src/redux/calibration/__tests__/selectors.test.ts
index 4bb49040078..4a8078af131 100644
--- a/app/src/redux/calibration/__tests__/selectors.test.ts
+++ b/app/src/redux/calibration/__tests__/selectors.test.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import * as Fixtures from '../__fixtures__'
 import * as Selectors from '../selectors'
 
@@ -8,12 +6,12 @@ import type { State } from '../../types'
 describe('calibration selectors', () => {
   describe('getCalibrationStatus', () => {
     it('should return null if no robot in state', () => {
-      const state: $Shape<State> = { calibration: {} }
+      const state: State = { calibration: {} } as any
       expect(Selectors.getCalibrationStatus(state, 'robotName')).toBe(null)
     })
 
     it('should return null if robot in state but no status', () => {
-      const state: $Shape<State> = {
+      const state: State = {
         calibration: {
           robotName: {
             calibrationStatus: null,
@@ -22,12 +20,12 @@ describe('calibration selectors', () => {
             tipLengthCalibrations: null,
           },
         },
-      }
+      } as any
       expect(Selectors.getCalibrationStatus(state, 'robotName')).toBe(null)
     })
 
     it('should return status if in state', () => {
-      const state: $Shape<State> = {
+      const state: State = {
         calibration: {
           robotName: {
             calibrationStatus: Fixtures.mockCalibrationStatus,
@@ -36,7 +34,7 @@ describe('calibration selectors', () => {
             tipLengthCalibrations: null,
           },
         },
-      }
+      } as any
       expect(Selectors.getCalibrationStatus(state, 'robotName')).toEqual(
         Fixtures.mockCalibrationStatus
       )
@@ -45,12 +43,12 @@ describe('calibration selectors', () => {
 
   describe('getDeckCalibrationStatus', () => {
     it('should return null if no robot in state', () => {
-      const state: $Shape<State> = { calibration: {} }
+      const state: State = { calibration: {} } as any
       expect(Selectors.getDeckCalibrationStatus(state, 'robotName')).toBe(null)
     })
 
     it('should return status if in state', () => {
-      const state: $Shape<State> = {
+      const state: State = {
         calibration: {
           robotName: {
             calibrationStatus: Fixtures.mockCalibrationStatus,
@@ -59,7 +57,7 @@ describe('calibration selectors', () => {
             tipLengthCalibrations: null,
           },
         },
-      }
+      } as any
       expect(Selectors.getDeckCalibrationStatus(state, 'robotName')).toEqual(
         Fixtures.mockCalibrationStatus.deckCalibration.status
       )
diff --git a/app/src/redux/calibration/actions.ts b/app/src/redux/calibration/actions.ts
index a6fad208df1..1bddc28f1cb 100644
--- a/app/src/redux/calibration/actions.ts
+++ b/app/src/redux/calibration/actions.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import { resetConfigValue, updateConfigValue } from '../config'
 import type {
   ResetConfigValueAction,
diff --git a/app/src/redux/calibration/api-types.ts b/app/src/redux/calibration/api-types.ts
index f45f387e6de..d12f752e021 100644
--- a/app/src/redux/calibration/api-types.ts
+++ b/app/src/redux/calibration/api-types.ts
@@ -1,6 +1,4 @@
-// @flow
-
-import typeof {
+import {
   DECK_CAL_STATUS_OK,
   DECK_CAL_STATUS_IDENTITY,
   DECK_CAL_STATUS_BAD_CALIBRATION,
@@ -16,10 +14,10 @@ import typeof {
 import type { Mount } from '@opentrons/components'
 
 export type DeckCalibrationStatus =
-  | DECK_CAL_STATUS_OK
-  | DECK_CAL_STATUS_IDENTITY
-  | DECK_CAL_STATUS_BAD_CALIBRATION
-  | DECK_CAL_STATUS_SINGULARITY
+  | typeof DECK_CAL_STATUS_OK
+  | typeof DECK_CAL_STATUS_IDENTITY
+  | typeof DECK_CAL_STATUS_BAD_CALIBRATION
+  | typeof DECK_CAL_STATUS_SINGULARITY
 
 export type AffineMatrix = [
   [number, number, number, number],
@@ -35,104 +33,104 @@ export type AttitudeMatrix = [
 ]
 
 export type CalibrationSource =
-  | CALIBRATION_SOURCE_DEFAULT
-  | CALIBRATION_SOURCE_FACTORY
-  | CALIBRATION_SOURCE_USER
-  | CALIBRATION_SOURCE_CALIBRATION_CHECK
-  | CALIBRATION_SOURCE_UNKNOWN
-  | CALIBRATION_SOURCE_LEGACY
-
-export type IndividualCalibrationStatus = {|
-  markedBad: boolean,
-  source: CalibrationSource | null,
-  markedAt: string | null,
-|}
-
-export type DeckCalibrationInfo = {|
-  matrix: AffineMatrix | AttitudeMatrix,
-  lastModified: string | null,
-  pipetteCalibratedWith: string | null,
-  tiprack: string | null,
-  type: string,
-  source?: CalibrationSource,
-  status?: IndividualCalibrationStatus,
-|}
+  | typeof CALIBRATION_SOURCE_DEFAULT
+  | typeof CALIBRATION_SOURCE_FACTORY
+  | typeof CALIBRATION_SOURCE_USER
+  | typeof CALIBRATION_SOURCE_CALIBRATION_CHECK
+  | typeof CALIBRATION_SOURCE_UNKNOWN
+  | typeof CALIBRATION_SOURCE_LEGACY
+
+export interface IndividualCalibrationStatus {
+  markedBad: boolean
+  source: CalibrationSource | null
+  markedAt: string | null
+}
+
+export interface DeckCalibrationInfo {
+  matrix: AffineMatrix | AttitudeMatrix
+  lastModified: string | null
+  pipetteCalibratedWith: string | null
+  tiprack: string | null
+  type: string
+  source?: CalibrationSource
+  status?: IndividualCalibrationStatus
+}
 
 export type DeckCalibrationData = DeckCalibrationInfo | AffineMatrix
 
-export type CalibrationStatus = {|
-  deckCalibration: {|
-    status: DeckCalibrationStatus,
-    data: DeckCalibrationData,
-  |},
-  instrumentCalibration: {|
-    right: {|
-      single: [number, number, number],
-      multi: [number, number, number],
-    |},
-    left: {|
-      single: [number, number, number],
-      multi: [number, number, number],
-    |},
-  |},
-|}
-
-export type OffsetData = {|
-  value: [number, number, number],
-  lastModified: string,
-|}
-
-export type TipLengthData = {|
-  value: number,
-  lastModified: string,
-|}
-
-export type CalibrationData = {|
-  offset: OffsetData,
-  tipLength: TipLengthData | null,
-|}
-
-export type LabwareCalibration = {|
-  calibrationData: CalibrationData,
-  loadName: string,
-  namespace: string,
-  version: number,
-  parent: string,
-  definitionHash: string,
-  id: string,
-|}
-
-export type AllLabwareCalibrations = {|
-  data: Array<LabwareCalibration>,
-|}
-
-export type PipetteOffsetCalibration = {|
-  pipette: string,
-  mount: Mount,
-  offset: [number, number, number],
-  tiprack: string,
-  tiprackUri: string,
-  lastModified: string,
-  source: CalibrationSource,
-  status: IndividualCalibrationStatus,
-  id: string,
-|}
-
-export type AllPipetteOffsetCalibrations = {|
-  data: Array<PipetteOffsetCalibration>,
-|}
-
-export type TipLengthCalibration = {|
-  tipLength: number,
-  tiprack: string,
-  pipette: string,
-  lastModified: string,
-  source: CalibrationSource,
-  status: IndividualCalibrationStatus,
-  id: string,
-  uri?: string | null,
-|}
-
-export type AllTipLengthCalibrations = {|
-  data: Array<TipLengthCalibration>,
-|}
+export interface CalibrationStatus {
+  deckCalibration: {
+    status: DeckCalibrationStatus
+    data: DeckCalibrationData
+  }
+  instrumentCalibration: {
+    right: {
+      single: [number, number, number]
+      multi: [number, number, number]
+    }
+    left: {
+      single: [number, number, number]
+      multi: [number, number, number]
+    }
+  }
+}
+
+export interface OffsetData {
+  value: [number, number, number]
+  lastModified: string
+}
+
+export interface TipLengthData {
+  value: number
+  lastModified: string
+}
+
+export interface CalibrationData {
+  offset: OffsetData
+  tipLength: TipLengthData | null
+}
+
+export interface LabwareCalibration {
+  calibrationData: CalibrationData
+  loadName: string
+  namespace: string
+  version: number
+  parent: string
+  definitionHash: string
+  id: string
+}
+
+export interface AllLabwareCalibrations {
+  data: LabwareCalibration[]
+}
+
+export interface PipetteOffsetCalibration {
+  pipette: string
+  mount: Mount
+  offset: [number, number, number]
+  tiprack: string
+  tiprackUri: string
+  lastModified: string
+  source: CalibrationSource
+  status: IndividualCalibrationStatus
+  id: string
+}
+
+export interface AllPipetteOffsetCalibrations {
+  data: PipetteOffsetCalibration[]
+}
+
+export interface TipLengthCalibration {
+  tipLength: number
+  tiprack: string
+  pipette: string
+  lastModified: string
+  source: CalibrationSource
+  status: IndividualCalibrationStatus
+  id: string
+  uri?: string | null
+}
+
+export interface AllTipLengthCalibrations {
+  data: TipLengthCalibration[]
+}
diff --git a/app/src/redux/calibration/constants.ts b/app/src/redux/calibration/constants.ts
index 6ec56eac3a2..0c14e54aff8 100644
--- a/app/src/redux/calibration/constants.ts
+++ b/app/src/redux/calibration/constants.ts
@@ -1,5 +1,3 @@
-// @flow
-
 export const CALIBRATION_SOURCE_DEFAULT: 'default' = 'default'
 export const CALIBRATION_SOURCE_FACTORY: 'factory' = 'factory'
 export const CALIBRATION_SOURCE_USER: 'user' = 'user'
diff --git a/app/src/redux/calibration/epic/__tests__/fetchCalibrationStatusEpic.test.ts b/app/src/redux/calibration/epic/__tests__/fetchCalibrationStatusEpic.test.ts
index 50ccf2272e7..16339e7cdf0 100644
--- a/app/src/redux/calibration/epic/__tests__/fetchCalibrationStatusEpic.test.ts
+++ b/app/src/redux/calibration/epic/__tests__/fetchCalibrationStatusEpic.test.ts
@@ -1,10 +1,12 @@
-// @flow
 import { setupEpicTestMocks, runEpicTest } from '../../../robot-api/__utils__'
 import * as Fixtures from '../../__fixtures__'
 import * as Actions from '../../actions'
 import { calibrationEpic } from '..'
 
-const makeTriggerAction = robotName => Actions.fetchCalibrationStatus(robotName)
+import type { Action } from '../../../types'
+
+const makeTriggerAction = (robotName: string) =>
+  Actions.fetchCalibrationStatus(robotName)
 
 describe('fetch calibration status epic', () => {
   afterEach(() => {
@@ -17,7 +19,7 @@ describe('fetch calibration status epic', () => {
       Fixtures.mockFetchCalibrationStatusSuccess
     )
 
-    runEpicTest(mocks, ({ hot, expectObservable, flush }) => {
+    runEpicTest<Action>(mocks, ({ hot, expectObservable, flush }) => {
       const action$ = hot('--a', { a: mocks.action })
       const state$ = hot('s-s', { s: mocks.state })
       const output$ = calibrationEpic(action$, state$)
diff --git a/app/src/redux/calibration/epic/fetchCalibrationStatusEpic.ts b/app/src/redux/calibration/epic/fetchCalibrationStatusEpic.ts
index 49dd3027d0d..5eacede77fa 100644
--- a/app/src/redux/calibration/epic/fetchCalibrationStatusEpic.ts
+++ b/app/src/redux/calibration/epic/fetchCalibrationStatusEpic.ts
@@ -1,4 +1,3 @@
-// @flow
 import { ofType } from 'redux-observable'
 
 import { GET } from '../../robot-api/constants'
@@ -10,7 +9,7 @@ import type {
   ActionToRequestMapper,
   ResponseToActionMapper,
 } from '../../robot-api/operators'
-import type { Epic } from '../../types'
+import type { Action, Epic } from '../../types'
 import type { FetchCalibrationStatusAction } from '../types'
 
 const mapActionToRequest: ActionToRequestMapper<FetchCalibrationStatusAction> = action => ({
@@ -32,7 +31,9 @@ const mapResponseToAction: ResponseToActionMapper<FetchCalibrationStatusAction>
 
 export const fetchCalibrationStatusEpic: Epic = (action$, state$) => {
   return action$.pipe(
-    ofType(Constants.FETCH_CALIBRATION_STATUS),
+    ofType<Action, FetchCalibrationStatusAction>(
+      Constants.FETCH_CALIBRATION_STATUS
+    ),
     mapToRobotApiRequest(
       state$,
       a => a.payload.robotName,
diff --git a/app/src/redux/calibration/epic/index.ts b/app/src/redux/calibration/epic/index.ts
index 22f051a1fa0..7535a1b7d1b 100644
--- a/app/src/redux/calibration/epic/index.ts
+++ b/app/src/redux/calibration/epic/index.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import { combineEpics } from 'redux-observable'
 import { fetchCalibrationStatusEpic } from './fetchCalibrationStatusEpic'
 import { labwareCalibrationEpic } from '../labware/epic'
@@ -8,7 +6,7 @@ import { tipLengthCalibrationsEpic } from '../tip-length/epic'
 
 import type { Epic } from '../../types'
 
-export const calibrationEpic: Epic = combineEpics(
+export const calibrationEpic: Epic = combineEpics<Epic>(
   fetchCalibrationStatusEpic,
   labwareCalibrationEpic,
   pipetteOffsetCalibrationsEpic,
diff --git a/app/src/redux/calibration/index.ts b/app/src/redux/calibration/index.ts
index 3f600b79b55..0b84ab45ad5 100644
--- a/app/src/redux/calibration/index.ts
+++ b/app/src/redux/calibration/index.ts
@@ -1,4 +1,3 @@
-// @flow
 // calibration data actions, selectors and constants
 export * from './actions'
 export * from './constants'
diff --git a/app/src/redux/calibration/labware/__fixtures__/index.ts b/app/src/redux/calibration/labware/__fixtures__/index.ts
index 60de771de32..18a7d5fb759 100644
--- a/app/src/redux/calibration/labware/__fixtures__/index.ts
+++ b/app/src/redux/calibration/labware/__fixtures__/index.ts
@@ -1,2 +1 @@
-// @flow
 export * from './labware-calibration'
diff --git a/app/src/redux/calibration/labware/__fixtures__/labware-calibration.ts b/app/src/redux/calibration/labware/__fixtures__/labware-calibration.ts
index 4d3bfb082d9..ac2817c4c8f 100644
--- a/app/src/redux/calibration/labware/__fixtures__/labware-calibration.ts
+++ b/app/src/redux/calibration/labware/__fixtures__/labware-calibration.ts
@@ -1,4 +1,3 @@
-// @flow
 import { GET } from '../../../robot-api'
 import {
   makeResponseFixtures,
@@ -61,7 +60,7 @@ export const {
   failure: mockFetchLabwareCalibrationFailure,
 }: ResponseFixtures<
   AllLabwareCalibrations,
-  {| message: string |}
+  { message: string }
 > = makeResponseFixtures({
   method: GET,
   path: LABWARE_CALIBRATION_PATH,
diff --git a/app/src/redux/calibration/labware/__tests__/actions.test.ts b/app/src/redux/calibration/labware/__tests__/actions.test.ts
index 655658355b1..e71f0b75f2e 100644
--- a/app/src/redux/calibration/labware/__tests__/actions.test.ts
+++ b/app/src/redux/calibration/labware/__tests__/actions.test.ts
@@ -1,17 +1,15 @@
-// @flow
-
 import * as Fixtures from '../__fixtures__'
 import * as Actions from '../actions'
 import type { LabwareCalibrationAction } from '../types'
 
-type ActionSpec = {|
-  should: string,
-  creator: (...Array<any>) => LabwareCalibrationAction,
-  args: Array<mixed>,
-  expected: LabwareCalibrationAction,
-|}
+interface ActionSpec {
+  should: string
+  creator: (...args: any[]) => LabwareCalibrationAction
+  args: unknown[]
+  expected: LabwareCalibrationAction
+}
 
-const SPECS: Array<ActionSpec> = [
+const SPECS: ActionSpec[] = [
   {
     should: 'create a fetchLabwareCalibrations action',
     creator: Actions.fetchLabwareCalibrations,
@@ -19,7 +17,7 @@ const SPECS: Array<ActionSpec> = [
     expected: {
       type: 'calibration:FETCH_LABWARE_CALIBRATIONS',
       payload: { robotName: 'robot-name' },
-      meta: {},
+      meta: {} as any,
     },
   },
   {
@@ -36,7 +34,7 @@ const SPECS: Array<ActionSpec> = [
         robotName: 'robot-name',
         labwareCalibrations: Fixtures.mockAllLabwareCalibration,
       },
-      meta: { requestId: '123' },
+      meta: { requestId: '123' } as any,
     },
   },
   {
@@ -53,7 +51,7 @@ const SPECS: Array<ActionSpec> = [
         robotName: 'robot-name',
         error: Fixtures.mockFetchLabwareCalibrationFailure.body,
       },
-      meta: { requestId: '123' },
+      meta: { requestId: '123' } as any,
     },
   },
 ]
diff --git a/app/src/redux/calibration/labware/__tests__/selectors.test.ts b/app/src/redux/calibration/labware/__tests__/selectors.test.ts
index a627d0e7291..f092059da31 100644
--- a/app/src/redux/calibration/labware/__tests__/selectors.test.ts
+++ b/app/src/redux/calibration/labware/__tests__/selectors.test.ts
@@ -1,4 +1,3 @@
-// @flow
 import omit from 'lodash/omit'
 import * as Fixtures from '../__fixtures__'
 import * as StatusFixtures from '../../__fixtures__'
@@ -14,25 +13,22 @@ jest.mock('../../../robot')
 
 const robotName = 'robotName'
 
-const getLabware: JestMockFn<
-  [State],
-  $Call<typeof robotSelectors.getLabware, State>
-> = robotSelectors.getLabware
-
-const getModulesBySlot: JestMockFn<
-  [State],
-  $Call<typeof robotSelectors.getModulesBySlot, State>
-> = robotSelectors.getModulesBySlot
+const getLabware = robotSelectors.getLabware as jest.MockedFunction<
+  typeof robotSelectors.getLabware
+>
+const getModulesBySlot = robotSelectors.getModulesBySlot as jest.MockedFunction<
+  typeof robotSelectors.getModulesBySlot
+>
 
 describe('labware calibration selectors', () => {
   describe('getLabwareCalibrations', () => {
     it('should return empty array if no robot in state', () => {
-      const state: $Shape<State> = { calibration: {} }
+      const state: State = { calibration: {} } as any
       expect(Selectors.getLabwareCalibrations(state, robotName)).toEqual([])
     })
 
     it('should return empty array if robot in state but no calibrations yet', () => {
-      const state: $Shape<State> = {
+      const state: State = {
         calibration: {
           robotName: {
             calibrationStatus: null,
@@ -41,12 +37,12 @@ describe('labware calibration selectors', () => {
             tipLengthCalibrations: null,
           },
         },
-      }
+      } as any
       expect(Selectors.getLabwareCalibrations(state, robotName)).toEqual([])
     })
 
     it('should return list of calibrations if in state', () => {
-      const state: $Shape<State> = {
+      const state: State = {
         calibration: {
           robotName: {
             calibrationStatus: StatusFixtures.mockCalibrationStatus,
@@ -55,7 +51,7 @@ describe('labware calibration selectors', () => {
             tipLengthCalibrations: null,
           },
         },
-      }
+      } as any
       expect(Selectors.getLabwareCalibrations(state, robotName)).toEqual(
         Fixtures.mockAllLabwareCalibration.data
       )
@@ -63,32 +59,32 @@ describe('labware calibration selectors', () => {
   })
 
   describe('getProtocolLabwareList', () => {
-    let state: $Shape<State>
+    let state: State
 
     afterEach(() => {
       jest.resetAllMocks()
     })
 
     beforeEach(() => {
-      state = { calibration: {} }
+      state = { calibration: {} } as any
 
       getLabware.mockImplementation(calledState => {
         expect(calledState).toBe(state)
 
         return [
-          ({
+          {
             type: wellPlate96Def.parameters.loadName,
             definition: wellPlate96Def,
             slot: '3',
             definitionHash: Fixtures.mockLabwareCalibration1.definitionHash,
-          }: $Shape<ProtocolLabware>),
-          ({
+          } as any,
+          {
             type: 'some_v1_labware',
             definition: null,
             slot: '1',
             definitionHash: null,
-          }: $Shape<ProtocolLabware>),
-        ]
+          } as any,
+        ] as ProtocolLabware[]
       })
 
       getModulesBySlot.mockImplementation(calledState => {
@@ -118,7 +114,7 @@ describe('labware calibration selectors', () => {
       const lwCalibration = Fixtures.mockLabwareCalibration1
       const { calibrationData } = lwCalibration
 
-      state = ({
+      state = {
         calibration: {
           robotName: {
             calibrationStatus: null,
@@ -144,7 +140,7 @@ describe('labware calibration selectors', () => {
             },
           },
         },
-      }: $Shape<State>)
+      } as any
 
       expect(
         Selectors.getUniqueProtocolLabwareSummaries(state, robotName)
@@ -200,7 +196,7 @@ describe('labware calibration selectors', () => {
         },
       }
 
-      state = ({
+      state = {
         calibration: {
           robotName: {
             calibrationStatus: null,
@@ -211,7 +207,7 @@ describe('labware calibration selectors', () => {
             },
           },
         },
-      }: $Shape<State>)
+      } as any
 
       expect(Selectors.getProtocolLabwareList(state, robotName)).toEqual([
         {
@@ -275,7 +271,7 @@ describe('labware calibration selectors', () => {
 
       getModulesBySlot.mockReturnValue({})
 
-      state = ({
+      state = {
         calibration: {
           robotName: {
             calibrationStatus: null,
@@ -286,7 +282,7 @@ describe('labware calibration selectors', () => {
             },
           },
         },
-      }: $Shape<State>)
+      } as any
 
       expect(Selectors.getProtocolLabwareList(state, robotName)).toEqual([
         {
@@ -335,7 +331,7 @@ describe('labware calibration selectors', () => {
 
       getModulesBySlot.mockReturnValue({})
 
-      state = ({
+      state = {
         calibration: {
           robotName: {
             calibrationStatus: null,
@@ -346,7 +342,7 @@ describe('labware calibration selectors', () => {
             },
           },
         },
-      }: $Shape<State>)
+      } as any
 
       expect(Selectors.getProtocolLabwareList(state, robotName)).toEqual([
         {
@@ -377,27 +373,27 @@ describe('labware calibration selectors', () => {
   })
 
   describe('getUniqueProtocolLabwareSummaries', () => {
-    let state: $Shape<State>
+    let state: State
 
     beforeEach(() => {
-      state = { calibration: {} }
+      state = { calibration: {} } as any
 
       getLabware.mockImplementation(calledState => {
         expect(calledState).toBe(state)
 
         return [
-          ({
+          {
             type: wellPlate96Def.parameters.loadName,
             definition: wellPlate96Def,
             slot: '3',
             definitionHash: Fixtures.mockLabwareCalibration1.definitionHash,
-          }: $Shape<ProtocolLabware>),
-          ({
+          } as any,
+          {
             type: 'some_v1_labware',
             definition: null,
             slot: '1',
-          }: $Shape<ProtocolLabware>),
-        ]
+          } as any,
+        ] as ProtocolLabware[]
       })
 
       getModulesBySlot.mockImplementation(calledState => {
@@ -467,19 +463,19 @@ describe('labware calibration selectors', () => {
 
     it('flattens out duplicate labware using quantity field', () => {
       getLabware.mockReturnValue([
-        ({
+        {
           type: wellPlate96Def.parameters.loadName,
           definition: wellPlate96Def,
           definitionHash: '123fakeDefinitionHash',
           slot: '3',
-        }: $Shape<ProtocolLabware>),
-        ({
+        } as any,
+        {
           type: wellPlate96Def.parameters.loadName,
           definition: wellPlate96Def,
           definitionHash: '123fakeDefinitionHash',
           slot: '4',
-        }: $Shape<ProtocolLabware>),
-      ])
+        } as any,
+      ] as ProtocolLabware[])
       getModulesBySlot.mockReturnValue({})
 
       expect(
@@ -497,19 +493,19 @@ describe('labware calibration selectors', () => {
 
     it('does not aggregate labware across differing parents', () => {
       getLabware.mockReturnValue([
-        ({
+        {
           type: wellPlate96Def.parameters.loadName,
           definition: wellPlate96Def,
           definitionHash: '123fakeDefinitionHash',
           slot: '2',
-        }: $Shape<ProtocolLabware>),
-        ({
+        } as any,
+        {
           type: wellPlate96Def.parameters.loadName,
           definition: wellPlate96Def,
           definitionHash: '123fakeDefinitionHash',
           slot: '3',
-        }: $Shape<ProtocolLabware>),
-      ])
+        } as any,
+      ] as ProtocolLabware[])
 
       getModulesBySlot.mockImplementation(calledState => {
         return {
diff --git a/app/src/redux/calibration/labware/actions.ts b/app/src/redux/calibration/labware/actions.ts
index 2bba4a6c4e2..b31d0dff923 100644
--- a/app/src/redux/calibration/labware/actions.ts
+++ b/app/src/redux/calibration/labware/actions.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import * as Constants from './constants'
 import * as Types from './types'
 import * as APITypes from '../types'
diff --git a/app/src/redux/calibration/labware/constants.ts b/app/src/redux/calibration/labware/constants.ts
index e1d34c5b440..b5039343357 100644
--- a/app/src/redux/calibration/labware/constants.ts
+++ b/app/src/redux/calibration/labware/constants.ts
@@ -1,5 +1,3 @@
-// @flow
-
 export const LABWARE_CALIBRATION_PATH: '/labware/calibrations' =
   '/labware/calibrations'
 
diff --git a/app/src/redux/calibration/labware/epic/__tests__/fetchLabwareCalibrationOnSessionUpdateEpic.test.ts b/app/src/redux/calibration/labware/epic/__tests__/fetchLabwareCalibrationOnSessionUpdateEpic.test.ts
index 5419d7b28fa..d1540f89240 100644
--- a/app/src/redux/calibration/labware/epic/__tests__/fetchLabwareCalibrationOnSessionUpdateEpic.test.ts
+++ b/app/src/redux/calibration/labware/epic/__tests__/fetchLabwareCalibrationOnSessionUpdateEpic.test.ts
@@ -1,4 +1,3 @@
-// @flow
 import { TestScheduler } from 'rxjs/testing'
 import {
   actions as robotActions,
@@ -7,15 +6,14 @@ import {
 import * as Actions from '../../actions'
 import { labwareCalibrationEpic } from '..'
 
-import type { State } from '../../../../types'
+import type { Action, State } from '../../../../types'
 
 jest.mock('../../actions')
 jest.mock('../../../../robot/selectors')
 
-const mockGetConnectedRobotName: JestMockFn<
-  [State],
-  string
-> = (robotSelectors.getConnectedRobotName: any)
+const mockGetConnectedRobotName = robotSelectors.getConnectedRobotName as jest.MockedFunction<
+  typeof robotSelectors.getConnectedRobotName
+>
 
 describe('fetch labware calibration on rpc cal session update epic', () => {
   beforeEach(() => {
@@ -27,7 +25,7 @@ describe('fetch labware calibration on rpc cal session update epic', () => {
   })
 
   it('dispatches calibration:FETCH_LABWARE_CALIBRATIONS on robot:UPDATE_OFFSET_SUCCESS', () => {
-    const mockState: State = ({ state: true, mock: true }: any)
+    const mockState: State = { state: true, mock: true } as any
 
     const testScheduler = new TestScheduler((actual, expected) => {
       expect(actual).toEqual(expected)
@@ -36,8 +34,10 @@ describe('fetch labware calibration on rpc cal session update epic', () => {
     testScheduler.run(schedulerArgs => {
       const { hot, expectObservable, flush } = schedulerArgs
 
-      const action$ = hot('--a', { a: robotActions.updateOffsetResponse() })
-      const state$ = hot('s-s', { s: mockState })
+      const action$ = hot<Action>('--a', {
+        a: robotActions.updateOffsetResponse(),
+      })
+      const state$ = hot<State>('s-s', { s: mockState })
       const output$ = labwareCalibrationEpic(action$, state$)
 
       expectObservable(output$)
@@ -48,7 +48,7 @@ describe('fetch labware calibration on rpc cal session update epic', () => {
   })
 
   it('dispatches calibration:FETCH_LABWARE_CALIBRATIONS on robot:CONFIRM_TIPRACK_SUCCESS', () => {
-    const mockState: State = ({ state: true, mock: true }: any)
+    const mockState: State = { state: true, mock: true } as any
 
     const testScheduler = new TestScheduler((actual, expected) => {
       expect(actual).toEqual(expected)
@@ -57,8 +57,10 @@ describe('fetch labware calibration on rpc cal session update epic', () => {
     testScheduler.run(schedulerArgs => {
       const { hot, expectObservable, flush } = schedulerArgs
 
-      const action$ = hot('--a', { a: robotActions.confirmTiprackResponse() })
-      const state$ = hot('s-s', { s: mockState })
+      const action$ = hot<Action>('--a', {
+        a: robotActions.confirmTiprackResponse(),
+      })
+      const state$ = hot<State>('s-s', { s: mockState })
       const output$ = labwareCalibrationEpic(action$, state$)
 
       expectObservable(output$)
diff --git a/app/src/redux/calibration/labware/epic/__tests__/fetchLabwareCalibrationsEpic.test.ts b/app/src/redux/calibration/labware/epic/__tests__/fetchLabwareCalibrationsEpic.test.ts
index 5611f9877cd..6319f3a02c3 100644
--- a/app/src/redux/calibration/labware/epic/__tests__/fetchLabwareCalibrationsEpic.test.ts
+++ b/app/src/redux/calibration/labware/epic/__tests__/fetchLabwareCalibrationsEpic.test.ts
@@ -1,4 +1,3 @@
-// @flow
 import {
   setupEpicTestMocks,
   runEpicTest,
@@ -7,7 +6,9 @@ import * as Fixtures from '../../__fixtures__'
 import * as Actions from '../../actions'
 import { labwareCalibrationEpic } from '..'
 
-const makeTriggerActionAllCalibrations = robotName =>
+import type { Action } from '../../../../types'
+
+const makeTriggerActionAllCalibrations = (robotName: string) =>
   Actions.fetchLabwareCalibrations(robotName)
 
 describe('fetch labware calibration epics', () => {
@@ -21,7 +22,7 @@ describe('fetch labware calibration epics', () => {
       Fixtures.mockFetchLabwareCalibrationSuccess
     )
 
-    runEpicTest(mocks, ({ hot, expectObservable, flush }) => {
+    runEpicTest<Action>(mocks, ({ hot, expectObservable, flush }) => {
       const action$ = hot('--a', { a: mocks.action })
       const state$ = hot('s-s', { s: mocks.state })
       const output$ = labwareCalibrationEpic(action$, state$)
@@ -42,7 +43,7 @@ describe('fetch labware calibration epics', () => {
       Fixtures.mockFetchLabwareCalibrationSuccess
     )
 
-    runEpicTest(mocks, ({ hot, expectObservable }) => {
+    runEpicTest<Action>(mocks, ({ hot, expectObservable }) => {
       const action$ = hot('--a', { a: mocks.action })
       const state$ = hot('s-s', { s: mocks.state })
       const output$ = labwareCalibrationEpic(action$, state$)
@@ -66,7 +67,7 @@ describe('fetch labware calibration epics', () => {
       Fixtures.mockFetchLabwareCalibrationFailure
     )
 
-    runEpicTest(mocks, ({ hot, expectObservable }) => {
+    runEpicTest<Action>(mocks, ({ hot, expectObservable }) => {
       const action$ = hot('--a', { a: mocks.action })
       const state$ = hot('s-s', { s: mocks.state })
       const output$ = labwareCalibrationEpic(action$, state$)
diff --git a/app/src/redux/calibration/labware/epic/fetchLabwareCalibrationsEpic.ts b/app/src/redux/calibration/labware/epic/fetchLabwareCalibrationsEpic.ts
index 19afdd1ff1d..70ef94b02f8 100644
--- a/app/src/redux/calibration/labware/epic/fetchLabwareCalibrationsEpic.ts
+++ b/app/src/redux/calibration/labware/epic/fetchLabwareCalibrationsEpic.ts
@@ -1,4 +1,3 @@
-// @flow
 import { ofType } from 'redux-observable'
 
 import { GET } from '../../../robot-api/constants'
@@ -10,7 +9,7 @@ import type {
   ActionToRequestMapper,
   ResponseToActionMapper,
 } from '../../../robot-api/operators'
-import type { Epic } from '../../../types'
+import type { Action, Epic } from '../../../types'
 import type { FetchLabwareCalibrationsAction } from '../types'
 
 const mapActionToRequest: ActionToRequestMapper<FetchLabwareCalibrationsAction> = action => ({
@@ -31,7 +30,9 @@ const mapResponseToAction: ResponseToActionMapper<FetchLabwareCalibrationsAction
 
 export const fetchLabwareCalibrationsEpic: Epic = (action$, state$) => {
   return action$.pipe(
-    ofType(Constants.FETCH_LABWARE_CALIBRATIONS),
+    ofType<Action, FetchLabwareCalibrationsAction>(
+      Constants.FETCH_LABWARE_CALIBRATIONS
+    ),
     mapToRobotApiRequest(
       state$,
       a => a.payload.robotName,
diff --git a/app/src/redux/calibration/labware/epic/fetchLabwareCalibrationsOnSessionUpdateEpic.ts b/app/src/redux/calibration/labware/epic/fetchLabwareCalibrationsOnSessionUpdateEpic.ts
index c5eb224cf86..770b0254b3c 100644
--- a/app/src/redux/calibration/labware/epic/fetchLabwareCalibrationsOnSessionUpdateEpic.ts
+++ b/app/src/redux/calibration/labware/epic/fetchLabwareCalibrationsOnSessionUpdateEpic.ts
@@ -1,4 +1,3 @@
-// @flow
 import { of } from 'rxjs'
 import { ofType } from 'redux-observable'
 import { filter, mergeMap, withLatestFrom } from 'rxjs/operators'
@@ -14,7 +13,7 @@ export const fetchLabwareCalibrationsOnSessionUpdateEpic: Epic = (
   return action$.pipe(
     ofType('robot:UPDATE_OFFSET_SUCCESS', 'robot:CONFIRM_TIPRACK_SUCCESS'),
     withLatestFrom(state$, (_, s) => getConnectedRobotName(s)),
-    filter(robotName => robotName !== null),
+    filter((robotName): robotName is string => robotName !== null),
     mergeMap(robotName => {
       return of(Actions.fetchLabwareCalibrations(robotName))
     })
diff --git a/app/src/redux/calibration/labware/epic/index.ts b/app/src/redux/calibration/labware/epic/index.ts
index 9d17511a0ea..6d6b7a641b4 100644
--- a/app/src/redux/calibration/labware/epic/index.ts
+++ b/app/src/redux/calibration/labware/epic/index.ts
@@ -1,12 +1,10 @@
-// @flow
-
 import { combineEpics } from 'redux-observable'
 import { fetchLabwareCalibrationsEpic } from './fetchLabwareCalibrationsEpic'
 import { fetchLabwareCalibrationsOnSessionUpdateEpic } from './fetchLabwareCalibrationsOnSessionUpdateEpic'
 
 import type { Epic } from '../../../types'
 
-export const labwareCalibrationEpic: Epic = combineEpics(
+export const labwareCalibrationEpic: Epic = combineEpics<Epic>(
   fetchLabwareCalibrationsEpic,
   fetchLabwareCalibrationsOnSessionUpdateEpic
 )
diff --git a/app/src/redux/calibration/labware/index.ts b/app/src/redux/calibration/labware/index.ts
index 43606460a85..bad98373359 100644
--- a/app/src/redux/calibration/labware/index.ts
+++ b/app/src/redux/calibration/labware/index.ts
@@ -1,4 +1,3 @@
-// @flow
 // labware calibration actions, selectors and constants
 export * from './actions'
 export * from './constants'
diff --git a/app/src/redux/calibration/labware/selectors.ts b/app/src/redux/calibration/labware/selectors.ts
index d5c94930166..51d79233c68 100644
--- a/app/src/redux/calibration/labware/selectors.ts
+++ b/app/src/redux/calibration/labware/selectors.ts
@@ -1,4 +1,3 @@
-// @flow
 import { createSelector } from 'reselect'
 import head from 'lodash/head'
 import uniqWith from 'lodash/uniqWith'
@@ -22,7 +21,7 @@ import type { LabwareSummary, BaseProtocolLabware } from './types'
 export const getLabwareCalibrations = (
   state: State,
   robotName: string
-): Array<LabwareCalibration> => {
+): LabwareCalibration[] => {
   return state.calibration[robotName]?.labwareCalibrations?.data ?? []
 }
 
@@ -31,7 +30,7 @@ export const getLabwareCalibrations = (
 export const getProtocolLabwareList: (
   state: State,
   robotName: string
-) => Array<BaseProtocolLabware> = createSelector(
+) => BaseProtocolLabware[] = createSelector(
   (state, robotName) => robotSelectors.getLabware(state),
   getLabwareCalibrations,
   (state, robotName) => robotSelectors.getModulesBySlot(state),
@@ -67,12 +66,12 @@ export const getProtocolLabwareList: (
 export const getUniqueProtocolLabwareSummaries: (
   state: State,
   robotName: string
-) => Array<LabwareSummary> = createSelector(
+) => LabwareSummary[] = createSelector(
   getProtocolLabwareList,
   getLabwareCalibrations,
   (
-    baseLabwareList: Array<BaseProtocolLabware>,
-    calibrations: Array<LabwareCalibration>
+    baseLabwareList: BaseProtocolLabware[],
+    calibrations: LabwareCalibration[]
   ) => {
     const uniqueLabware = uniqWith<BaseProtocolLabware>(
       baseLabwareList,
diff --git a/app/src/redux/calibration/labware/types.ts b/app/src/redux/calibration/labware/types.ts
index 22eb1a8cb39..8cef7fb9206 100644
--- a/app/src/redux/calibration/labware/types.ts
+++ b/app/src/redux/calibration/labware/types.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import type { ModuleModel } from '@opentrons/shared-data'
 import type {
   RobotApiRequestMeta,
@@ -7,7 +5,7 @@ import type {
 } from '../../robot-api/types'
 import type { Labware } from '../../robot/types'
 
-import typeof {
+import {
   FETCH_LABWARE_CALIBRATIONS,
   FETCH_LABWARE_CALIBRATIONS_SUCCESS,
   FETCH_LABWARE_CALIBRATIONS_FAILURE,
@@ -15,48 +13,51 @@ import typeof {
 
 import type { AllLabwareCalibrations } from './../api-types'
 
-export type FetchLabwareCalibrationsAction = {|
-  type: FETCH_LABWARE_CALIBRATIONS,
-  payload: {| robotName: string |},
-  meta: RobotApiRequestMeta,
-|}
-
-export type FetchLabwareCalibrationsSuccessAction = {|
-  type: FETCH_LABWARE_CALIBRATIONS_SUCCESS,
-  payload: {|
-    robotName: string,
-    labwareCalibrations: AllLabwareCalibrations,
-  |},
-  meta: RobotApiRequestMeta,
-|}
-
-export type FetchLabwareCalibrationsFailureAction = {|
-  type: FETCH_LABWARE_CALIBRATIONS_FAILURE,
-  payload: {| robotName: string, error: RobotApiErrorResponse |},
-  meta: RobotApiRequestMeta,
-|}
+export interface FetchLabwareCalibrationsAction {
+  type: typeof FETCH_LABWARE_CALIBRATIONS
+  payload: { robotName: string }
+  meta: RobotApiRequestMeta | {}
+}
+
+export interface FetchLabwareCalibrationsSuccessAction {
+  type: typeof FETCH_LABWARE_CALIBRATIONS_SUCCESS
+  payload: {
+    robotName: string
+    labwareCalibrations: AllLabwareCalibrations
+  }
+  meta: RobotApiRequestMeta
+}
+
+export interface FetchLabwareCalibrationsFailureAction {
+  type: typeof FETCH_LABWARE_CALIBRATIONS_FAILURE
+  payload: { robotName: string; error: RobotApiErrorResponse }
+  meta: RobotApiRequestMeta
+}
 
 // selector types
 
-export type LabwareCalibrationData = {| x: number, y: number, z: number |}
-export type LabwareSummary = {|
-  displayName: string,
-  parentDisplayName: string | null,
-  quantity: number,
-  calibration: LabwareCalibrationData | null,
-  calDataAvailable: boolean,
-|}
+export interface LabwareCalibrationData {
+  x: number
+  y: number
+  z: number
+}
+export interface LabwareSummary {
+  displayName: string
+  parentDisplayName: string | null
+  quantity: number
+  calibration: LabwareCalibrationData | null
+  calDataAvailable: boolean
+}
 
 export type LabwareCalibrationAction =
   | FetchLabwareCalibrationsAction
   | FetchLabwareCalibrationsSuccessAction
   | FetchLabwareCalibrationsFailureAction
 
-export type BaseProtocolLabware = {|
-  ...Labware,
-  calibrationData: LabwareCalibrationData | null,
-  loadName: string,
-  namespace: string | null,
-  version: number | null,
-  parent: ModuleModel | null,
-|}
+export interface BaseProtocolLabware extends Labware {
+  calibrationData: LabwareCalibrationData | null
+  loadName: string
+  namespace: string | null
+  version: number | null
+  parent: ModuleModel | null
+}
diff --git a/app/src/redux/calibration/labware/utils.ts b/app/src/redux/calibration/labware/utils.ts
index 7f63e4ac764..3b48d0cd97d 100644
--- a/app/src/redux/calibration/labware/utils.ts
+++ b/app/src/redux/calibration/labware/utils.ts
@@ -1,10 +1,8 @@
-// @flow
-
 import round from 'lodash/round'
 import type { LabwareCalibration } from '../types'
 import type { LabwareCalibrationData, BaseProtocolLabware } from './types'
 
-const normalizeParent = parent =>
+const normalizeParent = (parent: string | null): string | null =>
   // internal protocol labware model uses null for no parent
   // API calibration model uses empty string for no parent
   // normalize to null to do the comparison
diff --git a/app/src/redux/calibration/pipette-offset/__fixtures__/index.ts b/app/src/redux/calibration/pipette-offset/__fixtures__/index.ts
index a0edf062ae1..92cc3c86509 100644
--- a/app/src/redux/calibration/pipette-offset/__fixtures__/index.ts
+++ b/app/src/redux/calibration/pipette-offset/__fixtures__/index.ts
@@ -1,2 +1 @@
-// @flow
 export * from './pipette-offset-calibration'
diff --git a/app/src/redux/calibration/pipette-offset/__fixtures__/pipette-offset-calibration.ts b/app/src/redux/calibration/pipette-offset/__fixtures__/pipette-offset-calibration.ts
index c68564cdd9f..fd8500c77db 100644
--- a/app/src/redux/calibration/pipette-offset/__fixtures__/pipette-offset-calibration.ts
+++ b/app/src/redux/calibration/pipette-offset/__fixtures__/pipette-offset-calibration.ts
@@ -1,4 +1,3 @@
-// @flow
 import { GET } from '../../../robot-api'
 import {
   makeResponseFixtures,
@@ -75,7 +74,7 @@ export const {
   failure: mockFetchPipetteOffsetCalibrationsFailure,
 }: ResponseFixtures<
   AllPipetteOffsetCalibrations,
-  {| message: string |}
+  { message: string }
 > = makeResponseFixtures({
   method: GET,
   path: PIPETTE_OFFSET_CALIBRATIONS_PATH,
diff --git a/app/src/redux/calibration/pipette-offset/__tests__/actions.test.ts b/app/src/redux/calibration/pipette-offset/__tests__/actions.test.ts
index f6c7c2a7b05..de732c2850c 100644
--- a/app/src/redux/calibration/pipette-offset/__tests__/actions.test.ts
+++ b/app/src/redux/calibration/pipette-offset/__tests__/actions.test.ts
@@ -1,17 +1,15 @@
-// @flow
-
 import * as Fixtures from '../__fixtures__'
 import * as Actions from '../actions'
 import type { PipetteOffsetCalibrationsAction } from '../types'
 
-type ActionSpec = {|
-  should: string,
-  creator: (...Array<any>) => PipetteOffsetCalibrationsAction,
-  args: Array<mixed>,
-  expected: PipetteOffsetCalibrationsAction,
-|}
+interface ActionSpec {
+  should: string
+  creator: (...args: any[]) => PipetteOffsetCalibrationsAction
+  args: unknown[]
+  expected: PipetteOffsetCalibrationsAction
+}
 
-const SPECS: Array<ActionSpec> = [
+const SPECS: ActionSpec[] = [
   {
     should: 'create a fetchPipetteOffsetCalibrations action',
     creator: Actions.fetchPipetteOffsetCalibrations,
@@ -19,7 +17,7 @@ const SPECS: Array<ActionSpec> = [
     expected: {
       type: 'calibration:FETCH_PIPETTE_OFFSET_CALIBRATIONS',
       payload: { robotName: 'robot-name' },
-      meta: {},
+      meta: {} as any,
     },
   },
   {
@@ -36,7 +34,7 @@ const SPECS: Array<ActionSpec> = [
         robotName: 'robot-name',
         pipetteOffsetCalibrations: Fixtures.mockAllPipetteOffsetsCalibration,
       },
-      meta: { requestId: '123' },
+      meta: { requestId: '123' } as any,
     },
   },
   {
@@ -53,7 +51,7 @@ const SPECS: Array<ActionSpec> = [
         robotName: 'robot-name',
         error: Fixtures.mockFetchPipetteOffsetCalibrationsFailure.body,
       },
-      meta: { requestId: '123' },
+      meta: { requestId: '123' } as any,
     },
   },
 ]
diff --git a/app/src/redux/calibration/pipette-offset/__tests__/selectors.test.ts b/app/src/redux/calibration/pipette-offset/__tests__/selectors.test.ts
index 6ad1966e1d8..fc9cd4d0c35 100644
--- a/app/src/redux/calibration/pipette-offset/__tests__/selectors.test.ts
+++ b/app/src/redux/calibration/pipette-offset/__tests__/selectors.test.ts
@@ -1,11 +1,9 @@
-// @flow
-
 import * as Selectors from '../selectors'
 import * as Fixtures from '../__fixtures__'
 
 import type { State } from '../../../types'
 
-const mockState: $Shape<State> = {
+const mockState: State = {
   calibration: {
     'robot-name': {
       pipetteOffsetCalibrations: Fixtures.mockAllPipetteOffsetsCalibration,
@@ -14,7 +12,7 @@ const mockState: $Shape<State> = {
       tipLengthCalibrations: null,
     },
   },
-}
+} as any
 
 describe('getPipetteOffsetCalibrations', () => {
   it('should find all pipette calibrations when they exist', () => {
diff --git a/app/src/redux/calibration/pipette-offset/actions.ts b/app/src/redux/calibration/pipette-offset/actions.ts
index e085fd8fac9..01827e2497c 100644
--- a/app/src/redux/calibration/pipette-offset/actions.ts
+++ b/app/src/redux/calibration/pipette-offset/actions.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import * as Constants from './constants'
 import * as Types from './types'
 
diff --git a/app/src/redux/calibration/pipette-offset/constants.ts b/app/src/redux/calibration/pipette-offset/constants.ts
index 3577026175a..43de76cd9ce 100644
--- a/app/src/redux/calibration/pipette-offset/constants.ts
+++ b/app/src/redux/calibration/pipette-offset/constants.ts
@@ -1,5 +1,3 @@
-// @flow
-
 export const PIPETTE_OFFSET_CALIBRATIONS_PATH: '/calibration/pipette_offset' =
   '/calibration/pipette_offset'
 
diff --git a/app/src/redux/calibration/pipette-offset/epic/__tests__/fetchPipetteOffsetCalibrationsEpic.test.ts b/app/src/redux/calibration/pipette-offset/epic/__tests__/fetchPipetteOffsetCalibrationsEpic.test.ts
index c23978d00cc..d6f1848e874 100644
--- a/app/src/redux/calibration/pipette-offset/epic/__tests__/fetchPipetteOffsetCalibrationsEpic.test.ts
+++ b/app/src/redux/calibration/pipette-offset/epic/__tests__/fetchPipetteOffsetCalibrationsEpic.test.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import {
   setupEpicTestMocks,
   runEpicTest,
@@ -8,7 +6,9 @@ import * as Fixtures from '../../__fixtures__'
 import * as Actions from '../../actions'
 import { pipetteOffsetCalibrationsEpic } from '..'
 
-const makeTriggerActionAllCalibrations = robotName =>
+import type { Action } from '../../../../types'
+
+const makeTriggerActionAllCalibrations = (robotName: string) =>
   Actions.fetchPipetteOffsetCalibrations(robotName)
 
 describe('fetch pipette offset calibration epics', () => {
@@ -22,7 +22,7 @@ describe('fetch pipette offset calibration epics', () => {
       Fixtures.mockFetchPipetteOffsetCalibrationsSuccess
     )
 
-    runEpicTest(mocks, ({ hot, expectObservable, flush }) => {
+    runEpicTest<Action>(mocks, ({ hot, expectObservable, flush }) => {
       const action$ = hot('--a', { a: mocks.action })
       const state$ = hot('s-s', { s: mocks.state })
       const output$ = pipetteOffsetCalibrationsEpic(action$, state$)
@@ -43,7 +43,7 @@ describe('fetch pipette offset calibration epics', () => {
       Fixtures.mockFetchPipetteOffsetCalibrationsSuccess
     )
 
-    runEpicTest(mocks, ({ hot, expectObservable, flush }) => {
+    runEpicTest<Action>(mocks, ({ hot, expectObservable, flush }) => {
       const action$ = hot('--a', { a: mocks.action })
       const state$ = hot('s-s', { s: mocks.state })
       const output$ = pipetteOffsetCalibrationsEpic(action$, state$)
@@ -67,7 +67,7 @@ describe('fetch pipette offset calibration epics', () => {
       Fixtures.mockFetchPipetteOffsetCalibrationsFailure
     )
 
-    runEpicTest(mocks, ({ hot, expectObservable }) => {
+    runEpicTest<Action>(mocks, ({ hot, expectObservable }) => {
       const action$ = hot('--a', { a: mocks.action })
       const state$ = hot('s-s', { s: mocks.state })
       const output$ = pipetteOffsetCalibrationsEpic(action$, state$)
diff --git a/app/src/redux/calibration/pipette-offset/epic/__tests__/fetchPipetteOffsetCalibrationsOnCalibrationEnd.test.ts b/app/src/redux/calibration/pipette-offset/epic/__tests__/fetchPipetteOffsetCalibrationsOnCalibrationEnd.test.ts
index d962c200060..a47a490f553 100644
--- a/app/src/redux/calibration/pipette-offset/epic/__tests__/fetchPipetteOffsetCalibrationsOnCalibrationEnd.test.ts
+++ b/app/src/redux/calibration/pipette-offset/epic/__tests__/fetchPipetteOffsetCalibrationsOnCalibrationEnd.test.ts
@@ -1,10 +1,10 @@
-// @flow
-
 import { TestScheduler } from 'rxjs/testing'
 import { selectors as RobotSelectors } from '../../../../robot'
 import * as Actions from '../../actions'
 import { pipetteOffsetCalibrationsEpic } from '..'
 
+import type { Action, State } from '../../../../types'
+
 import * as SessionFixtures from '../../../../sessions/__fixtures__'
 import * as SessionTypes from '../../../../sessions/types'
 import * as SessionActions from '../../../../sessions/actions'
@@ -17,16 +17,18 @@ jest.mock('../../../../sessions/selectors')
 const mockState = { state: true }
 const mockRobotName = 'robot-name'
 
-const mockGetConnectedRobotName: JestMockFn<[any], ?string> =
-  RobotSelectors.getConnectedRobotName
+const mockGetConnectedRobotName = RobotSelectors.getConnectedRobotName as jest.MockedFunction<
+  typeof RobotSelectors.getConnectedRobotName
+>
 
-const mockGetRobotSessionById: JestMockFn<[any, string, string], mixed> =
-  SessionSelectors.getRobotSessionById
+const mockGetRobotSessionById = SessionSelectors.getRobotSessionById as jest.MockedFunction<
+  typeof SessionSelectors.getRobotSessionById
+>
 
-const SPECS: Array<{|
-  describe: string,
-  robotSession: SessionTypes.Session,
-|}> = [
+const SPECS: Array<{
+  describe: string
+  robotSession: SessionTypes.Session
+}> = [
   {
     describe: 'tip length calibration',
     robotSession: {
@@ -58,7 +60,7 @@ const SPECS: Array<{|
 ]
 
 describe('fetchPipetteOffsetCalibrationsOnCalibrationEndEpic', () => {
-  let testScheduler
+  let testScheduler: TestScheduler
 
   beforeEach(() => {
     mockGetConnectedRobotName.mockReturnValue('robot-name')
@@ -83,8 +85,8 @@ describe('fetchPipetteOffsetCalibrationsOnCalibrationEndEpic', () => {
       )
 
       testScheduler.run(({ hot, expectObservable, flush }) => {
-        const action$ = hot('--a', { a: action })
-        const state$ = hot('s-s', { s: mockState })
+        const action$ = hot<Action>('--a', { a: action })
+        const state$ = hot<State>('s-s', { s: mockState } as any)
         const output$ = pipetteOffsetCalibrationsEpic(action$, state$)
 
         expectObservable(output$).toBe('--a', {
@@ -105,8 +107,8 @@ describe('fetchPipetteOffsetCalibrationsOnCalibrationEndEpic', () => {
       )
 
       testScheduler.run(({ hot, expectObservable, flush }) => {
-        const action$ = hot('--a', { a: action })
-        const state$ = hot('s-s', { s: mockState })
+        const action$ = hot<Action>('--a', { a: action })
+        const state$ = hot<State>('s-s', { s: mockState } as any)
         const output$ = pipetteOffsetCalibrationsEpic(action$, state$)
 
         expectObservable(output$).toBe('---')
diff --git a/app/src/redux/calibration/pipette-offset/epic/__tests__/fetchPipetteOffsetCalibrationsOnConnect.test.ts b/app/src/redux/calibration/pipette-offset/epic/__tests__/fetchPipetteOffsetCalibrationsOnConnect.test.ts
index d252dfd164e..04729cd25e7 100644
--- a/app/src/redux/calibration/pipette-offset/epic/__tests__/fetchPipetteOffsetCalibrationsOnConnect.test.ts
+++ b/app/src/redux/calibration/pipette-offset/epic/__tests__/fetchPipetteOffsetCalibrationsOnConnect.test.ts
@@ -1,26 +1,28 @@
-// @flow
-
 import { TestScheduler } from 'rxjs/testing'
 import { selectors as RobotSelectors } from '../../../../robot'
 import * as DiscoverySelectors from '../../../../discovery/selectors'
 import * as Actions from '../../actions'
 import { pipetteOffsetCalibrationsEpic } from '..'
 
+import type { Action, State } from '../../../../types'
+
 jest.mock('../../actions')
 jest.mock('../../../../robot/selectors')
 jest.mock('../../../../discovery/selectors')
 
 const mockState = { state: true }
-const mockRobot = { name: 'robot', ip: '127.0.0.1', port: 31950 }
+const mockRobot = { name: 'robot', ip: '127.0.0.1', port: 31950 } as any
 
-const mockGetRobotByName: JestMockFn<[any, string], mixed> =
-  DiscoverySelectors.getRobotByName
+const mockGetRobotByName = DiscoverySelectors.getRobotByName as jest.MockedFunction<
+  typeof DiscoverySelectors.getRobotByName
+>
 
-const mockGetConnectedRobotName: JestMockFn<[any], ?string> =
-  RobotSelectors.getConnectedRobotName
+const mockGetConnectedRobotName = RobotSelectors.getConnectedRobotName as jest.MockedFunction<
+  typeof RobotSelectors.getConnectedRobotName
+>
 
 describe('fetchPipetteOffsetCalibrationsOnConnectEpic', () => {
-  let testScheduler
+  let testScheduler: TestScheduler
 
   beforeEach(() => {
     mockGetRobotByName.mockReturnValue(mockRobot)
@@ -43,8 +45,8 @@ describe('fetchPipetteOffsetCalibrationsOnConnectEpic', () => {
     mockGetConnectedRobotName.mockReturnValue(null)
 
     testScheduler.run(({ hot, cold, expectObservable, flush }) => {
-      const action$ = hot('--a', { a: action })
-      const state$ = hot('a--', { a: mockState })
+      const action$ = hot<Action>('--a', { a: action } as any)
+      const state$ = hot<State>('a--', { a: mockState } as any)
       const output$ = pipetteOffsetCalibrationsEpic(action$, state$)
 
       expectObservable(output$).toBe('---')
@@ -60,8 +62,8 @@ describe('fetchPipetteOffsetCalibrationsOnConnectEpic', () => {
     mockGetConnectedRobotName.mockReturnValue(mockRobot.name)
 
     testScheduler.run(({ hot, cold, expectObservable, flush }) => {
-      const action$ = hot('--a', { a: action })
-      const state$ = hot('a--', { a: mockState })
+      const action$ = hot<Action>('--a', { a: action } as any)
+      const state$ = hot<State>('a--', { a: mockState } as any)
       const output$ = pipetteOffsetCalibrationsEpic(action$, state$)
 
       expectObservable(output$).toBe('--a', {
diff --git a/app/src/redux/calibration/pipette-offset/epic/fetchPipetteOffsetCalibrationsEpic.ts b/app/src/redux/calibration/pipette-offset/epic/fetchPipetteOffsetCalibrationsEpic.ts
index d93ef325d2f..03f3f03a2c8 100644
--- a/app/src/redux/calibration/pipette-offset/epic/fetchPipetteOffsetCalibrationsEpic.ts
+++ b/app/src/redux/calibration/pipette-offset/epic/fetchPipetteOffsetCalibrationsEpic.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import { ofType } from 'redux-observable'
 
 import { GET } from '../../../robot-api/constants'
@@ -11,7 +9,7 @@ import type {
   ActionToRequestMapper,
   ResponseToActionMapper,
 } from '../../../robot-api/operators'
-import type { Epic } from '../../../types'
+import type { Action, Epic } from '../../../types'
 import type { FetchPipetteOffsetCalibrationsAction } from '../types'
 
 const mapActionToRequest: ActionToRequestMapper<FetchPipetteOffsetCalibrationsAction> = action => ({
@@ -32,7 +30,9 @@ const mapResponseToAction: ResponseToActionMapper<FetchPipetteOffsetCalibrations
 
 export const fetchPipetteOffsetCalibrationsEpic: Epic = (action$, state$) => {
   return action$.pipe(
-    ofType(Constants.FETCH_PIPETTE_OFFSET_CALIBRATIONS),
+    ofType<Action, FetchPipetteOffsetCalibrationsAction>(
+      Constants.FETCH_PIPETTE_OFFSET_CALIBRATIONS
+    ),
     mapToRobotApiRequest(
       state$,
       a => a.payload.robotName,
diff --git a/app/src/redux/calibration/pipette-offset/epic/fetchPipetteOffsetCalibrationsOnCalibrationEnd.ts b/app/src/redux/calibration/pipette-offset/epic/fetchPipetteOffsetCalibrationsOnCalibrationEnd.ts
index b10b7f7e95f..f28b5f169e9 100644
--- a/app/src/redux/calibration/pipette-offset/epic/fetchPipetteOffsetCalibrationsOnCalibrationEnd.ts
+++ b/app/src/redux/calibration/pipette-offset/epic/fetchPipetteOffsetCalibrationsOnCalibrationEnd.ts
@@ -1,13 +1,11 @@
-// @flow
-
 import { filter, withLatestFrom, map } from 'rxjs/operators'
 import { ofType } from 'redux-observable'
 
 import { getConnectedRobotName } from '../../../robot/selectors'
 import * as Actions from '../actions'
-import type { Epic, State } from '../../../types'
+import type { Action, Epic, State } from '../../../types'
 
-import type { SessionType } from '../../../sessions/types'
+import { DeleteSessionAction, SessionType } from '../../../sessions/types'
 import {
   DELETE_SESSION,
   SESSION_TYPE_CALIBRATION_HEALTH_CHECK,
@@ -17,7 +15,7 @@ import {
 } from '../../../sessions/constants'
 import { getRobotSessionById } from '../../../sessions/selectors'
 
-const isTargetSessionType: SessionType => boolean = sessionType =>
+const isTargetSessionType = (sessionType: SessionType): boolean =>
   [
     SESSION_TYPE_CALIBRATION_HEALTH_CHECK,
     SESSION_TYPE_TIP_LENGTH_CALIBRATION,
@@ -44,13 +42,11 @@ export const fetchPipetteOffsetCalibrationsOnCalibrationEndEpic: Epic = (
   state$
 ) => {
   return action$.pipe(
-    ofType(DELETE_SESSION),
-    withLatestFrom(state$, (a, s) => [
-      a,
-      s,
-      getConnectedRobotName(s),
-      a.payload.sessionId,
-    ]),
+    ofType<Action, DeleteSessionAction>(DELETE_SESSION),
+    withLatestFrom<
+      DeleteSessionAction,
+      [DeleteSessionAction, State, string, string]
+    >(state$, (a, s) => [a, s, getConnectedRobotName(s), a.payload.sessionId]),
     filter(
       ([action, state, robotName, sessionId]) =>
         robotName != null && sessionIncursRefetch(state, robotName, sessionId)
diff --git a/app/src/redux/calibration/pipette-offset/epic/fetchPipetteOffsetCalibrationsOnConnect.ts b/app/src/redux/calibration/pipette-offset/epic/fetchPipetteOffsetCalibrationsOnConnect.ts
index 966b678d5b1..809d1632280 100644
--- a/app/src/redux/calibration/pipette-offset/epic/fetchPipetteOffsetCalibrationsOnConnect.ts
+++ b/app/src/redux/calibration/pipette-offset/epic/fetchPipetteOffsetCalibrationsOnConnect.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import { of } from 'rxjs'
 import { filter, withLatestFrom, mergeMap } from 'rxjs/operators'
 import { ofType } from 'redux-observable'
@@ -18,6 +16,7 @@ export const fetchPipetteOffsetCalibrationsOnConnectEpic: Epic = (
     withLatestFrom(state$, (a, s) => [a, getConnectedRobotName(s)]),
     filter(([action, robotName]) => robotName != null),
     mergeMap(robotName => {
+      // @ts-expect-error TODO: something is wrong here robotName will be a tuple
       return of(Actions.fetchPipetteOffsetCalibrations(robotName))
     })
   )
diff --git a/app/src/redux/calibration/pipette-offset/epic/index.ts b/app/src/redux/calibration/pipette-offset/epic/index.ts
index fcb1c0f1ec3..136a5094aa9 100644
--- a/app/src/redux/calibration/pipette-offset/epic/index.ts
+++ b/app/src/redux/calibration/pipette-offset/epic/index.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import { combineEpics } from 'redux-observable'
 import { fetchPipetteOffsetCalibrationsEpic } from './fetchPipetteOffsetCalibrationsEpic'
 import { fetchPipetteOffsetCalibrationsOnConnectEpic } from './fetchPipetteOffsetCalibrationsOnConnect'
@@ -7,7 +5,7 @@ import { fetchPipetteOffsetCalibrationsOnCalibrationEndEpic } from './fetchPipet
 
 import type { Epic } from '../../../types'
 
-export const pipetteOffsetCalibrationsEpic: Epic = combineEpics(
+export const pipetteOffsetCalibrationsEpic: Epic = combineEpics<Epic>(
   fetchPipetteOffsetCalibrationsEpic,
   fetchPipetteOffsetCalibrationsOnConnectEpic,
   fetchPipetteOffsetCalibrationsOnCalibrationEndEpic
diff --git a/app/src/redux/calibration/pipette-offset/index.ts b/app/src/redux/calibration/pipette-offset/index.ts
index b0b686bc1b5..8e24673ba02 100644
--- a/app/src/redux/calibration/pipette-offset/index.ts
+++ b/app/src/redux/calibration/pipette-offset/index.ts
@@ -1,4 +1,3 @@
-// @flow
 // pipette offset calibration data actions, selectors, and constants
 export * from './actions'
 export * from './constants'
diff --git a/app/src/redux/calibration/pipette-offset/selectors.ts b/app/src/redux/calibration/pipette-offset/selectors.ts
index 4a879b7566e..f4017b0a0cb 100644
--- a/app/src/redux/calibration/pipette-offset/selectors.ts
+++ b/app/src/redux/calibration/pipette-offset/selectors.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import { head } from 'lodash'
 
 import type { State } from '../../types'
@@ -8,7 +6,7 @@ import type { PipetteOffsetCalibration } from '../api-types'
 export const getPipetteOffsetCalibrations: (
   state: State,
   robotName: string | null
-) => Array<PipetteOffsetCalibration> = (state, robotName) => {
+) => PipetteOffsetCalibration[] = (state, robotName) => {
   if (!robotName) {
     return []
   }
@@ -33,7 +31,7 @@ export const getCalibrationForPipette: (
 }
 
 export const filterCalibrationForPipette: (
-  calibrations: Array<PipetteOffsetCalibration>,
+  calibrations: PipetteOffsetCalibration[],
   pipetteSerial: string,
   mount: string | null
 ) => PipetteOffsetCalibration | null = (calibrations, pipetteSerial, mount) => {
diff --git a/app/src/redux/calibration/pipette-offset/types.ts b/app/src/redux/calibration/pipette-offset/types.ts
index 010df73b0ae..998cfddd3ad 100644
--- a/app/src/redux/calibration/pipette-offset/types.ts
+++ b/app/src/redux/calibration/pipette-offset/types.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import type {
   RobotApiRequestMeta,
   RobotApiErrorResponse,
@@ -7,32 +5,32 @@ import type {
 
 import type { AllPipetteOffsetCalibrations } from '../api-types'
 
-import typeof {
+import {
   FETCH_PIPETTE_OFFSET_CALIBRATIONS,
   FETCH_PIPETTE_OFFSET_CALIBRATIONS_SUCCESS,
   FETCH_PIPETTE_OFFSET_CALIBRATIONS_FAILURE,
 } from './constants'
 
-export type FetchPipetteOffsetCalibrationsAction = {|
-  type: FETCH_PIPETTE_OFFSET_CALIBRATIONS,
-  payload: {| robotName: string |},
-  meta: RobotApiRequestMeta,
-|}
+export interface FetchPipetteOffsetCalibrationsAction {
+  type: typeof FETCH_PIPETTE_OFFSET_CALIBRATIONS
+  payload: { robotName: string }
+  meta: RobotApiRequestMeta | {}
+}
 
-export type FetchPipetteOffsetCalibrationsSuccessAction = {|
-  type: FETCH_PIPETTE_OFFSET_CALIBRATIONS_SUCCESS,
-  payload: {|
-    robotName: string,
-    pipetteOffsetCalibrations: AllPipetteOffsetCalibrations,
-  |},
-  meta: RobotApiRequestMeta,
-|}
+export interface FetchPipetteOffsetCalibrationsSuccessAction {
+  type: typeof FETCH_PIPETTE_OFFSET_CALIBRATIONS_SUCCESS
+  payload: {
+    robotName: string
+    pipetteOffsetCalibrations: AllPipetteOffsetCalibrations
+  }
+  meta: RobotApiRequestMeta
+}
 
-export type FetchPipetteOffsetCalibrationsFailureAction = {|
-  type: FETCH_PIPETTE_OFFSET_CALIBRATIONS_FAILURE,
-  payload: {| robotName: string, error: RobotApiErrorResponse |},
-  meta: RobotApiRequestMeta,
-|}
+export interface FetchPipetteOffsetCalibrationsFailureAction {
+  type: typeof FETCH_PIPETTE_OFFSET_CALIBRATIONS_FAILURE
+  payload: { robotName: string; error: RobotApiErrorResponse }
+  meta: RobotApiRequestMeta
+}
 
 export type PipetteOffsetCalibrationsAction =
   | FetchPipetteOffsetCalibrationsAction
diff --git a/app/src/redux/calibration/reducer.ts b/app/src/redux/calibration/reducer.ts
index 323b48afd46..d02fe291854 100644
--- a/app/src/redux/calibration/reducer.ts
+++ b/app/src/redux/calibration/reducer.ts
@@ -1,9 +1,9 @@
-// @flow
 import * as Constants from './constants'
 import * as labware from './labware'
 import * as pipetteOffset from './pipette-offset'
 import * as tipLength from './tip-length'
 
+import type { Reducer } from 'redux'
 import type { Action } from '../types'
 import type { CalibrationState, PerRobotCalibrationState } from './types'
 
@@ -16,10 +16,10 @@ const INITIAL_PER_ROBOT_STATE: PerRobotCalibrationState = {
   tipLengthCalibrations: null,
 }
 
-export function calibrationReducer(
-  state: CalibrationState = INITIAL_STATE,
-  action: Action
-): CalibrationState {
+export const calibrationReducer: Reducer<CalibrationState, Action> = (
+  state = INITIAL_STATE,
+  action
+) => {
   switch (action.type) {
     case Constants.FETCH_CALIBRATION_STATUS_SUCCESS: {
       const { robotName, calibrationStatus } = action.payload
diff --git a/app/src/redux/calibration/selectors.ts b/app/src/redux/calibration/selectors.ts
index e936c0dbd04..dabe71dd4c4 100644
--- a/app/src/redux/calibration/selectors.ts
+++ b/app/src/redux/calibration/selectors.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import type { State } from '../types'
 import type {
   CalibrationStatus,
diff --git a/app/src/redux/calibration/tip-length/__fixtures__/index.ts b/app/src/redux/calibration/tip-length/__fixtures__/index.ts
index e54ab49a7be..b3d9214b174 100644
--- a/app/src/redux/calibration/tip-length/__fixtures__/index.ts
+++ b/app/src/redux/calibration/tip-length/__fixtures__/index.ts
@@ -1,2 +1 @@
-// @flow
 export * from './tip-length-calibration'
diff --git a/app/src/redux/calibration/tip-length/__fixtures__/tip-length-calibration.ts b/app/src/redux/calibration/tip-length/__fixtures__/tip-length-calibration.ts
index 1ecf8514e9a..98da83666f9 100644
--- a/app/src/redux/calibration/tip-length/__fixtures__/tip-length-calibration.ts
+++ b/app/src/redux/calibration/tip-length/__fixtures__/tip-length-calibration.ts
@@ -1,4 +1,3 @@
-// @flow
 import { GET } from '../../../robot-api'
 import {
   makeResponseFixtures,
@@ -69,7 +68,7 @@ export const {
   failure: mockFetchTipLengthCalibrationsFailure,
 }: ResponseFixtures<
   AllTipLengthCalibrations,
-  {| message: string |}
+  { message: string }
 > = makeResponseFixtures({
   method: GET,
   path: TIP_LENGTH_CALIBRATIONS_PATH,
diff --git a/app/src/redux/calibration/tip-length/__tests__/actions.test.ts b/app/src/redux/calibration/tip-length/__tests__/actions.test.ts
index 2f19880606b..af569375e19 100644
--- a/app/src/redux/calibration/tip-length/__tests__/actions.test.ts
+++ b/app/src/redux/calibration/tip-length/__tests__/actions.test.ts
@@ -1,17 +1,15 @@
-// @flow
-
 import * as Fixtures from '../__fixtures__'
 import * as Actions from '../actions'
 import type { TipLengthCalibrationsAction } from '../types'
 
-type ActionSpec = {|
-  should: string,
-  creator: (...Array<any>) => TipLengthCalibrationsAction,
-  args: Array<mixed>,
-  expected: TipLengthCalibrationsAction,
-|}
+interface ActionSpec {
+  should: string
+  creator: (...args: any[]) => TipLengthCalibrationsAction
+  args: unknown[]
+  expected: TipLengthCalibrationsAction
+}
 
-const SPECS: Array<ActionSpec> = [
+const SPECS: ActionSpec[] = [
   {
     should: 'create a fetchTipLengthCalibrations action',
     creator: Actions.fetchTipLengthCalibrations,
@@ -19,7 +17,7 @@ const SPECS: Array<ActionSpec> = [
     expected: {
       type: 'calibration:FETCH_TIP_LENGTH_CALIBRATIONS',
       payload: { robotName: 'robot-name' },
-      meta: {},
+      meta: {} as any,
     },
   },
   {
@@ -36,7 +34,7 @@ const SPECS: Array<ActionSpec> = [
         robotName: 'robot-name',
         tipLengthCalibrations: Fixtures.mockAllTipLengthCalibrations,
       },
-      meta: { requestId: '123' },
+      meta: { requestId: '123' } as any,
     },
   },
   {
@@ -53,7 +51,7 @@ const SPECS: Array<ActionSpec> = [
         robotName: 'robot-name',
         error: Fixtures.mockFetchTipLengthCalibrationsFailure.body,
       },
-      meta: { requestId: '123' },
+      meta: { requestId: '123' } as any,
     },
   },
 ]
diff --git a/app/src/redux/calibration/tip-length/__tests__/selectors.test.ts b/app/src/redux/calibration/tip-length/__tests__/selectors.test.ts
index 52cb2091645..03b0f68413c 100644
--- a/app/src/redux/calibration/tip-length/__tests__/selectors.test.ts
+++ b/app/src/redux/calibration/tip-length/__tests__/selectors.test.ts
@@ -1,11 +1,9 @@
-// @flow
-
 import * as Selectors from '../selectors'
 import * as Fixtures from '../__fixtures__'
 
 import type { State } from '../../../types'
 
-const mockState: $Shape<State> = {
+const mockState: State = {
   calibration: {
     'robot-name': {
       tipLengthCalibrations: Fixtures.mockAllTipLengthCalibrations,
@@ -14,7 +12,7 @@ const mockState: $Shape<State> = {
       calibrationStatus: null,
     },
   },
-}
+} as any
 
 describe('getTipLengthCalibrations', () => {
   it('should find all tip length calibrations when they exist', () => {
diff --git a/app/src/redux/calibration/tip-length/actions.ts b/app/src/redux/calibration/tip-length/actions.ts
index 448ae0e3b8c..11f0f6cc8d9 100644
--- a/app/src/redux/calibration/tip-length/actions.ts
+++ b/app/src/redux/calibration/tip-length/actions.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import * as Constants from './constants'
 import * as Types from './types'
 
diff --git a/app/src/redux/calibration/tip-length/constants.ts b/app/src/redux/calibration/tip-length/constants.ts
index 65930b3022a..b722d012184 100644
--- a/app/src/redux/calibration/tip-length/constants.ts
+++ b/app/src/redux/calibration/tip-length/constants.ts
@@ -1,5 +1,3 @@
-// @flow
-
 export const TIP_LENGTH_CALIBRATIONS_PATH: '/calibration/tip_length' =
   '/calibration/tip_length'
 
diff --git a/app/src/redux/calibration/tip-length/epic/__tests__/fetchTipLengthCalibrationsEpic.test.ts b/app/src/redux/calibration/tip-length/epic/__tests__/fetchTipLengthCalibrationsEpic.test.ts
index bfb66fe9f90..66afe22d64c 100644
--- a/app/src/redux/calibration/tip-length/epic/__tests__/fetchTipLengthCalibrationsEpic.test.ts
+++ b/app/src/redux/calibration/tip-length/epic/__tests__/fetchTipLengthCalibrationsEpic.test.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import {
   setupEpicTestMocks,
   runEpicTest,
@@ -8,7 +6,9 @@ import * as Fixtures from '../../__fixtures__'
 import * as Actions from '../../actions'
 import { tipLengthCalibrationsEpic } from '..'
 
-const makeTriggerActionAllCalibrations = robotName =>
+import type { Action } from '../../../../types'
+
+const makeTriggerActionAllCalibrations = (robotName: string) =>
   Actions.fetchTipLengthCalibrations(robotName)
 
 describe('fetch pipette offset calibration epics', () => {
@@ -22,7 +22,7 @@ describe('fetch pipette offset calibration epics', () => {
       Fixtures.mockFetchTipLengthCalibrationsSuccess
     )
 
-    runEpicTest(mocks, ({ hot, expectObservable, flush }) => {
+    runEpicTest<Action>(mocks, ({ hot, expectObservable, flush }) => {
       const action$ = hot('--a', { a: mocks.action })
       const state$ = hot('s-s', { s: mocks.state })
       const output$ = tipLengthCalibrationsEpic(action$, state$)
@@ -43,7 +43,7 @@ describe('fetch pipette offset calibration epics', () => {
       Fixtures.mockFetchTipLengthCalibrationsSuccess
     )
 
-    runEpicTest(mocks, ({ hot, expectObservable, flush }) => {
+    runEpicTest<Action>(mocks, ({ hot, expectObservable, flush }) => {
       const action$ = hot('--a', { a: mocks.action })
       const state$ = hot('s-s', { s: mocks.state })
       const output$ = tipLengthCalibrationsEpic(action$, state$)
@@ -67,7 +67,7 @@ describe('fetch pipette offset calibration epics', () => {
       Fixtures.mockFetchTipLengthCalibrationsFailure
     )
 
-    runEpicTest(mocks, ({ hot, expectObservable }) => {
+    runEpicTest<Action>(mocks, ({ hot, expectObservable }) => {
       const action$ = hot('--a', { a: mocks.action })
       const state$ = hot('s-s', { s: mocks.state })
       const output$ = tipLengthCalibrationsEpic(action$, state$)
diff --git a/app/src/redux/calibration/tip-length/epic/__tests__/fetchTipLengthCalibrationsOnCalibrationEnd.test.ts b/app/src/redux/calibration/tip-length/epic/__tests__/fetchTipLengthCalibrationsOnCalibrationEnd.test.ts
index 55d508c2464..4b24bd42863 100644
--- a/app/src/redux/calibration/tip-length/epic/__tests__/fetchTipLengthCalibrationsOnCalibrationEnd.test.ts
+++ b/app/src/redux/calibration/tip-length/epic/__tests__/fetchTipLengthCalibrationsOnCalibrationEnd.test.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import { TestScheduler } from 'rxjs/testing'
 import { selectors as RobotSelectors } from '../../../../robot'
 import * as Actions from '../../actions'
@@ -10,6 +8,8 @@ import * as SessionTypes from '../../../../sessions/types'
 import * as SessionActions from '../../../../sessions/actions'
 import * as SessionSelectors from '../../../../sessions/selectors'
 
+import type { Action, State } from '../../../../types'
+
 jest.mock('../../actions')
 jest.mock('../../../../robot/selectors')
 jest.mock('../../../../sessions/selectors')
@@ -17,16 +17,18 @@ jest.mock('../../../../sessions/selectors')
 const mockState = { state: true }
 const mockRobotName = 'robot-name'
 
-const mockGetConnectedRobotName: JestMockFn<[any], ?string> =
-  RobotSelectors.getConnectedRobotName
+const mockGetConnectedRobotName = RobotSelectors.getConnectedRobotName as jest.MockedFunction<
+  typeof RobotSelectors.getConnectedRobotName
+>
 
-const mockGetRobotSessionById: JestMockFn<[any, string, string], mixed> =
-  SessionSelectors.getRobotSessionById
+const mockGetRobotSessionById = SessionSelectors.getRobotSessionById as jest.MockedFunction<
+  typeof SessionSelectors.getRobotSessionById
+>
 
-const SPECS: Array<{|
-  describe: string,
-  robotSession: SessionTypes.Session,
-|}> = [
+const SPECS: Array<{
+  describe: string
+  robotSession: SessionTypes.Session
+}> = [
   {
     describe: 'tip length calibration',
     robotSession: {
@@ -51,7 +53,7 @@ const SPECS: Array<{|
 ]
 
 describe('fetchTipLengthCalibrationsOnCalibrationEndEpic', () => {
-  let testScheduler
+  let testScheduler: TestScheduler
 
   beforeEach(() => {
     mockGetConnectedRobotName.mockReturnValue(mockRobotName)
@@ -76,8 +78,8 @@ describe('fetchTipLengthCalibrationsOnCalibrationEndEpic', () => {
       )
 
       testScheduler.run(({ hot, expectObservable, flush }) => {
-        const action$ = hot('--a', { a: action })
-        const state$ = hot('s-s', { s: mockState })
+        const action$ = hot<Action>('--a', { a: action })
+        const state$ = hot<State>('s-s', { s: mockState } as any)
         const output$ = tipLengthCalibrationsEpic(action$, state$)
 
         expectObservable(output$).toBe('--a', {
@@ -101,8 +103,8 @@ describe('fetchTipLengthCalibrationsOnCalibrationEndEpic', () => {
     )
 
     testScheduler.run(({ hot, expectObservable, flush }) => {
-      const action$ = hot('--a', { a: action })
-      const state$ = hot('s-s', { s: mockState })
+      const action$ = hot<Action>('--a', { a: action })
+      const state$ = hot<State>('s-s', { s: mockState } as any)
       const output$ = tipLengthCalibrationsEpic(action$, state$)
 
       expectObservable(output$).toBe('---')
@@ -120,8 +122,8 @@ describe('fetchTipLengthCalibrationsOnCalibrationEndEpic', () => {
       )
 
       testScheduler.run(({ hot, expectObservable, flush }) => {
-        const action$ = hot('--a', { a: action })
-        const state$ = hot('s-s', { s: mockState })
+        const action$ = hot<Action>('--a', { a: action })
+        const state$ = hot<State>('s-s', { s: mockState } as any)
         const output$ = tipLengthCalibrationsEpic(action$, state$)
 
         expectObservable(output$).toBe('---')
diff --git a/app/src/redux/calibration/tip-length/epic/fetchTipLengthCalibrationsEpic.ts b/app/src/redux/calibration/tip-length/epic/fetchTipLengthCalibrationsEpic.ts
index 369e42eac5e..89ba34cb852 100644
--- a/app/src/redux/calibration/tip-length/epic/fetchTipLengthCalibrationsEpic.ts
+++ b/app/src/redux/calibration/tip-length/epic/fetchTipLengthCalibrationsEpic.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import { ofType } from 'redux-observable'
 
 import { GET } from '../../../robot-api/constants'
@@ -11,7 +9,7 @@ import type {
   ActionToRequestMapper,
   ResponseToActionMapper,
 } from '../../../robot-api/operators'
-import type { Epic } from '../../../types'
+import type { Action, Epic } from '../../../types'
 import type { FetchTipLengthCalibrationsAction } from '../types'
 
 const mapActionToRequest: ActionToRequestMapper<FetchTipLengthCalibrationsAction> = action => ({
@@ -32,7 +30,9 @@ const mapResponseToAction: ResponseToActionMapper<FetchTipLengthCalibrationsActi
 
 export const fetchTipLengthCalibrationsEpic: Epic = (action$, state$) => {
   return action$.pipe(
-    ofType(Constants.FETCH_TIP_LENGTH_CALIBRATIONS),
+    ofType<Action, FetchTipLengthCalibrationsAction>(
+      Constants.FETCH_TIP_LENGTH_CALIBRATIONS
+    ),
     mapToRobotApiRequest(
       state$,
       a => a.payload.robotName,
diff --git a/app/src/redux/calibration/tip-length/epic/fetchTipLengthCalibrationsOnCalibrationEnd.ts b/app/src/redux/calibration/tip-length/epic/fetchTipLengthCalibrationsOnCalibrationEnd.ts
index 5bc7d4ce8df..32485fb1549 100644
--- a/app/src/redux/calibration/tip-length/epic/fetchTipLengthCalibrationsOnCalibrationEnd.ts
+++ b/app/src/redux/calibration/tip-length/epic/fetchTipLengthCalibrationsOnCalibrationEnd.ts
@@ -1,13 +1,11 @@
-// @flow
-
 import { filter, withLatestFrom, map } from 'rxjs/operators'
 import { ofType } from 'redux-observable'
 
 import { getConnectedRobotName } from '../../../robot/selectors'
 import * as Actions from '../actions'
-import type { Epic, State } from '../../../types'
+import type { Action, Epic, State } from '../../../types'
 
-import type { SessionType } from '../../../sessions/types'
+import type { SessionType, DeleteSessionAction } from '../../../sessions/types'
 import {
   DELETE_SESSION,
   SESSION_TYPE_CALIBRATION_HEALTH_CHECK,
@@ -16,12 +14,12 @@ import {
 } from '../../../sessions/constants'
 import { getRobotSessionById } from '../../../sessions/selectors'
 
-const isTargetSessionType: SessionType => boolean = sessionType =>
-  [
+const isTargetSessionType = (sessionType: SessionType): boolean =>
+  ([
     SESSION_TYPE_CALIBRATION_HEALTH_CHECK,
     SESSION_TYPE_TIP_LENGTH_CALIBRATION,
     SESSION_TYPE_PIPETTE_OFFSET_CALIBRATION,
-  ].includes(sessionType)
+  ] as SessionType[]).includes(sessionType)
 
 const sessionIncursRefetch: (
   state: State,
@@ -42,13 +40,11 @@ export const fetchTipLengthCalibrationsOnCalibrationEndEpic: Epic = (
   state$
 ) => {
   return action$.pipe(
-    ofType(DELETE_SESSION),
-    withLatestFrom(state$, (a, s) => [
-      a,
-      s,
-      getConnectedRobotName(s),
-      a.payload.sessionId,
-    ]),
+    ofType<Action, DeleteSessionAction>(DELETE_SESSION),
+    withLatestFrom<
+      DeleteSessionAction,
+      [DeleteSessionAction, State, string, string]
+    >(state$, (a, s) => [a, s, getConnectedRobotName(s), a.payload.sessionId]),
     filter(
       ([action, state, robotName, sessionId]) =>
         robotName != null && sessionIncursRefetch(state, robotName, sessionId)
diff --git a/app/src/redux/calibration/tip-length/epic/index.ts b/app/src/redux/calibration/tip-length/epic/index.ts
index 7647001a35c..a0cf0781b70 100644
--- a/app/src/redux/calibration/tip-length/epic/index.ts
+++ b/app/src/redux/calibration/tip-length/epic/index.ts
@@ -1,12 +1,10 @@
-// @flow
-
 import { combineEpics } from 'redux-observable'
 import { fetchTipLengthCalibrationsEpic } from './fetchTipLengthCalibrationsEpic'
 
 import type { Epic } from '../../../types'
 import { fetchTipLengthCalibrationsOnCalibrationEndEpic } from './fetchTipLengthCalibrationsOnCalibrationEnd'
 
-export const tipLengthCalibrationsEpic: Epic = combineEpics(
+export const tipLengthCalibrationsEpic: Epic = combineEpics<Epic>(
   fetchTipLengthCalibrationsEpic,
   fetchTipLengthCalibrationsOnCalibrationEndEpic
 )
diff --git a/app/src/redux/calibration/tip-length/index.ts b/app/src/redux/calibration/tip-length/index.ts
index 971a4b68958..3c9e14ddbee 100644
--- a/app/src/redux/calibration/tip-length/index.ts
+++ b/app/src/redux/calibration/tip-length/index.ts
@@ -1,4 +1,3 @@
-// @flow
 // tip length calibration data actions, selectors, and constants
 export * from './actions'
 export * from './constants'
diff --git a/app/src/redux/calibration/tip-length/selectors.ts b/app/src/redux/calibration/tip-length/selectors.ts
index 57f4f944422..ac0edbc1a9f 100644
--- a/app/src/redux/calibration/tip-length/selectors.ts
+++ b/app/src/redux/calibration/tip-length/selectors.ts
@@ -1,5 +1,3 @@
-// @flow
-import { createSelector } from 'reselect'
 import { head } from 'lodash'
 
 import type { State } from '../../types'
@@ -8,7 +6,7 @@ import type { TipLengthCalibration } from '../api-types'
 export const getTipLengthCalibrations: (
   state: State,
   robotName: string | null
-) => Array<TipLengthCalibration> = (state, robotName) => {
+) => TipLengthCalibration[] = (state, robotName) => {
   if (!robotName) {
     return []
   }
@@ -17,26 +15,8 @@ export const getTipLengthCalibrations: (
   return calibrations
 }
 
-export const getTipLengthForPipetteAndTiprackByUri: (
-  state: State,
-  robotName: string | null,
-  pipetteSerial: string,
-  tiprackUri: string
-) => TipLengthCalibration | null = createSelector(
-  getTipLengthCalibrations,
-  (allCalibrations, pipetteSerial, tipRackUri) => {
-    return (
-      head(
-        allCalibrations.filter(
-          cal => cal.pipette === pipetteSerial && cal.uri === tipRackUri
-        )
-      ) || null
-    )
-  }
-)
-
 export const filterTipLengthForPipetteAndTiprack: (
-  allCalibrations: Array<TipLengthCalibration>,
+  allCalibrations: TipLengthCalibration[],
   pipetteSerial: string | null,
   tiprackHash: string | null
 ) => TipLengthCalibration | null = (
@@ -73,7 +53,7 @@ export const getTipLengthForPipetteAndTiprack: (
 }
 
 export const tipLengthExistsForPipetteAndTiprack: (
-  calibrations: Array<TipLengthCalibration>,
+  calibrations: TipLengthCalibration[],
   pipetteSerial: string,
   tiprackHash: string
 ) => boolean = (calibrations, pipetteSerial, tiprackHash) => {
diff --git a/app/src/redux/calibration/tip-length/types.ts b/app/src/redux/calibration/tip-length/types.ts
index ba5bd65a285..103311e3f3f 100644
--- a/app/src/redux/calibration/tip-length/types.ts
+++ b/app/src/redux/calibration/tip-length/types.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import type {
   RobotApiRequestMeta,
   RobotApiErrorResponse,
@@ -7,32 +5,32 @@ import type {
 
 import type { AllTipLengthCalibrations } from '../api-types'
 
-import typeof {
+import {
   FETCH_TIP_LENGTH_CALIBRATIONS,
   FETCH_TIP_LENGTH_CALIBRATIONS_SUCCESS,
   FETCH_TIP_LENGTH_CALIBRATIONS_FAILURE,
 } from './constants'
 
-export type FetchTipLengthCalibrationsAction = {|
-  type: FETCH_TIP_LENGTH_CALIBRATIONS,
-  payload: {| robotName: string |},
-  meta: RobotApiRequestMeta,
-|}
+export interface FetchTipLengthCalibrationsAction {
+  type: typeof FETCH_TIP_LENGTH_CALIBRATIONS
+  payload: { robotName: string }
+  meta: RobotApiRequestMeta | {}
+}
 
-export type FetchTipLengthCalibrationsSuccessAction = {|
-  type: FETCH_TIP_LENGTH_CALIBRATIONS_SUCCESS,
-  payload: {|
-    robotName: string,
-    tipLengthCalibrations: AllTipLengthCalibrations,
-  |},
-  meta: RobotApiRequestMeta,
-|}
+export interface FetchTipLengthCalibrationsSuccessAction {
+  type: typeof FETCH_TIP_LENGTH_CALIBRATIONS_SUCCESS
+  payload: {
+    robotName: string
+    tipLengthCalibrations: AllTipLengthCalibrations
+  }
+  meta: RobotApiRequestMeta
+}
 
-export type FetchTipLengthCalibrationsFailureAction = {|
-  type: FETCH_TIP_LENGTH_CALIBRATIONS_FAILURE,
-  payload: {| robotName: string, error: RobotApiErrorResponse |},
-  meta: RobotApiRequestMeta,
-|}
+export interface FetchTipLengthCalibrationsFailureAction {
+  type: typeof FETCH_TIP_LENGTH_CALIBRATIONS_FAILURE
+  payload: { robotName: string; error: RobotApiErrorResponse }
+  meta: RobotApiRequestMeta
+}
 
 export type TipLengthCalibrationsAction =
   | FetchTipLengthCalibrationsAction
diff --git a/app/src/redux/calibration/types.ts b/app/src/redux/calibration/types.ts
index e6335a1bb39..21e7a3c4dd2 100644
--- a/app/src/redux/calibration/types.ts
+++ b/app/src/redux/calibration/types.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import type {
   RobotApiRequestMeta,
   RobotApiErrorResponse,
@@ -16,37 +14,37 @@ import type { LabwareCalibrationAction } from './labware/types'
 import type { PipetteOffsetCalibrationsAction } from './pipette-offset/types'
 import type { TipLengthCalibrationsAction } from './tip-length/types'
 
-import typeof {
+import {
   FETCH_CALIBRATION_STATUS,
   FETCH_CALIBRATION_STATUS_SUCCESS,
   FETCH_CALIBRATION_STATUS_FAILURE,
 } from './constants'
 
-export type * from './api-types'
-export type * from './labware/types'
-export type * from './pipette-offset/types'
-export type * from './tip-length/types'
+export * from './api-types'
+export * from './labware/types'
+export * from './pipette-offset/types'
+export * from './tip-length/types'
 
-export type FetchCalibrationStatusAction = {|
-  type: FETCH_CALIBRATION_STATUS,
-  payload: {| robotName: string |},
-  meta: RobotApiRequestMeta,
-|}
+export interface FetchCalibrationStatusAction {
+  type: typeof FETCH_CALIBRATION_STATUS
+  payload: { robotName: string }
+  meta: RobotApiRequestMeta | {}
+}
 
-export type FetchCalibrationStatusSuccessAction = {|
-  type: FETCH_CALIBRATION_STATUS_SUCCESS,
-  payload: {|
-    robotName: string,
-    calibrationStatus: CalibrationStatus,
-  |},
-  meta: RobotApiRequestMeta,
-|}
+export interface FetchCalibrationStatusSuccessAction {
+  type: typeof FETCH_CALIBRATION_STATUS_SUCCESS
+  payload: {
+    robotName: string
+    calibrationStatus: CalibrationStatus
+  }
+  meta: RobotApiRequestMeta
+}
 
-export type FetchCalibrationStatusFailureAction = {|
-  type: FETCH_CALIBRATION_STATUS_FAILURE,
-  payload: {| robotName: string, error: RobotApiErrorResponse |},
-  meta: RobotApiRequestMeta,
-|}
+export interface FetchCalibrationStatusFailureAction {
+  type: typeof FETCH_CALIBRATION_STATUS_FAILURE
+  payload: { robotName: string; error: RobotApiErrorResponse }
+  meta: RobotApiRequestMeta
+}
 
 export type CalibrationAction =
   | FetchCalibrationStatusAction
@@ -56,14 +54,15 @@ export type CalibrationAction =
   | PipetteOffsetCalibrationsAction
   | TipLengthCalibrationsAction
 
-export type PerRobotCalibrationState = $ReadOnly<{|
-  calibrationStatus: CalibrationStatus | null,
-  labwareCalibrations: AllLabwareCalibrations | null,
-  pipetteOffsetCalibrations: AllPipetteOffsetCalibrations | null,
-  tipLengthCalibrations: AllTipLengthCalibrations | null,
-|}>
-
-export type CalibrationState = $ReadOnly<{
-  [robotName: string]: PerRobotCalibrationState,
-  ...
+export type PerRobotCalibrationState = Readonly<{
+  calibrationStatus: CalibrationStatus | null
+  labwareCalibrations: AllLabwareCalibrations | null
+  pipetteOffsetCalibrations: AllPipetteOffsetCalibrations | null
+  tipLengthCalibrations: AllTipLengthCalibrations | null
 }>
+
+export type CalibrationState = Readonly<
+  Partial<{
+    [robotName: string]: PerRobotCalibrationState
+  }>
+>
diff --git a/app/src/redux/config/__tests__/config.test.ts b/app/src/redux/config/__tests__/config.test.ts
index 40cad1baad2..96d088fcff9 100644
--- a/app/src/redux/config/__tests__/config.test.ts
+++ b/app/src/redux/config/__tests__/config.test.ts
@@ -1,17 +1,15 @@
-// @flow
 // config tests
 import * as Cfg from '..'
 import { configReducer } from '../reducer'
 
 import type { State } from '../../types'
-import type { Config } from '../types'
 
 jest.mock('../../shell/remote', () => ({
   remote: { INITIAL_CONFIG: { isConfig: true } },
 }))
 
 describe('config', () => {
-  let state: $Shape<{| ...State, config: $Shape<Config> |}>
+  let state: State
 
   beforeEach(() => {
     jest.clearAllMocks()
@@ -23,12 +21,12 @@ describe('config', () => {
           ignored: ['someAlert'],
         },
       },
-    }
+    } as any
   })
 
   describe('actions', () => {
     it('can create an config:INITIALIZED for initial config values', () => {
-      expect(Cfg.configInitialized(state.config)).toEqual({
+      expect(Cfg.configInitialized(state.config as any)).toEqual({
         type: 'config:INITIALIZED',
         payload: { config: state.config },
       })
@@ -84,7 +82,7 @@ describe('config', () => {
 
   describe('reducer', () => {
     it('handles config:INITIALIZED', () => {
-      const action = Cfg.configInitialized(state.config)
+      const action = Cfg.configInitialized(state.config as any)
 
       expect(configReducer(null, action)).toEqual(state.config)
     })
diff --git a/app/src/redux/config/__tests__/hooks.test.tsx b/app/src/redux/config/__tests__/hooks.test.tsx
index 71c69242422..09cae0e52fc 100644
--- a/app/src/redux/config/__tests__/hooks.test.tsx
+++ b/app/src/redux/config/__tests__/hooks.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { Provider } from 'react-redux'
 import { mount } from 'enzyme'
@@ -7,13 +6,11 @@ import noop from 'lodash/noop'
 import * as Selectors from '../selectors'
 import { useFeatureFlag } from '../hooks'
 
-import type { State } from '../../types'
-import type { FeatureFlags } from '../types'
-
 jest.mock('../selectors')
 
-const getFeatureFlags: JestMockFn<[State], FeatureFlags> =
-  Selectors.getFeatureFlags
+const getFeatureFlags = Selectors.getFeatureFlags as jest.MockedFunction<
+  typeof Selectors.getFeatureFlags
+>
 
 describe('config hooks', () => {
   afterEach(() => {
@@ -22,13 +19,13 @@ describe('config hooks', () => {
 
   describe('useFeatureFlag', () => {
     let result: boolean
-    const TestUseFeatureFlag = (props: {| flag: any |}) => {
+    const TestUseFeatureFlag = (props: { flag: any }) => {
       result = useFeatureFlag(props.flag)
       return <></>
     }
 
     const mockStore = {
-      getState: () => ({ mockState: true }: any),
+      getState: () => ({ mockState: true } as any),
       dispatch: noop,
       subscribe: noop,
     }
@@ -48,28 +45,28 @@ describe('config hooks', () => {
     })
 
     it('should return false if the feature flag is set to false', () => {
-      getFeatureFlags.mockReturnValue(({ someFlag: false }: any))
+      getFeatureFlags.mockReturnValue({ someFlag: false } as any)
 
       render('someFlag')
       expect(result).toBe(false)
     })
 
     it('should return false if the feature flag is set to falsey', () => {
-      getFeatureFlags.mockReturnValue(({ someFlag: (0: any) }: any))
+      getFeatureFlags.mockReturnValue({ someFlag: 0 as any } as any)
 
       render('someFlag')
       expect(result).toBe(false)
     })
 
     it('should return true if the feature flag is set', () => {
-      getFeatureFlags.mockReturnValue(({ someFlag: true }: any))
+      getFeatureFlags.mockReturnValue({ someFlag: true } as any)
 
       render('someFlag')
       expect(result).toBe(true)
     })
 
     it('should return true if the feature flag is set to truthy', () => {
-      getFeatureFlags.mockReturnValue(({ someFlag: (1: any) }: any))
+      getFeatureFlags.mockReturnValue({ someFlag: 1 as any } as any)
 
       render('someFlag')
       expect(result).toBe(true)
diff --git a/app/src/redux/config/__tests__/selectors.test.ts b/app/src/redux/config/__tests__/selectors.test.ts
index 469322d597b..87c7db1f32a 100644
--- a/app/src/redux/config/__tests__/selectors.test.ts
+++ b/app/src/redux/config/__tests__/selectors.test.ts
@@ -1,56 +1,51 @@
-// @flow
-
 import * as Selectors from '../selectors'
 
 import type { State } from '../../types'
-import type { Config } from '../types'
-
-type MockState = $Shape<{| ...State, config: $Shape<Config> | null |}>
 
 describe('shell selectors', () => {
   describe('getDevtoolsEnabled', () => {
     it('should return false if config is unknown', () => {
-      const state: MockState = { config: null }
+      const state: State = { config: null } as any
       expect(Selectors.getDevtoolsEnabled(state)).toEqual(false)
     })
 
     it('should return config.devtools if config is known', () => {
-      const state: MockState = { config: { devtools: true } }
+      const state: State = { config: { devtools: true } } as any
       expect(Selectors.getDevtoolsEnabled(state)).toEqual(true)
     })
   })
 
   describe('getFeatureFlags', () => {
     it('should return an empty object if config is unknown', () => {
-      const state: MockState = { config: null }
+      const state: State = { config: null } as any
       expect(Selectors.getFeatureFlags(state)).toEqual({})
     })
 
     it('should return config.devInternal if config is known', () => {
-      const state: MockState = {
-        config: { devInternal: { [('feature': any)]: true } },
-      }
+      const state: State = {
+        config: { devInternal: { ['feature' as any]: true } },
+      } as any
       expect(Selectors.getFeatureFlags(state)).toEqual({ feature: true })
     })
   })
 
   describe('getUpdateChannel', () => {
     it('should return "latest" if config is unknown', () => {
-      const state: MockState = { config: null }
+      const state: State = { config: null } as any
       expect(Selectors.getUpdateChannel(state)).toEqual('latest')
     })
 
     it('should return config.update.channel if config is known', () => {
-      const state: MockState = {
+      const state: State = {
         config: { update: { channel: 'beta' } },
-      }
+      } as any
       expect(Selectors.getUpdateChannel(state)).toEqual('beta')
     })
   })
 
   describe('getUpdateChannelOptions', () => {
     it('should return "latest" and "beta" options if config is unknown', () => {
-      const state: MockState = { config: null }
+      const state: State = { config: null } as any
       expect(Selectors.getUpdateChannelOptions(state)).toEqual([
         { name: 'Stable', value: 'latest' },
         { name: 'Beta', value: 'beta' },
@@ -58,9 +53,9 @@ describe('shell selectors', () => {
     })
 
     it('should return "latest" and "beta" options if config is known and devtools are disabled', () => {
-      const state: MockState = {
+      const state: State = {
         config: { devtools: false, update: { channel: 'latest' } },
-      }
+      } as any
       expect(Selectors.getUpdateChannelOptions(state)).toEqual([
         { name: 'Stable', value: 'latest' },
         { name: 'Beta', value: 'beta' },
@@ -68,9 +63,9 @@ describe('shell selectors', () => {
     })
 
     it('should return "latest", "beta", and "alpha" options if devtools are enabled', () => {
-      const state: MockState = {
+      const state: State = {
         config: { devtools: true, update: { channel: 'latest' } },
-      }
+      } as any
       expect(Selectors.getUpdateChannelOptions(state)).toEqual([
         { name: 'Stable', value: 'latest' },
         { name: 'Beta', value: 'beta' },
@@ -79,9 +74,9 @@ describe('shell selectors', () => {
     })
 
     it('should return an "alpha" option if devtools are disabled but current channel is alpha', () => {
-      const state: MockState = {
+      const state: State = {
         config: { devtools: false, update: { channel: 'alpha' } },
-      }
+      } as any
       expect(Selectors.getUpdateChannelOptions(state)).toEqual([
         { name: 'Stable', value: 'latest' },
         { name: 'Beta', value: 'beta' },
@@ -92,23 +87,23 @@ describe('shell selectors', () => {
 
   describe('getUseTrashSurfaceForTipCal', () => {
     it('should return null if saved value in config is null', () => {
-      const state: MockState = {
+      const state: State = {
         config: { calibration: { useTrashSurfaceForTipCal: null } },
-      }
+      } as any
       expect(Selectors.getUseTrashSurfaceForTipCal(state)).toEqual(null)
     })
 
     it('should return true if saved value in config is true', () => {
-      const state: MockState = {
+      const state: State = {
         config: { calibration: { useTrashSurfaceForTipCal: true } },
-      }
+      } as any
       expect(Selectors.getUseTrashSurfaceForTipCal(state)).toEqual(true)
     })
 
     it('should return false if saved value in config is false', () => {
-      const state: MockState = {
+      const state: State = {
         config: { calibration: { useTrashSurfaceForTipCal: false } },
-      }
+      } as any
       expect(Selectors.getUseTrashSurfaceForTipCal(state)).toEqual(false)
     })
   })
diff --git a/app/src/redux/config/actions.ts b/app/src/redux/config/actions.ts
index 79922287c17..2138e449491 100644
--- a/app/src/redux/config/actions.ts
+++ b/app/src/redux/config/actions.ts
@@ -1,11 +1,10 @@
-// @flow
 import * as Constants from './constants'
 import * as Types from './types'
 
 // request a config value update
 export const updateConfigValue = (
   path: string,
-  value: mixed
+  value: unknown
 ): Types.UpdateConfigValueAction => ({
   type: Constants.UPDATE_VALUE,
   payload: { path, value },
@@ -33,7 +32,7 @@ export const toggleConfigValue = (
 // add a unique value into an array config if it's not already in there
 export const addUniqueConfigValue = (
   path: string,
-  value: mixed
+  value: unknown
 ): Types.AddUniqueConfigValueAction => ({
   type: Constants.ADD_UNIQUE_VALUE,
   payload: { path, value },
@@ -43,7 +42,7 @@ export const addUniqueConfigValue = (
 // remove a unique from an array config if it's in there
 export const subtractConfigValue = (
   path: string,
-  value: mixed
+  value: unknown
 ): Types.SubtractConfigValueAction => ({
   type: Constants.SUBTRACT_VALUE,
   payload: { path, value },
@@ -61,7 +60,7 @@ export const configInitialized = (
 // config value has been updated
 export const configValueUpdated = (
   path: string,
-  value: mixed
+  value: unknown
 ): Types.ConfigValueUpdatedAction => ({
   type: Constants.VALUE_UPDATED,
   payload: { path, value },
diff --git a/app/src/redux/config/constants.ts b/app/src/redux/config/constants.ts
index b9963e6241b..01ec6ea8071 100644
--- a/app/src/redux/config/constants.ts
+++ b/app/src/redux/config/constants.ts
@@ -1,10 +1,8 @@
-// @flow
-
 import type { DevInternalFlag } from './types'
 
 export const CONFIG_VERSION_LATEST: 1 = 1
 
-export const DEV_INTERNAL_FLAGS: Array<DevInternalFlag> = [
+export const DEV_INTERNAL_FLAGS: DevInternalFlag[] = [
   'allPipetteConfig',
   'enableBundleUpload',
 ]
diff --git a/app/src/redux/config/hooks.ts b/app/src/redux/config/hooks.ts
index fd6473e29f0..4e1b8889f91 100644
--- a/app/src/redux/config/hooks.ts
+++ b/app/src/redux/config/hooks.ts
@@ -1,4 +1,3 @@
-// @flow
 import { useSelector } from 'react-redux'
 
 import { getFeatureFlags } from './selectors'
diff --git a/app/src/redux/config/index.ts b/app/src/redux/config/index.ts
index 6632ae1e01f..918ce9eba8f 100644
--- a/app/src/redux/config/index.ts
+++ b/app/src/redux/config/index.ts
@@ -1,4 +1,3 @@
-// @flow
 // config redux module
 export * from './actions'
 export * from './constants'
diff --git a/app/src/redux/config/reducer.ts b/app/src/redux/config/reducer.ts
index 4a68eb9c4f0..43ca69064ca 100644
--- a/app/src/redux/config/reducer.ts
+++ b/app/src/redux/config/reducer.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import { setIn } from '@thi.ng/paths'
 import { INITIALIZED, VALUE_UPDATED } from './constants'
 
diff --git a/app/src/redux/config/schema-types.ts b/app/src/redux/config/schema-types.ts
index 3cf9e768dcf..5a668308701 100644
--- a/app/src/redux/config/schema-types.ts
+++ b/app/src/redux/config/schema-types.ts
@@ -1,115 +1,107 @@
-// @flow
 import type { LogLevel } from '../../logger'
 
 export type UrlProtocol = 'file:' | 'http:'
 
 export type UpdateChannel = 'latest' | 'beta' | 'alpha'
 
-export type DiscoveryCandidates = string | Array<string>
+export type DiscoveryCandidates = string | string[]
 
 export type DevInternalFlag = 'allPipetteConfig' | 'enableBundleUpload'
 
-export type FeatureFlags = $Shape<{|
-  [DevInternalFlag]: boolean | void,
-|}>
+export type FeatureFlags = Partial<Record<DevInternalFlag, boolean | undefined>>
 
-export type ConfigV0 = $ReadOnly<{|
-  version: 0,
-  devtools: boolean,
-  reinstallDevtools: boolean,
+export interface ConfigV0 {
+  version: 0
+  devtools: boolean
+  reinstallDevtools: boolean
 
   // app update config
-  update: $ReadOnly<{|
-    channel: UpdateChannel,
-  |}>,
+  update: {
+    channel: UpdateChannel
+  }
 
   // robot update config
-  buildroot: $ReadOnly<{|
-    manifestUrl: string,
-  |}>,
+  buildroot: {
+    manifestUrl: string
+  }
 
   // logging config
-  log: $ReadOnly<{|
-    level: $ReadOnly<{|
-      file: LogLevel,
-      console: LogLevel,
-    |}>,
-  |}>,
+  log: {
+    level: {
+      file: LogLevel
+      console: LogLevel
+    }
+  }
 
   // ui and browser config
-  ui: $ReadOnly<{|
-    width: number,
-    height: number,
-    url: $ReadOnly<{|
-      protocol: UrlProtocol,
-      path: string,
-    |}>,
-    webPreferences: $ReadOnly<{|
-      webSecurity: boolean,
-    |}>,
-  |}>,
-
-  analytics: $ReadOnly<{|
-    appId: string,
-    optedIn: boolean,
-    seenOptIn: boolean,
-  |}>,
+  ui: {
+    width: number
+    height: number
+    url: {
+      protocol: UrlProtocol
+      path: string
+    }
+    webPreferences: {
+      webSecurity: boolean
+    }
+  }
+
+  analytics: {
+    appId: string
+    optedIn: boolean
+    seenOptIn: boolean
+  }
 
   // deprecated
-  p10WarningSeen: $ReadOnly<{
-    [id: string]: ?boolean,
-    ...
-  }>,
-
-  support: $ReadOnly<{|
-    userId: string,
-    createdAt: number,
-    name: string,
-    email: ?string,
-  |}>,
-
-  discovery: $ReadOnly<{|
-    candidates: DiscoveryCandidates,
-  |}>,
+  p10WarningSeen: {
+    [id: string]: boolean | null | undefined
+  }
+
+  support: {
+    userId: string
+    createdAt: number
+    name: string
+    email: string | null | undefined
+  }
+
+  discovery: {
+    candidates: DiscoveryCandidates
+  }
 
   // custom labware files
-  labware: $ReadOnly<{|
-    directory: string,
-  |}>,
+  labware: {
+    directory: string
+  }
 
   // app wide alerts
-  alerts: $ReadOnly<{| ignored: $ReadOnlyArray<string> |}>,
+  alerts: { ignored: string[] }
 
   // internal development flags
-  devInternal?: $ReadOnly<FeatureFlags>,
-|}>
-
-export type ConfigV1 = $ReadOnly<{|
-  ...ConfigV0,
-  version: 1,
-  discovery: $ReadOnly<{|
-    candidates: DiscoveryCandidates,
-    disableCache: boolean,
-  |}>,
-|}>
-
-export type ConfigV2 = $ReadOnly<{|
-  ...ConfigV1,
-  version: 2,
-  calibration: $ReadOnly<{|
-    useTrashSurfaceForTipCal: boolean | null,
-  |}>,
-|}>
+  devInternal?: FeatureFlags
+}
+
+export interface ConfigV1 extends Omit<ConfigV0, 'version' | 'discovery'> {
+  version: 1
+  discovery: {
+    candidates: DiscoveryCandidates
+    disableCache: boolean
+  }
+}
+
+export interface ConfigV2 extends Omit<ConfigV1, 'version'> {
+  version: 2
+  calibration: {
+    useTrashSurfaceForTipCal: boolean | null
+  }
+}
 
 // v3 config changes default values but does not change schema
-export type ConfigV3 = $ReadOnly<{|
-  ...ConfigV2,
-  version: 3,
-  support: $ReadOnly<{|
-    ...$PropertyType<ConfigV2, 'support'>,
-    name: string | null,
-    email: string | null,
-  |}>,
-|}>
+export interface ConfigV3 extends Omit<ConfigV2, 'version' | 'support'> {
+  version: 3
+  support: ConfigV2['support'] & {
+    name: string | null
+    email: string | null
+  }
+}
 
 export type Config = ConfigV3
diff --git a/app/src/redux/config/selectors.ts b/app/src/redux/config/selectors.ts
index def05771e2d..3e604e3b8f8 100644
--- a/app/src/redux/config/selectors.ts
+++ b/app/src/redux/config/selectors.ts
@@ -1,4 +1,3 @@
-// @flow
 import type { DropdownOption } from '@opentrons/components'
 import type { State } from '../types'
 import type { Config, FeatureFlags, UpdateChannel } from './types'
@@ -27,18 +26,16 @@ export const getHasCalibrationBlock = (state: State): boolean | null => {
 }
 
 const UPDATE_CHANNEL_OPTS = [
-  { name: 'Stable', value: (('latest': UpdateChannel): string) },
-  { name: 'Beta', value: (('beta': UpdateChannel): string) },
+  { name: 'Stable', value: 'latest' as UpdateChannel },
+  { name: 'Beta', value: 'beta' as UpdateChannel },
 ]
 
 const UPDATE_CHANNEL_OPTS_WITH_ALPHA = [
   ...UPDATE_CHANNEL_OPTS,
-  { name: 'Alpha', value: (('alpha': UpdateChannel): string) },
+  { name: 'Alpha', value: 'alpha' as UpdateChannel },
 ]
 
-export const getUpdateChannelOptions = (
-  state: State
-): Array<DropdownOption> => {
+export const getUpdateChannelOptions = (state: State): DropdownOption[] => {
   return state.config?.devtools || state.config?.update.channel === 'alpha'
     ? UPDATE_CHANNEL_OPTS_WITH_ALPHA
     : UPDATE_CHANNEL_OPTS
diff --git a/app/src/redux/config/types.ts b/app/src/redux/config/types.ts
index e50d005ea31..7e57539700d 100644
--- a/app/src/redux/config/types.ts
+++ b/app/src/redux/config/types.ts
@@ -1,5 +1,4 @@
-// @flow
-import typeof {
+import {
   INITIALIZED,
   VALUE_UPDATED,
   UPDATE_VALUE,
@@ -10,49 +9,49 @@ import typeof {
 } from './constants'
 
 import type { Config } from './schema-types'
-export type * from './schema-types'
+export * from './schema-types'
 
 export type ConfigState = Config | null
 
-export type ConfigInitializedAction = {|
-  type: INITIALIZED,
-  payload: {| config: Config |},
-|}
+export interface ConfigInitializedAction {
+  type: typeof INITIALIZED
+  payload: { config: Config }
+}
 
-export type ConfigValueUpdatedAction = {|
-  type: VALUE_UPDATED,
-  payload: {| path: string, value: any |},
-|}
+export interface ConfigValueUpdatedAction {
+  type: typeof VALUE_UPDATED
+  payload: { path: string; value: any }
+}
 
-export type UpdateConfigValueAction = {|
-  type: UPDATE_VALUE,
-  payload: {| path: string, value: mixed |},
-  meta: {| shell: true |},
-|}
+export interface UpdateConfigValueAction {
+  type: typeof UPDATE_VALUE
+  payload: { path: string; value: unknown }
+  meta: { shell: true }
+}
 
-export type ResetConfigValueAction = {|
-  type: RESET_VALUE,
-  payload: {| path: string |},
-  meta: {| shell: true |},
-|}
+export interface ResetConfigValueAction {
+  type: typeof RESET_VALUE
+  payload: { path: string }
+  meta: { shell: true }
+}
 
-export type ToggleConfigValueAction = {|
-  type: TOGGLE_VALUE,
-  payload: {| path: string |},
-  meta: {| shell: true |},
-|}
+export interface ToggleConfigValueAction {
+  type: typeof TOGGLE_VALUE
+  payload: { path: string }
+  meta: { shell: true }
+}
 
-export type AddUniqueConfigValueAction = {|
-  type: ADD_UNIQUE_VALUE,
-  payload: {| path: string, value: mixed |},
-  meta: {| shell: true |},
-|}
+export interface AddUniqueConfigValueAction {
+  type: typeof ADD_UNIQUE_VALUE
+  payload: { path: string; value: unknown }
+  meta: { shell: true }
+}
 
-export type SubtractConfigValueAction = {|
-  type: SUBTRACT_VALUE,
-  payload: {| path: string, value: mixed |},
-  meta: {| shell: true |},
-|}
+export interface SubtractConfigValueAction {
+  type: typeof SUBTRACT_VALUE
+  payload: { path: string; value: unknown }
+  meta: { shell: true }
+}
 
 export type ConfigValueChangeAction =
   | UpdateConfigValueAction
diff --git a/app/src/redux/custom-labware/__fixtures__/index.ts b/app/src/redux/custom-labware/__fixtures__/index.ts
index 06f1fc37b16..c8c0b1c6c68 100644
--- a/app/src/redux/custom-labware/__fixtures__/index.ts
+++ b/app/src/redux/custom-labware/__fixtures__/index.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import type { LabwareDefinition2 } from '@opentrons/shared-data'
 import * as Types from '../types'
 
diff --git a/app/src/redux/custom-labware/__tests__/actions.test.ts b/app/src/redux/custom-labware/__tests__/actions.test.ts
index 45fb747cb8d..539a3d07614 100644
--- a/app/src/redux/custom-labware/__tests__/actions.test.ts
+++ b/app/src/redux/custom-labware/__tests__/actions.test.ts
@@ -1,18 +1,17 @@
-// @flow
 import * as Fixtures from '../__fixtures__'
 import * as actions from '../actions'
 
 import type { Action } from '../../types'
 
-type ActionSpec = {|
-  name: string,
-  creator: (...Array<any>) => mixed,
-  args?: Array<mixed>,
-  expected: Action,
-|}
+interface ActionSpec {
+  name: string
+  creator: (...args: any[]) => unknown
+  args?: unknown[]
+  expected: Action
+}
 
 describe('custom labware actions', () => {
-  const SPECS: Array<ActionSpec> = [
+  const SPECS: ActionSpec[] = [
     {
       name: 'fetchCustomLabware',
       creator: actions.fetchCustomLabware,
@@ -30,8 +29,16 @@ describe('custom labware actions', () => {
       expected: {
         type: 'labware:CUSTOM_LABWARE_LIST',
         payload: [
-          { type: 'INVALID_LABWARE_FILE', filename: 'a.json', modified: 0 },
-          { type: 'INVALID_LABWARE_FILE', filename: 'b.json', modified: 1 },
+          {
+            type: 'INVALID_LABWARE_FILE',
+            filename: 'a.json',
+            modified: 0,
+          } as any,
+          {
+            type: 'INVALID_LABWARE_FILE',
+            filename: 'b.json',
+            modified: 1,
+          } as any,
         ],
         meta: { source: 'poll' },
       },
@@ -46,7 +53,11 @@ describe('custom labware actions', () => {
       expected: {
         type: 'labware:CUSTOM_LABWARE_LIST',
         payload: [
-          { type: 'INVALID_LABWARE_FILE', filename: 'a.json', modified: 0 },
+          {
+            type: 'INVALID_LABWARE_FILE',
+            filename: 'a.json',
+            modified: 0,
+          } as any,
         ],
         meta: { source: 'changeDirectory' },
       },
diff --git a/app/src/redux/custom-labware/__tests__/reducer.test.ts b/app/src/redux/custom-labware/__tests__/reducer.test.ts
index 55784a9a31b..38fa89c02a0 100644
--- a/app/src/redux/custom-labware/__tests__/reducer.test.ts
+++ b/app/src/redux/custom-labware/__tests__/reducer.test.ts
@@ -1,19 +1,18 @@
-// @flow
 import * as Fixtures from '../__fixtures__'
 import { INITIAL_STATE, customLabwareReducer } from '../reducer'
 
 import type { Action } from '../../types'
 import type { CustomLabwareState } from '../types'
 
-type ReducerSpec = {|
-  name: string,
-  state: $Shape<CustomLabwareState>,
-  action: Action,
-  expected: $Shape<CustomLabwareState>,
-|}
+interface ReducerSpec {
+  name: string
+  state: Partial<CustomLabwareState>
+  action: Action
+  expected: Partial<CustomLabwareState>
+}
 
 describe('customLabwareReducer', () => {
-  const SPECS: Array<ReducerSpec> = [
+  const SPECS: ReducerSpec[] = [
     {
       name: 'handles CUSTOM_LABWARE_LIST with new files',
       state: INITIAL_STATE,
@@ -121,7 +120,7 @@ describe('customLabwareReducer', () => {
     const { name, state, action, expected } = spec
 
     it(name, () => {
-      const result = customLabwareReducer(state, action)
+      const result = customLabwareReducer(state as CustomLabwareState, action)
       expect(result).toEqual(expected)
       // check for new reference
       expect(result).not.toBe(state)
diff --git a/app/src/redux/custom-labware/__tests__/selectors.test.ts b/app/src/redux/custom-labware/__tests__/selectors.test.ts
index 06b2c00abe1..36aa91b4d00 100644
--- a/app/src/redux/custom-labware/__tests__/selectors.test.ts
+++ b/app/src/redux/custom-labware/__tests__/selectors.test.ts
@@ -1,20 +1,18 @@
-// @flow
-
 import * as Fixtures from '../__fixtures__'
 import * as selectors from '../selectors'
 
 import type { State } from '../../types'
 import type { ValidLabwareFile } from '../types'
 
-type SelectorSpec = {|
-  name: string,
-  selector: State => mixed,
-  state: $Shape<State>,
-  expected: mixed,
-|}
+interface SelectorSpec {
+  name: string
+  selector: (state: State) => unknown
+  state: State
+  expected: unknown
+}
 
 describe('custom labware selectors', () => {
-  const SPECS: Array<SelectorSpec> = [
+  const SPECS: SelectorSpec[] = [
     {
       name: 'getCustomLabware',
       selector: selectors.getCustomLabware,
@@ -32,7 +30,7 @@ describe('custom labware selectors', () => {
             [Fixtures.mockInvalidLabware.filename]: Fixtures.mockInvalidLabware,
           },
         },
-      },
+      } as State,
       expected: [Fixtures.mockValidLabware, Fixtures.mockInvalidLabware],
     },
     {
@@ -45,36 +43,36 @@ describe('custom labware selectors', () => {
           listFailureMessage: null,
           filenames: ['4.json', '2.json', '1.json', '3.json'],
           filesByName: {
-            '4.json': ({}: any),
-            '2.json': ({
+            '4.json': {},
+            '2.json': {
               definition: {
                 metadata: { displayCategory: 'A', displayName: 'B' },
               },
-            }: any),
-            '1.json': ({
+            },
+            '1.json': {
               definition: {
                 metadata: { displayCategory: 'A', displayName: 'A' },
               },
-            }: any),
-            '3.json': ({
+            },
+            '3.json': {
               definition: {
                 metadata: { displayCategory: 'B', displayName: 'A' },
               },
-            }: any),
+            },
           },
         },
-      },
+      } as any,
       expected: [
-        ({
+        {
           definition: { metadata: { displayCategory: 'A', displayName: 'A' } },
-        }: any),
-        ({
+        },
+        {
           definition: { metadata: { displayCategory: 'A', displayName: 'B' } },
-        }: any),
-        ({
+        },
+        {
           definition: { metadata: { displayCategory: 'B', displayName: 'A' } },
-        }: any),
-        ({}: any),
+        },
+        {},
       ],
     },
 
@@ -94,13 +92,13 @@ describe('custom labware selectors', () => {
           filesByName: {
             [Fixtures.mockValidLabware.filename]: Fixtures.mockValidLabware,
             [Fixtures.mockInvalidLabware.filename]: Fixtures.mockInvalidLabware,
-            'foo.json': ({
+            'foo.json': {
               ...Fixtures.mockValidLabware,
               filename: 'foo.json',
-            }: ValidLabwareFile),
+            } as ValidLabwareFile,
           },
         },
-      },
+      } as any,
       expected: [
         Fixtures.mockValidLabware,
         { ...Fixtures.mockValidLabware, filename: 'foo.json' },
@@ -117,7 +115,7 @@ describe('custom labware selectors', () => {
           filenames: [],
           filesByName: {},
         },
-      },
+      } as any,
       expected: { file: Fixtures.mockInvalidLabware, errorMessage: 'AH' },
     },
     {
@@ -131,19 +129,19 @@ describe('custom labware selectors', () => {
           filenames: [],
           filesByName: {},
         },
-      },
+      } as any,
       expected: 'AH',
     },
     {
       name: 'getCustomLabwareDirectory',
       selector: selectors.getCustomLabwareDirectory,
       state: {
-        config: ({
+        config: {
           labware: {
             directory: '/path/to/labware',
           },
-        }: any),
-      },
+        },
+      } as any,
       expected: '/path/to/labware',
     },
   ]
diff --git a/app/src/redux/custom-labware/actions.ts b/app/src/redux/custom-labware/actions.ts
index d73185d4da1..86dec27eb7c 100644
--- a/app/src/redux/custom-labware/actions.ts
+++ b/app/src/redux/custom-labware/actions.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import { resetConfigValue } from '../config'
 import * as Types from './types'
 
@@ -51,7 +49,7 @@ export const fetchCustomLabware = (): Types.FetchCustomLabwareAction => ({
 })
 
 export const customLabwareList = (
-  payload: Array<Types.CheckedLabwareFile>,
+  payload: Types.CheckedLabwareFile[],
   source: Types.CustomLabwareListActionSource = POLL
 ): Types.CustomLabwareListAction => ({
   type: CUSTOM_LABWARE_LIST,
diff --git a/app/src/redux/custom-labware/index.ts b/app/src/redux/custom-labware/index.ts
index f48e0eff58a..460b7b0c970 100644
--- a/app/src/redux/custom-labware/index.ts
+++ b/app/src/redux/custom-labware/index.ts
@@ -1,4 +1,2 @@
-// @flow
-
 export * from './actions'
 export * from './selectors'
diff --git a/app/src/redux/custom-labware/reducer.ts b/app/src/redux/custom-labware/reducer.ts
index df5caaed5eb..5b90578a86e 100644
--- a/app/src/redux/custom-labware/reducer.ts
+++ b/app/src/redux/custom-labware/reducer.ts
@@ -1,10 +1,10 @@
-// @flow
 // custom labware reducer
 import keyBy from 'lodash/keyBy'
 import * as Actions from './actions'
 
 import type { Action } from '../types'
 import type { CustomLabwareState } from './types'
+import { Reducer } from 'redux'
 
 export const INITIAL_STATE: CustomLabwareState = {
   filenames: [],
@@ -14,10 +14,10 @@ export const INITIAL_STATE: CustomLabwareState = {
   listFailureMessage: null,
 }
 
-export function customLabwareReducer(
-  state: CustomLabwareState = INITIAL_STATE,
-  action: Action
-): CustomLabwareState {
+export const customLabwareReducer: Reducer<CustomLabwareState, Action> = (
+  state = INITIAL_STATE,
+  action
+) => {
   switch (action.type) {
     case Actions.CUSTOM_LABWARE_LIST: {
       return {
diff --git a/app/src/redux/custom-labware/selectors.ts b/app/src/redux/custom-labware/selectors.ts
index ddaceaecb75..01b2829f42e 100644
--- a/app/src/redux/custom-labware/selectors.ts
+++ b/app/src/redux/custom-labware/selectors.ts
@@ -1,4 +1,3 @@
-// @flow
 // custom labware selectors
 import { createSelector } from 'reselect'
 import sortBy from 'lodash/sortBy'
@@ -25,12 +24,17 @@ export const OPENTRONS_LABWARE_FILE: 'OPENTRONS_LABWARE_FILE' =
 
 export const VALID_LABWARE_FILE: 'VALID_LABWARE_FILE' = 'VALID_LABWARE_FILE'
 
-export const getCustomLabwareDirectory: State => string = createSelector(
+export const getCustomLabwareDirectory: (
+  state: State
+) => string = createSelector(
   getConfig,
   config => config?.labware.directory ?? ''
 )
 
-export const getCustomLabware: State => Array<CheckedLabwareFile> = createSelector(
+//  @ts-expect-error(sa, 2021-05-11): TODO filesByName[name] might be undefined because filesByName is typed as a partial type
+export const getCustomLabware: (
+  state: State
+) => CheckedLabwareFile[] = createSelector(
   state => state.labware.filenames,
   state => state.labware.filesByName,
   (filenames, filesByName) =>
@@ -40,16 +44,18 @@ export const getCustomLabware: State => Array<CheckedLabwareFile> = createSelect
     )
 )
 
-// $FlowFixMe: flow unable to do type refinements via filter
-export const getValidCustomLabware: State => Array<ValidLabwareFile> = createSelector(
-  getCustomLabware,
-  labware => labware.filter(f => f.type === VALID_LABWARE_FILE)
+export const getValidCustomLabware: (
+  state: State
+) => ValidLabwareFile[] = createSelector(getCustomLabware, labware =>
+  labware.filter((f): f is ValidLabwareFile => f.type === VALID_LABWARE_FILE)
 )
 
-export const getAddLabwareFailure: State => {|
-  file: FailedLabwareFile | null,
-  errorMessage: string | null,
-|} = createSelector(
+export const getAddLabwareFailure: (
+  state: State
+) => {
+  file: FailedLabwareFile | null
+  errorMessage: string | null
+} = createSelector(
   state => state.labware.addFailureFile,
   state => state.labware.addFailureMessage,
   (file, errorMessage) => ({ file, errorMessage })
@@ -58,14 +64,15 @@ export const getAddLabwareFailure: State => {|
 export const getListLabwareErrorMessage = (state: State): null | string =>
   state.labware.listFailureMessage
 
-export const getCustomLabwareDefinitions: State => Array<LabwareDefinition2> = createSelector(
-  getValidCustomLabware,
-  labware => labware.map(lw => lw.definition)
+export const getCustomLabwareDefinitions: (
+  state: State
+) => LabwareDefinition2[] = createSelector(getValidCustomLabware, labware =>
+  labware.map(lw => lw.definition)
 )
 
 export const getCustomTipRackDefinitions: (
   state: State
-) => Array<LabwareDefinition2> = createSelector(
+) => LabwareDefinition2[] = createSelector(
   getCustomLabwareDefinitions,
   labware => labware.filter(lw => getIsTiprack(lw))
 )
diff --git a/app/src/redux/custom-labware/types.ts b/app/src/redux/custom-labware/types.ts
index 868df0bc52d..8c4269ffe8b 100644
--- a/app/src/redux/custom-labware/types.ts
+++ b/app/src/redux/custom-labware/types.ts
@@ -1,43 +1,35 @@
-// @flow
-
 import type { LabwareDefinition2 } from '@opentrons/shared-data'
 
 // common types
 
-type LabwareFileProps = {|
-  filename: string,
-  modified: number,
-|}
-
-type ValidatedLabwareProps = {|
-  ...LabwareFileProps,
-  definition: LabwareDefinition2,
-|}
-
-export type UncheckedLabwareFile = {|
-  ...LabwareFileProps,
-  data: { [string]: mixed } | null,
-|}
-
-export type InvalidLabwareFile = {|
-  type: 'INVALID_LABWARE_FILE',
-  ...LabwareFileProps,
-|}
-
-export type DuplicateLabwareFile = {|
-  type: 'DUPLICATE_LABWARE_FILE',
-  ...ValidatedLabwareProps,
-|}
-
-export type OpentronsLabwareFile = {|
-  type: 'OPENTRONS_LABWARE_FILE',
-  ...ValidatedLabwareProps,
-|}
-
-export type ValidLabwareFile = {|
-  type: 'VALID_LABWARE_FILE',
-  ...ValidatedLabwareProps,
-|}
+interface LabwareFileProps {
+  filename: string
+  modified: number
+}
+
+interface ValidatedLabwareProps extends LabwareFileProps {
+  definition: LabwareDefinition2
+}
+
+export interface UncheckedLabwareFile extends LabwareFileProps {
+  data: { [key: string]: unknown } | null
+}
+
+export interface InvalidLabwareFile extends LabwareFileProps {
+  type: 'INVALID_LABWARE_FILE'
+}
+
+export interface DuplicateLabwareFile extends ValidatedLabwareProps {
+  type: 'DUPLICATE_LABWARE_FILE'
+}
+
+export interface OpentronsLabwareFile extends ValidatedLabwareProps {
+  type: 'OPENTRONS_LABWARE_FILE'
+}
+
+export interface ValidLabwareFile extends ValidatedLabwareProps {
+  type: 'VALID_LABWARE_FILE'
+}
 
 export type CheckedLabwareFile =
   | InvalidLabwareFile
@@ -52,13 +44,13 @@ export type FailedLabwareFile =
 
 // state types
 
-export type CustomLabwareState = $ReadOnly<{|
-  filenames: Array<string>,
-  filesByName: $Shape<{| [filename: string]: CheckedLabwareFile |}>,
-  addFailureFile: FailedLabwareFile | null,
-  addFailureMessage: string | null,
-  listFailureMessage: string | null,
-|}>
+export interface CustomLabwareState {
+  readonly filenames: string[]
+  readonly filesByName: Partial<{ [filename: string]: CheckedLabwareFile }>
+  readonly addFailureFile: FailedLabwareFile | null
+  readonly addFailureMessage: string | null
+  readonly listFailureMessage: string | null
+}
 
 // action types
 
@@ -69,47 +61,47 @@ export type CustomLabwareListActionSource =
   | 'overwriteLabware'
   | 'changeDirectory'
 
-export type FetchCustomLabwareAction = {|
-  type: 'labware:FETCH_CUSTOM_LABWARE',
-  meta: {| shell: true |},
-|}
-
-export type CustomLabwareListAction = {|
-  type: 'labware:CUSTOM_LABWARE_LIST',
-  payload: Array<CheckedLabwareFile>,
-  meta: {| source: CustomLabwareListActionSource |},
-|}
-
-export type CustomLabwareListFailureAction = {|
-  type: 'labware:CUSTOM_LABWARE_LIST_FAILURE',
-  payload: {| message: string |},
-  meta: {| source: CustomLabwareListActionSource |},
-|}
-
-export type ChangeCustomLabwareDirectoryAction = {|
-  type: 'labware:CHANGE_CUSTOM_LABWARE_DIRECTORY',
-  meta: {| shell: true |},
-|}
-
-export type AddCustomLabwareAction = {|
-  type: 'labware:ADD_CUSTOM_LABWARE',
-  payload: {| overwrite: DuplicateLabwareFile | null |},
-  meta: {| shell: true |},
-|}
-
-export type AddCustomLabwareFailureAction = {|
-  type: 'labware:ADD_CUSTOM_LABWARE_FAILURE',
-  payload: {| labware: FailedLabwareFile | null, message: string | null |},
-|}
-
-export type ClearAddCustomLabwareFailureAction = {|
-  type: 'labware:CLEAR_ADD_CUSTOM_LABWARE_FAILURE',
-|}
-
-export type OpenCustomLabwareDirectoryAction = {|
-  type: 'labware:OPEN_CUSTOM_LABWARE_DIRECTORY',
-  meta: {| shell: true |},
-|}
+export interface FetchCustomLabwareAction {
+  type: 'labware:FETCH_CUSTOM_LABWARE'
+  meta: { shell: true }
+}
+
+export interface CustomLabwareListAction {
+  type: 'labware:CUSTOM_LABWARE_LIST'
+  payload: CheckedLabwareFile[]
+  meta: { source: CustomLabwareListActionSource }
+}
+
+export interface CustomLabwareListFailureAction {
+  type: 'labware:CUSTOM_LABWARE_LIST_FAILURE'
+  payload: { message: string }
+  meta: { source: CustomLabwareListActionSource }
+}
+
+export interface ChangeCustomLabwareDirectoryAction {
+  type: 'labware:CHANGE_CUSTOM_LABWARE_DIRECTORY'
+  meta: { shell: true }
+}
+
+export interface AddCustomLabwareAction {
+  type: 'labware:ADD_CUSTOM_LABWARE'
+  payload: { overwrite: DuplicateLabwareFile | null }
+  meta: { shell: true }
+}
+
+export interface AddCustomLabwareFailureAction {
+  type: 'labware:ADD_CUSTOM_LABWARE_FAILURE'
+  payload: { labware: FailedLabwareFile | null; message: string | null }
+}
+
+export interface ClearAddCustomLabwareFailureAction {
+  type: 'labware:CLEAR_ADD_CUSTOM_LABWARE_FAILURE'
+}
+
+export interface OpenCustomLabwareDirectoryAction {
+  type: 'labware:OPEN_CUSTOM_LABWARE_DIRECTORY'
+  meta: { shell: true }
+}
 
 export type CustomLabwareAction =
   | FetchCustomLabwareAction
diff --git a/app/src/redux/discovery/__fixtures__/index.ts b/app/src/redux/discovery/__fixtures__/index.ts
index 15261f28b2b..44fdfebe9a1 100644
--- a/app/src/redux/discovery/__fixtures__/index.ts
+++ b/app/src/redux/discovery/__fixtures__/index.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import {
   CONNECTABLE,
   REACHABLE,
@@ -14,8 +12,8 @@ export const mockHealthResponse = {
   api_version: '0.0.0-mock',
   fw_version: '0.0.0-mock',
   system_version: '0.0.0-mock',
-  logs: ([]: Array<string>),
-  protocol_api_version: ([2, 0]: [number, number]),
+  logs: [] as string[],
+  protocol_api_version: [2, 0] as [number, number],
 }
 
 export const mockUpdateServerHealthResponse = {
@@ -24,7 +22,7 @@ export const mockUpdateServerHealthResponse = {
   updateServerVersion: '0.0.0-mock',
   smoothieVersion: '0.0.0-mock',
   systemVersion: '0.0.0-mock',
-  capabilities: ({}: { ... }),
+  capabilities: {},
 }
 
 export const mockDiscoveryClientRobot = {
@@ -60,7 +58,7 @@ export const mockConnectableRobot: Robot = {
   ...mockBaseRobot,
   status: CONNECTABLE,
   health: mockHealthResponse,
-  serverHealth: mockUpdateServerHealthResponse,
+  serverHealth: mockUpdateServerHealthResponse as Robot['serverHealth'],
   healthStatus: HEALTH_STATUS_OK,
   serverHealthStatus: HEALTH_STATUS_OK,
   ip: '127.0.0.1',
@@ -77,7 +75,7 @@ export const mockReachableRobot: ReachableRobot = {
   ...mockBaseRobot,
   status: REACHABLE,
   health: mockHealthResponse,
-  serverHealth: mockUpdateServerHealthResponse,
+  serverHealth: mockUpdateServerHealthResponse as Robot['serverHealth'],
   healthStatus: HEALTH_STATUS_NOT_OK,
   serverHealthStatus: HEALTH_STATUS_OK,
   ip: '127.0.0.1',
diff --git a/app/src/redux/discovery/__tests__/actions.test.ts b/app/src/redux/discovery/__tests__/actions.test.ts
index 181257e9fa4..7d4ff4eeca8 100644
--- a/app/src/redux/discovery/__tests__/actions.test.ts
+++ b/app/src/redux/discovery/__tests__/actions.test.ts
@@ -1,8 +1,14 @@
 // discovery actions test
 import * as actions from '../actions'
+import type { Action } from '../../types'
 
 describe('discovery actions', () => {
-  const SPECS = [
+  const SPECS: Array<{
+    name: string
+    creator: (...args: any[]) => Action
+    args: any[]
+    expected: unknown
+  }> = [
     {
       name: 'startDiscovery',
       creator: actions.startDiscovery,
diff --git a/app/src/redux/discovery/__tests__/epic.test.ts b/app/src/redux/discovery/__tests__/epic.test.ts
index 75b2d55f3b2..26a307a7d89 100644
--- a/app/src/redux/discovery/__tests__/epic.test.ts
+++ b/app/src/redux/discovery/__tests__/epic.test.ts
@@ -4,8 +4,10 @@ import * as Shell from '../../shell'
 import * as Actions from '../actions'
 import { discoveryEpic } from '../epic'
 
+import type { Action, State } from '../../types'
+
 describe('discovery actions', () => {
-  let testScheduler
+  let testScheduler: TestScheduler
 
   beforeEach(() => {
     testScheduler = new TestScheduler((actual, expected) => {
@@ -15,8 +17,9 @@ describe('discovery actions', () => {
 
   it('startDiscoveryEpic with default timeout', () => {
     testScheduler.run(({ hot, expectObservable }) => {
-      const action$ = hot('-a', { a: Actions.startDiscovery() })
-      const output$ = discoveryEpic(action$)
+      const action$ = hot<Action>('-a', { a: Actions.startDiscovery() })
+      const state$ = hot<State>('s-', {})
+      const output$ = discoveryEpic(action$, state$)
 
       expectObservable(output$).toBe('- 30000ms a ', {
         a: Actions.finishDiscovery(),
@@ -26,8 +29,9 @@ describe('discovery actions', () => {
 
   it('startDiscoveryEpic with specified timeout', () => {
     testScheduler.run(({ hot, expectObservable }) => {
-      const action$ = hot('-a', { a: Actions.startDiscovery(42) })
-      const output$ = discoveryEpic(action$)
+      const action$ = hot<Action>('-a', { a: Actions.startDiscovery(42) })
+      const state$ = hot<State>('s-', {})
+      const output$ = discoveryEpic(action$, state$)
 
       expectObservable(output$).toBe('- 42ms a ', {
         a: Actions.finishDiscovery(),
@@ -37,8 +41,9 @@ describe('discovery actions', () => {
 
   it('startDiscoveryEpic with shell:UI_INITIALIZED', () => {
     testScheduler.run(({ hot, expectObservable }) => {
-      const action$ = hot('-a', { a: Shell.uiInitialized() })
-      const output$ = discoveryEpic(action$)
+      const action$ = hot<Action>('-a', { a: Shell.uiInitialized() })
+      const state$ = hot<State>('s-', {})
+      const output$ = discoveryEpic(action$, state$)
 
       expectObservable(output$).toBe('- 30000ms a ', {
         a: Actions.finishDiscovery(),
@@ -53,8 +58,9 @@ describe('discovery actions', () => {
         payload: { path: 'restart' },
       }
 
-      const action$ = hot('-a', { a: serverSuccessAction })
-      const output$ = discoveryEpic(action$)
+      const action$ = hot<Action>('-a', { a: serverSuccessAction } as any)
+      const state$ = hot<State>('s-', {})
+      const output$ = discoveryEpic(action$, state$)
 
       expectObservable(output$).toBe('-a ', {
         a: Actions.startDiscovery(60000),
diff --git a/app/src/redux/discovery/__tests__/reducer.test.ts b/app/src/redux/discovery/__tests__/reducer.test.ts
index 09d27739654..27571a52e5e 100644
--- a/app/src/redux/discovery/__tests__/reducer.test.ts
+++ b/app/src/redux/discovery/__tests__/reducer.test.ts
@@ -1,15 +1,23 @@
 // discovery reducer test
 import { discoveryReducer } from '../reducer'
 
+import type { Action } from '../../types'
+import type { DiscoveryState } from '../types'
+
 describe('discoveryReducer', () => {
   afterEach(() => {
     jest.clearAllMocks()
   })
 
-  const SPECS = [
+  const SPECS: Array<{
+    name: string
+    action: Action
+    initialState: DiscoveryState
+    expectedState: DiscoveryState
+  }> = [
     {
       name: 'empty dict for robotsByName and sets scanning to false',
-      action: {},
+      action: {} as any,
       initialState: undefined,
       expectedState: {
         scanning: false,
@@ -18,9 +26,9 @@ describe('discoveryReducer', () => {
     },
     {
       name: 'discovery:START sets scanning: true',
-      action: { type: 'discovery:START' },
-      initialState: { scanning: false },
-      expectedState: { scanning: true },
+      action: { type: 'discovery:START' } as any,
+      initialState: { scanning: false } as any,
+      expectedState: { scanning: true } as any,
     },
     {
       name: 'shell:UI_INITIALIZED sets scanning: true',
diff --git a/app/src/redux/discovery/__tests__/selectors.test.ts b/app/src/redux/discovery/__tests__/selectors.test.ts
index 443cd5970db..655c1246bf5 100644
--- a/app/src/redux/discovery/__tests__/selectors.test.ts
+++ b/app/src/redux/discovery/__tests__/selectors.test.ts
@@ -17,7 +17,9 @@ import {
 
 import * as discovery from '../selectors'
 
-const MOCK_STATE = {
+import type { State } from '../../types'
+
+const MOCK_STATE: State = {
   robot: { connection: { connectedTo: 'bar' } },
   discovery: {
     robotsByName: {
@@ -109,7 +111,7 @@ const MOCK_STATE = {
       },
     },
   },
-}
+} as any
 
 // foo is connectable because health is defined and healthStatus of primary
 // address is "ok"
@@ -213,7 +215,13 @@ const EXPECTED_BUZZ = {
 }
 
 describe('discovery selectors', () => {
-  const SPECS = [
+  const SPECS: Array<{
+    name: string
+    selector: (...args: any[]) => any
+    args?: any[]
+    state: any
+    expected: unknown
+  }> = [
     {
       name: 'getScanning when true',
       selector: discovery.getScanning,
@@ -485,6 +493,6 @@ describe('discovery selectors', () => {
 
   SPECS.forEach(spec => {
     const { name, selector, state, args = [], expected } = spec
-    it(name, () => expect(selector(state, ...args)).toEqual(expected))
+    it(name, () => expect(selector(state as State, ...args)).toEqual(expected))
   })
 })
diff --git a/app/src/redux/discovery/actions.ts b/app/src/redux/discovery/actions.ts
index 83e61e5f8b2..aa476faafae 100644
--- a/app/src/redux/discovery/actions.ts
+++ b/app/src/redux/discovery/actions.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import type {
   StartDiscoveryAction,
   FinishDiscoveryAction,
diff --git a/app/src/redux/discovery/constants.ts b/app/src/redux/discovery/constants.ts
index 4dc9000dc81..38f52747594 100644
--- a/app/src/redux/discovery/constants.ts
+++ b/app/src/redux/discovery/constants.ts
@@ -1,5 +1,3 @@
-// @flow
-
 export const CONNECTABLE: 'connectable' = 'connectable'
 export const REACHABLE: 'reachable' = 'reachable'
 export const UNREACHABLE: 'unreachable' = 'unreachable'
diff --git a/app/src/redux/discovery/epic.ts b/app/src/redux/discovery/epic.ts
index 28868cd22a0..d9e05e201f9 100644
--- a/app/src/redux/discovery/epic.ts
+++ b/app/src/redux/discovery/epic.ts
@@ -1,4 +1,3 @@
-// @flow
 import { of } from 'rxjs'
 import { filter, switchMap, delay } from 'rxjs/operators'
 import { ofType, combineEpics } from 'redux-observable'
@@ -6,7 +5,8 @@ import { ofType, combineEpics } from 'redux-observable'
 import { UI_INITIALIZED } from '../shell'
 import { DISCOVERY_START, startDiscovery, finishDiscovery } from './actions'
 
-import type { Epic } from '../types'
+import type { Observable } from 'rxjs'
+import type { Action, Epic } from '../types'
 import type { UiInitializedAction } from '../shell/types'
 import type { DiscoveryAction, StartDiscoveryAction } from './types'
 
@@ -15,32 +15,39 @@ export const RESTART_DISCOVERY_TIMEOUT_MS = 60000
 
 export const startDiscoveryEpic: Epic = action$ =>
   action$.pipe(
-    ofType(DISCOVERY_START, UI_INITIALIZED),
-    switchMap<StartDiscoveryAction | UiInitializedAction, _, DiscoveryAction>(
-      startAction => {
-        const timeout = startAction.payload
-          ? startAction.payload.timeout ?? DISCOVERY_TIMEOUT_MS
-          : DISCOVERY_TIMEOUT_MS
+    ofType<Action, StartDiscoveryAction | UiInitializedAction>(
+      DISCOVERY_START,
+      UI_INITIALIZED
+    ),
+    switchMap<
+      StartDiscoveryAction | UiInitializedAction,
+      Observable<DiscoveryAction>
+    >(startAction => {
+      // @ts-expect-error TODO: use in operator to protect against accessing timeout when it doesn't exist
+      const timeout = startAction.payload
+        ? // @ts-expect-error TODO: use in operator to protect against accessing timeout when it doesn't exist
+          startAction.payload.timeout ?? DISCOVERY_TIMEOUT_MS
+        : DISCOVERY_TIMEOUT_MS
 
-        return of(finishDiscovery()).pipe(delay(timeout))
-      }
-    )
+      return of(finishDiscovery()).pipe(delay(timeout))
+    })
   )
 
+// TODO(bc, 2021-05-17): nuke this epic, it is now dead code, functionality is covered by resartEpic in robot-admin
 // TODO(mc, 2019-08-01): handle restart requests using robot-api actions
 export const startDiscoveryOnRestartEpic: Epic = action$ =>
   action$.pipe(
     filter(
       action =>
+        // @ts-expect-error TODO: remove this whole epic, it is dead code
         action.type === 'api:SERVER_SUCCESS' &&
+        // @ts-expect-error TODO: remove this whole epic, it is dead code
         action.payload.path === 'restart'
     ),
-    switchMap<_, _, DiscoveryAction>(() =>
-      of(startDiscovery(RESTART_DISCOVERY_TIMEOUT_MS))
-    )
+    switchMap(() => of(startDiscovery(RESTART_DISCOVERY_TIMEOUT_MS)))
   )
 
-export const discoveryEpic: Epic = combineEpics(
+export const discoveryEpic: Epic = combineEpics<Epic>(
   startDiscoveryEpic,
   startDiscoveryOnRestartEpic
 )
diff --git a/app/src/redux/discovery/index.ts b/app/src/redux/discovery/index.ts
index f0538522f5b..497c8935180 100644
--- a/app/src/redux/discovery/index.ts
+++ b/app/src/redux/discovery/index.ts
@@ -1,4 +1,3 @@
-// @flow
 export * from './actions'
 export * from './constants'
 export * from './selectors'
diff --git a/app/src/redux/discovery/reducer.ts b/app/src/redux/discovery/reducer.ts
index 15ea00027fb..e6ce2faa78a 100644
--- a/app/src/redux/discovery/reducer.ts
+++ b/app/src/redux/discovery/reducer.ts
@@ -1,4 +1,3 @@
-// @flow
 // robot discovery state
 import keyBy from 'lodash/keyBy'
 import { UI_INITIALIZED } from '../shell'
@@ -6,16 +5,17 @@ import * as actions from './actions'
 
 import type { Action } from '../types'
 import type { DiscoveryState } from './types'
+import { Reducer } from 'redux'
 
 export const INITIAL_STATE: DiscoveryState = {
   scanning: false,
   robotsByName: {},
 }
 
-export function discoveryReducer(
-  state: DiscoveryState = INITIAL_STATE,
-  action: Action
-): DiscoveryState {
+export const discoveryReducer: Reducer<DiscoveryState, Action> = (
+  state = INITIAL_STATE,
+  action
+) => {
   switch (action.type) {
     case UI_INITIALIZED:
     case actions.DISCOVERY_START:
diff --git a/app/src/redux/discovery/selectors.ts b/app/src/redux/discovery/selectors.ts
index 355a1cd1ebc..2dbe501b4d9 100644
--- a/app/src/redux/discovery/selectors.ts
+++ b/app/src/redux/discovery/selectors.ts
@@ -1,4 +1,3 @@
-// @flow
 import isIp from 'is-ip'
 import concat from 'lodash/concat'
 import find from 'lodash/find'
@@ -23,7 +22,7 @@ import {
 import { getConnectedRobotName } from '../robot/selectors'
 
 import type { State } from '../types'
-import type {
+import {
   DiscoveredRobot,
   Robot,
   ReachableRobot,
@@ -31,16 +30,16 @@ import type {
   ViewableRobot,
 } from './types'
 
-type GetConnectableRobots = State => Array<Robot>
-type GetReachableRobots = State => Array<ReachableRobot>
-type GetUnreachableRobots = State => Array<UnreachableRobot>
-type GetAllRobots = State => Array<DiscoveredRobot>
-type GetViewableRobots = State => Array<ViewableRobot>
-type GetConnectedRobot = State => Robot | null
+type GetConnectableRobots = (state: State) => Robot[]
+type GetReachableRobots = (state: State) => ReachableRobot[]
+type GetUnreachableRobots = (state: State) => UnreachableRobot[]
+type GetAllRobots = (state: State) => DiscoveredRobot[]
+type GetViewableRobots = (state: State) => ViewableRobot[]
+type GetConnectedRobot = (state: State) => Robot | null
 
 const makeDisplayName = (name: string): string => name.replace('opentrons-', '')
 
-const isLocal = (ip: string) => {
+const isLocal = (ip: string): boolean => {
   return (
     RE_HOSTNAME_IPV6_LL.test(ip) ||
     RE_HOSTNAME_IPV4_LL.test(ip) ||
@@ -49,13 +48,15 @@ const isLocal = (ip: string) => {
   )
 }
 
-const ipToHostname = (ip: string) => (isIp.v6(ip) ? `[${ip}]` : ip)
+const ipToHostname = (ip: string): string => (isIp.v6(ip) ? `[${ip}]` : ip)
 
 export function getScanning(state: State): boolean {
   return state.discovery.scanning
 }
 
-export const getDiscoveredRobots: State => Array<DiscoveredRobot> = createSelector(
+export const getDiscoveredRobots: (
+  state: State
+) => DiscoveredRobot[] = createSelector(
   state => state.discovery.robotsByName,
   getConnectedRobotName,
   (robotsMap, connectedRobotName) => {
@@ -132,13 +133,14 @@ export const getAllRobots: GetAllRobots = createSelector(
   getConnectableRobots,
   getReachableRobots,
   getUnreachableRobots,
-  concat
+  (cr: DiscoveredRobot[], rr: DiscoveredRobot[], ur: DiscoveredRobot[]) =>
+    concat<DiscoveredRobot>(cr, rr, ur)
 )
 
 export const getViewableRobots: GetViewableRobots = createSelector(
   getConnectableRobots,
   getReachableRobots,
-  concat
+  (cr: ViewableRobot[], rr: ViewableRobot[]) => concat<ViewableRobot>(cr, rr)
 )
 
 export const getConnectedRobot: GetConnectedRobot = createSelector(
@@ -167,7 +169,7 @@ export const getRobotFirmwareVersion = (
 
 export const getRobotProtocolApiVersion = (
   robot: DiscoveredRobot
-): {| min: string, max: string |} | null => {
+): { min: string; max: string } | null => {
   const healthField = robot.health
   const DEFAULT_API_VERSION = '1.0'
   if (!healthField) {
diff --git a/app/src/redux/discovery/types.ts b/app/src/redux/discovery/types.ts
index be5ef1b110d..8cd8201ceb0 100644
--- a/app/src/redux/discovery/types.ts
+++ b/app/src/redux/discovery/types.ts
@@ -1,12 +1,10 @@
-// @flow
-
 import type {
   DiscoveryClientRobot,
   HealthResponse,
   HealthStatus,
 } from '@opentrons/discovery-client'
 
-import typeof {
+import {
   HEALTH_STATUS_OK,
   CONNECTABLE,
   REACHABLE,
@@ -15,84 +13,83 @@ import typeof {
 
 export type { DiscoveryClientRobot, HealthStatus }
 
-export type RobotsMap = $Shape<{| [name: string]: DiscoveryClientRobot |}>
+export type RobotsMap = Record<string, DiscoveryClientRobot>
 
-export type ConnectivityStatus = CONNECTABLE | REACHABLE | UNREACHABLE
+export type ConnectivityStatus =
+  | typeof CONNECTABLE
+  | typeof REACHABLE
+  | typeof UNREACHABLE
 
-export type DiscoveryState = {|
-  scanning: boolean,
-  robotsByName: RobotsMap,
-|}
+export interface DiscoveryState {
+  scanning: boolean
+  robotsByName: RobotsMap
+}
 
-export type BaseRobot = {|
-  ...$Rest<DiscoveryClientRobot, {| addresses: mixed |}>,
-  displayName: string,
-  connected: boolean,
-  local: boolean | null,
-  seen: boolean,
-|}
+export interface BaseRobot extends Omit<DiscoveryClientRobot, 'addresses'> {
+  displayName: string
+  connected: boolean
+  local: boolean | null
+  seen: boolean
+}
 
 // fully connectable robot
-export type Robot = {|
-  ...BaseRobot,
-  status: CONNECTABLE,
-  health: HealthResponse,
-  ip: string,
-  port: number,
-  healthStatus: HEALTH_STATUS_OK,
-  serverHealthStatus: HealthStatus,
-|}
+export interface Robot extends BaseRobot {
+  status: typeof CONNECTABLE
+  health: HealthResponse
+  ip: string
+  port: number
+  healthStatus: typeof HEALTH_STATUS_OK
+  serverHealthStatus: HealthStatus
+}
 
 // robot with a seen, but not connectable IP
-export type ReachableRobot = {|
-  ...BaseRobot,
-  status: REACHABLE,
-  ip: string,
-  port: number,
-  healthStatus: HealthStatus,
-  serverHealthStatus: HealthStatus,
-|}
+export interface ReachableRobot extends BaseRobot {
+  status: typeof REACHABLE
+  ip: string
+  port: number
+  healthStatus: HealthStatus
+  serverHealthStatus: HealthStatus
+}
 
 // robot with no reachable IP
-export type UnreachableRobot = {|
-  ...BaseRobot,
-  status: UNREACHABLE,
-  ip: string | null,
-  port: number | null,
-  healthStatus: HealthStatus | null,
-  serverHealthStatus: HealthStatus | null,
-|}
+export interface UnreachableRobot extends BaseRobot {
+  status: typeof UNREACHABLE
+  ip: string | null
+  port: number | null
+  healthStatus: HealthStatus | null
+  serverHealthStatus: HealthStatus | null
+}
 
 export type ViewableRobot = Robot | ReachableRobot
 
 export type DiscoveredRobot = Robot | ReachableRobot | UnreachableRobot
 
-export type StartDiscoveryAction = {|
-  type: 'discovery:START',
-  payload: {| timeout: number | null |},
-  meta: {| shell: true |},
-|}
-
-export type FinishDiscoveryAction = {|
-  type: 'discovery:FINISH',
-  meta: {| shell: true |},
-|}
-
-export type UpdateListAction = {|
-  type: 'discovery:UPDATE_LIST',
-  payload: {| robots: Array<DiscoveryClientRobot> |},
-|}
-
-export type RemoveRobotAction = {|
-  type: 'discovery:REMOVE',
-  payload: {| robotName: string |},
-  meta: {| shell: true |},
-|}
-
-export type ClearDiscoveryCacheAction = {|
-  type: 'discovery:CLEAR_CACHE',
-  meta: {| shell: true |},
-|}
+export interface StartDiscoveryAction {
+  type: 'discovery:START'
+  payload: { timeout: number | null }
+  meta: { shell: true }
+}
+
+export interface FinishDiscoveryAction {
+  type: 'discovery:FINISH'
+  meta: { shell: true }
+}
+
+export interface UpdateListAction {
+  type: 'discovery:UPDATE_LIST'
+  payload: { robots: DiscoveryClientRobot[] }
+}
+
+export interface RemoveRobotAction {
+  type: 'discovery:REMOVE'
+  payload: { robotName: string }
+  meta: { shell: true }
+}
+
+export interface ClearDiscoveryCacheAction {
+  type: 'discovery:CLEAR_CACHE'
+  meta: { shell: true }
+}
 
 export type DiscoveryAction =
   | StartDiscoveryAction
diff --git a/app/src/redux/epic.ts b/app/src/redux/epic.ts
index f94197589d5..3807807ef2e 100644
--- a/app/src/redux/epic.ts
+++ b/app/src/redux/epic.ts
@@ -1,4 +1,3 @@
-// @flow
 // root application epic
 import { combineEpics } from 'redux-observable'
 
@@ -20,7 +19,7 @@ import { calibrationEpic } from './calibration/epic'
 
 import type { Epic } from './types'
 
-export const rootEpic: Epic = combineEpics(
+export const rootEpic = combineEpics<Epic>(
   analyticsEpic,
   supportEpic,
   discoveryEpic,
diff --git a/app/src/redux/modules/__fixtures__/index.ts b/app/src/redux/modules/__fixtures__/index.ts
index b72047cb785..9f6bfdd577c 100644
--- a/app/src/redux/modules/__fixtures__/index.ts
+++ b/app/src/redux/modules/__fixtures__/index.ts
@@ -1,7 +1,9 @@
-// @flow
-
 import * as Types from '../types'
 import * as ApiTypes from '../api-types'
+import type {
+  RobotApiResponse,
+  RobotApiResponseMeta,
+} from '../../robot-api/types'
 
 export const mockRobot = { name: 'robot', ip: '127.0.0.1', port: 31950 }
 
@@ -233,14 +235,14 @@ export const mockThermocycler: Types.ThermocyclerModule = {
 
 // fetch modules fixtures
 
-export const mockFetchModulesSuccessMeta = {
+export const mockFetchModulesSuccessMeta: RobotApiResponseMeta = {
   method: 'GET',
   path: '/modules',
   ok: true,
   status: 200,
 }
 
-export const mockFetchModulesSuccess = {
+export const mockFetchModulesSuccess: RobotApiResponse = {
   ...mockFetchModulesSuccessMeta,
   host: mockRobot,
   body: {
@@ -252,7 +254,7 @@ export const mockFetchModulesSuccess = {
   },
 }
 
-export const mockLegacyFetchModulesSuccess = {
+export const mockLegacyFetchModulesSuccess: RobotApiResponse = {
   ...mockFetchModulesSuccessMeta,
   host: mockRobot,
   body: {
@@ -270,14 +272,14 @@ export const mockFetchModulesSuccessActionPayloadModules = [
   mockThermocycler,
 ]
 
-export const mockFetchModulesFailureMeta = {
+export const mockFetchModulesFailureMeta: RobotApiResponseMeta = {
   method: 'GET',
   path: '/modules',
   ok: false,
   status: 500,
 }
 
-export const mockFetchModulesFailure = {
+export const mockFetchModulesFailure: RobotApiResponse = {
   ...mockFetchModulesFailureMeta,
   host: mockRobot,
   body: { message: 'AH' },
@@ -285,14 +287,14 @@ export const mockFetchModulesFailure = {
 
 // send module command fixtures
 
-export const mockSendModuleCommandSuccessMeta = {
+export const mockSendModuleCommandSuccessMeta: RobotApiResponseMeta = {
   method: 'POST',
   path: '/modules/abc123',
   ok: true,
   status: 200,
 }
 
-export const mockSendModuleCommandSuccess = {
+export const mockSendModuleCommandSuccess: RobotApiResponse = {
   ...mockSendModuleCommandSuccessMeta,
   host: mockRobot,
   body: {
@@ -301,14 +303,14 @@ export const mockSendModuleCommandSuccess = {
   },
 }
 
-export const mockSendModuleCommandFailureMeta = {
+export const mockSendModuleCommandFailureMeta: RobotApiResponseMeta = {
   method: 'POST',
   path: '/modules/abc123',
   ok: false,
   status: 500,
 }
 
-export const mockSendModuleCommandFailure = {
+export const mockSendModuleCommandFailure: RobotApiResponse = {
   ...mockSendModuleCommandFailureMeta,
   host: mockRobot,
   body: { message: 'AH' },
@@ -316,14 +318,14 @@ export const mockSendModuleCommandFailure = {
 
 // update module command fixtures
 
-export const mockUpdateModuleSuccessMeta = {
+export const mockUpdateModuleSuccessMeta: RobotApiResponseMeta = {
   method: 'POST',
   path: '/modules/abc123/update',
   ok: true,
   status: 200,
 }
 
-export const mockUpdateModuleSuccess = {
+export const mockUpdateModuleSuccess: RobotApiResponse = {
   ...mockUpdateModuleSuccessMeta,
   host: mockRobot,
   body: {
@@ -331,14 +333,14 @@ export const mockUpdateModuleSuccess = {
   },
 }
 
-export const mockUpdateModuleFailureMeta = {
+export const mockUpdateModuleFailureMeta: RobotApiResponseMeta = {
   method: 'POST',
   path: '/modules/abc123/update',
   ok: false,
   status: 500,
 }
 
-export const mockUpdateModuleFailure = {
+export const mockUpdateModuleFailure: RobotApiResponse = {
   ...mockUpdateModuleFailureMeta,
   host: mockRobot,
   body: { message: 'BAD NEWS BEARS' },
diff --git a/app/src/redux/modules/__tests__/actions.test.ts b/app/src/redux/modules/__tests__/actions.test.ts
index ab65e058864..b7537eac30f 100644
--- a/app/src/redux/modules/__tests__/actions.test.ts
+++ b/app/src/redux/modules/__tests__/actions.test.ts
@@ -1,19 +1,17 @@
-// @flow
-
 import * as Actions from '../actions'
 import * as Fixtures from '../__fixtures__'
 
 import type { ModulesAction } from '../types'
 
-type ActionSpec = {|
-  name: string,
-  creator: (...Array<any>) => mixed,
-  args: Array<mixed>,
-  expected: ModulesAction,
-|}
+interface ActionSpec {
+  name: string
+  creator: (...args: any[]) => unknown
+  args: unknown[]
+  expected: ModulesAction
+}
 
 describe('robot modules actions', () => {
-  const SPECS: Array<ActionSpec> = [
+  const SPECS: ActionSpec[] = [
     {
       name: 'modules:FETCH_MODULES',
       creator: Actions.fetchModules,
@@ -21,7 +19,7 @@ describe('robot modules actions', () => {
       expected: {
         type: 'modules:FETCH_MODULES',
         payload: { robotName: 'robot-name' },
-        meta: {},
+        meta: {} as any,
       },
     },
     {
@@ -38,7 +36,7 @@ describe('robot modules actions', () => {
           robotName: 'robot-name',
           modules: Fixtures.mockFetchModulesSuccessActionPayloadModules,
         },
-        meta: { requestId: 'abc' },
+        meta: { requestId: 'abc' } as any,
       },
     },
     {
@@ -51,7 +49,7 @@ describe('robot modules actions', () => {
           robotName: 'robot-name',
           error: { message: 'AH' },
         },
-        meta: { requestId: 'abc' },
+        meta: { requestId: 'abc' } as any,
       },
     },
     {
@@ -66,7 +64,7 @@ describe('robot modules actions', () => {
           command: 'set_temperature',
           args: [1, 2, 3],
         },
-        meta: {},
+        meta: {} as any,
       },
     },
     {
@@ -87,7 +85,7 @@ describe('robot modules actions', () => {
           command: 'set_temperature',
           returnValue: Fixtures.mockSendModuleCommandSuccess.body.returnValue,
         },
-        meta: { requestId: 'abc' },
+        meta: { requestId: 'abc' } as any,
       },
     },
     {
@@ -108,7 +106,7 @@ describe('robot modules actions', () => {
           command: 'set_temperature',
           error: { message: 'AH' },
         },
-        meta: { requestId: 'abc' },
+        meta: { requestId: 'abc' } as any,
       },
     },
     {
@@ -121,7 +119,7 @@ describe('robot modules actions', () => {
           robotName: 'robot-name',
           moduleId: 'abc123',
         },
-        meta: {},
+        meta: {} as any,
       },
     },
     {
@@ -135,7 +133,7 @@ describe('robot modules actions', () => {
           moduleId: 'abc123',
           message: 'update complete',
         },
-        meta: { requestId: 'abc' },
+        meta: { requestId: 'abc' } as any,
       },
     },
     {
@@ -149,7 +147,7 @@ describe('robot modules actions', () => {
           moduleId: 'abc123',
           error: { message: 'AH' },
         },
-        meta: { requestId: 'abc' },
+        meta: { requestId: 'abc' } as any,
       },
     },
   ]
diff --git a/app/src/redux/modules/__tests__/hooks.test.tsx b/app/src/redux/modules/__tests__/hooks.test.tsx
index 00a75d9739f..710a5bfce8e 100644
--- a/app/src/redux/modules/__tests__/hooks.test.tsx
+++ b/app/src/redux/modules/__tests__/hooks.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import { Provider } from 'react-redux'
 import { mount } from 'enzyme'
@@ -7,23 +6,21 @@ import configureMockStore from 'redux-mock-store'
 import * as RobotSelectors from '../../robot/selectors'
 import * as Actions from '../actions'
 import { useSendModuleCommand } from '../hooks'
-import type { State } from '../../types'
 
 jest.mock('../../robot/selectors')
 
 const mockStore = configureMockStore([])
 
-const mockGetConnectedRobotName: JestMockFn<
-  [State],
-  $Call<typeof RobotSelectors.getConnectedRobotName, State>
-> = RobotSelectors.getConnectedRobotName
+const mockGetConnectedRobotName = RobotSelectors.getConnectedRobotName as jest.MockedFunction<
+  typeof RobotSelectors.getConnectedRobotName
+>
 
 describe('modules hooks', () => {
   describe('useSendModuleCommand hook', () => {
-    let store
-    let sendModuleCommand
+    let store: any
+    let sendModuleCommand: any
 
-    const TestUseSendModuleCommand = () => {
+    const TestUseSendModuleCommand = (): JSX.Element => {
       const _sendModuleCommand = useSendModuleCommand()
       React.useEffect(() => {
         sendModuleCommand = _sendModuleCommand
diff --git a/app/src/redux/modules/__tests__/reducer.test.ts b/app/src/redux/modules/__tests__/reducer.test.ts
index 1eb3ab8fba4..bfb1ca337fb 100644
--- a/app/src/redux/modules/__tests__/reducer.test.ts
+++ b/app/src/redux/modules/__tests__/reducer.test.ts
@@ -1,18 +1,17 @@
-// @flow
 import * as Fixtures from '../__fixtures__'
 import { modulesReducer } from '../reducer'
 
 import type { Action } from '../../types'
 import type { ModulesState } from '../types'
 
-type ReducerSpec = {|
-  name: string,
-  state: ModulesState,
-  action: Action,
-  expected: ModulesState,
-|}
+interface ReducerSpec {
+  name: string
+  state: ModulesState
+  action: Action
+  expected: ModulesState
+}
 
-const SPECS: Array<ReducerSpec> = [
+const SPECS: ReducerSpec[] = [
   {
     name: 'handles modules:FETCH_MODULES_SUCCESS',
     action: {
@@ -21,7 +20,7 @@ const SPECS: Array<ReducerSpec> = [
         robotName: 'robotName',
         modules: [Fixtures.mockTemperatureModule],
       },
-      meta: {},
+      meta: {} as any,
     },
     state: {
       robotName: {
diff --git a/app/src/redux/modules/__tests__/selectors.test.ts b/app/src/redux/modules/__tests__/selectors.test.ts
index 6ae37378ca5..37c6b3df9f5 100644
--- a/app/src/redux/modules/__tests__/selectors.test.ts
+++ b/app/src/redux/modules/__tests__/selectors.test.ts
@@ -1,4 +1,3 @@
-// @flow
 import noop from 'lodash/noop'
 import * as Fixtures from '../__fixtures__'
 import * as Selectors from '../selectors'
@@ -9,35 +8,29 @@ import type { State } from '../../types'
 
 jest.mock('../../robot/selectors')
 
-const mockGetConnectedRobotName: JestMockFn<
-  [State],
-  $Call<typeof RobotSelectors.getConnectedRobotName, State>
-> = RobotSelectors.getConnectedRobotName
+const mockGetConnectedRobotName = RobotSelectors.getConnectedRobotName as jest.MockedFunction<
+  typeof RobotSelectors.getConnectedRobotName
+>
+const mockGetProtocolModules = RobotSelectors.getModules as jest.MockedFunction<
+  typeof RobotSelectors.getModules
+>
+const mockGetProtocolIsRunning = RobotSelectors.getIsRunning as jest.MockedFunction<
+  typeof RobotSelectors.getIsRunning
+>
+interface SelectorSpec {
+  name: string
+  selector: (state: State, ...args: any[]) => unknown
+  state: State
+  args?: any[]
+  before?: () => unknown
+  expected: unknown
+}
 
-const mockGetProtocolModules: JestMockFn<
-  [State],
-  $Call<typeof RobotSelectors.getModules, State>
-> = RobotSelectors.getModules
-
-const mockGetProtocolIsRunning: JestMockFn<
-  [State],
-  $Call<typeof RobotSelectors.getIsRunning, State>
-> = RobotSelectors.getIsRunning
-
-type SelectorSpec = {|
-  name: string,
-  selector: (State, ...Array<any>) => mixed,
-  state: $Shape<State>,
-  args?: Array<any>,
-  before?: () => mixed,
-  expected: mixed,
-|}
-
-const SPECS: Array<SelectorSpec> = [
+const SPECS: SelectorSpec[] = [
   {
     name: 'getAttachedModules returns no attached modules by default',
     selector: Selectors.getAttachedModules,
-    state: { modules: {} },
+    state: { modules: {} } as any,
     args: ['robotName'],
     expected: [],
   },
@@ -54,7 +47,7 @@ const SPECS: Array<SelectorSpec> = [
           },
         },
       },
-    },
+    } as any,
     args: ['robotName'],
     expected: [
       Fixtures.mockTemperatureModule,
@@ -72,17 +65,17 @@ const SPECS: Array<SelectorSpec> = [
           modulesById: {
             abc123: Fixtures.mockTemperatureModule,
             def456: Fixtures.mockMagneticModule,
-            ghi789: ({
+            ghi789: {
               ...Fixtures.mockThermocycler,
               data: {
                 ...Fixtures.mockThermocycler.data,
                 lid: 'closed',
               },
-            }: Types.ThermocyclerModule),
+            } as Types.ThermocyclerModule,
           },
         },
       },
-    },
+    } as any,
     args: [],
     before: () => {
       mockGetConnectedRobotName.mockReturnValue('robotName')
@@ -116,7 +109,7 @@ const SPECS: Array<SelectorSpec> = [
           },
         },
       },
-    },
+    } as any,
     args: [],
     before: () => {
       mockGetConnectedRobotName.mockReturnValue('robotName')
@@ -158,7 +151,7 @@ const SPECS: Array<SelectorSpec> = [
           },
         },
       },
-    },
+    } as any,
     args: [],
     before: () => {
       mockGetConnectedRobotName.mockReturnValue('robotName')
@@ -195,15 +188,15 @@ const SPECS: Array<SelectorSpec> = [
       modules: {
         robotName: {
           modulesById: {
-            abc123: ({
+            abc123: {
               ...Fixtures.mockMagneticModule,
               serial: 'abc123',
-            }: Types.MagneticModule),
+            } as Types.MagneticModule,
             def456: Fixtures.mockMagneticModule,
           },
         },
       },
-    },
+    } as any,
     args: [],
     before: () => {
       mockGetConnectedRobotName.mockReturnValue('robotName')
@@ -222,7 +215,7 @@ const SPECS: Array<SelectorSpec> = [
   {
     name: 'getModuleControlsDisabled returns connect message if not connected',
     selector: Selectors.getModuleControlsDisabled,
-    state: { modules: {} },
+    state: { modules: {} } as any,
     args: ['someOtherRobotName'],
     before: () => {
       mockGetConnectedRobotName.mockReturnValue('robotName')
@@ -232,7 +225,7 @@ const SPECS: Array<SelectorSpec> = [
   {
     name: 'getModuleControlsDisabled returns running message if running',
     selector: Selectors.getModuleControlsDisabled,
-    state: { modules: {} },
+    state: { modules: {} } as any,
     args: ['robotName'],
     before: () => {
       mockGetConnectedRobotName.mockReturnValue('robotName')
@@ -243,7 +236,7 @@ const SPECS: Array<SelectorSpec> = [
   {
     name: 'getModuleControlsDisabled returns null if can control',
     selector: Selectors.getModuleControlsDisabled,
-    state: { modules: {} },
+    state: { modules: {} } as any,
     args: ['robotName'],
     before: () => {
       mockGetConnectedRobotName.mockReturnValue('robotName')
@@ -255,7 +248,7 @@ const SPECS: Array<SelectorSpec> = [
     name:
       'getModuleControlsDisabled returns connect message if not connected and no robotName passed',
     selector: Selectors.getModuleControlsDisabled,
-    state: { modules: {} },
+    state: { modules: {} } as any,
     args: [],
     before: () => {
       mockGetConnectedRobotName.mockReturnValue(null)
@@ -266,7 +259,7 @@ const SPECS: Array<SelectorSpec> = [
     name:
       'getModuleControlsDisabled returns running message if running and no robotName passed',
     selector: Selectors.getModuleControlsDisabled,
-    state: { modules: {} },
+    state: { modules: {} } as any,
     args: [],
     before: () => {
       mockGetConnectedRobotName.mockReturnValue('robotName')
diff --git a/app/src/redux/modules/actions.ts b/app/src/redux/modules/actions.ts
index dbc7c736230..6d8ad9d1981 100644
--- a/app/src/redux/modules/actions.ts
+++ b/app/src/redux/modules/actions.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import * as Constants from './constants'
 import * as Types from './types'
 
@@ -15,7 +13,7 @@ export const fetchModules = (robotName: string): Types.FetchModulesAction => ({
 
 export const fetchModulesSuccess = (
   robotName: string,
-  modules: Array<Types.AttachedModule>,
+  modules: Types.AttachedModule[],
   meta: RobotApiRequestMeta
 ): Types.FetchModulesSuccessAction => ({
   type: Constants.FETCH_MODULES_SUCCESS,
@@ -39,7 +37,7 @@ export const sendModuleCommand = (
   robotName: string,
   moduleId: string,
   command: Types.ModuleCommand,
-  args: Array<mixed> = []
+  args: unknown[] = []
 ): Types.SendModuleCommandAction => ({
   type: Constants.SEND_MODULE_COMMAND,
   payload: { robotName, moduleId, command, args },
@@ -50,7 +48,7 @@ export const sendModuleCommandSuccess = (
   robotName: string,
   moduleId: string,
   command: Types.ModuleCommand,
-  returnValue: mixed,
+  returnValue: unknown,
   meta: RobotApiRequestMeta
 ): Types.SendModuleCommandSuccessAction => ({
   type: Constants.SEND_MODULE_COMMAND_SUCCESS,
diff --git a/app/src/redux/modules/api-types.ts b/app/src/redux/modules/api-types.ts
index fd41d6ac29f..f73df92745b 100644
--- a/app/src/redux/modules/api-types.ts
+++ b/app/src/redux/modules/api-types.ts
@@ -1,66 +1,63 @@
-// @flow
-
-import {
-  type MagneticModuleModel,
-  type TemperatureModuleModel,
-  type ThermocyclerModuleModel,
-  typeof TEMPDECK,
-  typeof MAGDECK,
-  typeof THERMOCYCLER,
-  type ModuleModel,
+import { TEMPDECK, MAGDECK, THERMOCYCLER } from '@opentrons/shared-data'
+
+import type {
+  MagneticModuleModel,
+  TemperatureModuleModel,
+  ThermocyclerModuleModel,
+  ModuleModel,
 } from '@opentrons/shared-data'
 
-type PhysicalPort = {|
-  hub: number | null,
-  port: number | null,
-|}
-
-export type ApiBaseModule = {|
-  displayName: string,
-  serial: string,
-  revision: string,
-  model: string,
-  moduleModel: ModuleModel,
-  fwVersion: string,
-  port: string,
-  hasAvailableUpdate: boolean,
-  usbPort: PhysicalPort,
-|}
-
-type ApiBaseModuleLegacy = {|
-  displayName: string,
-  serial: string,
-  model: string,
-  fwVersion: string,
-  port: string,
-  hasAvailableUpdate: boolean,
-|}
-
-export type TemperatureData = {|
-  currentTemp: number,
-  targetTemp: number | null,
-|}
-
-export type MagneticData = {|
-  engaged: boolean,
-  height: number,
-|}
-
-export type ThermocyclerData = {|
+interface PhysicalPort {
+  hub: number | null
+  port: number | null
+}
+
+export interface ApiBaseModule {
+  displayName: string
+  serial: string
+  revision: string
+  model: string
+  moduleModel: ModuleModel
+  fwVersion: string
+  port: string
+  hasAvailableUpdate: boolean
+  usbPort: PhysicalPort
+}
+
+interface ApiBaseModuleLegacy {
+  displayName: string
+  serial: string
+  model: string
+  fwVersion: string
+  port: string
+  hasAvailableUpdate: boolean
+}
+
+export interface TemperatureData {
+  currentTemp: number
+  targetTemp: number | null
+}
+
+export interface MagneticData {
+  engaged: boolean
+  height: number
+}
+
+export interface ThermocyclerData {
   // TODO(mc, 2019-12-12): in_between comes from the thermocycler firmware and
   // will be rare in normal operation due to limitations in current revision
-  lid: 'open' | 'closed' | 'in_between',
-  lidTarget: number | null,
-  lidTemp: number | null,
-  currentTemp: number | null,
-  targetTemp: number | null,
-  holdTime: number | null,
-  rampRate: number | null,
-  totalStepCount: number | null,
-  currentStepIndex: number | null,
-  totalCycleCount: number | null,
-  currentCycleIndex: number | null,
-|}
+  lid: 'open' | 'closed' | 'in_between'
+  lidTarget: number | null
+  lidTemp: number | null
+  currentTemp: number | null
+  targetTemp: number | null
+  holdTime: number | null
+  rampRate: number | null
+  totalStepCount: number | null
+  currentStepIndex: number | null
+  totalCycleCount: number | null
+  currentCycleIndex: number | null
+}
 
 export type TemperatureStatus =
   | 'idle'
@@ -77,50 +74,44 @@ export type ThermocyclerStatus =
 
 export type MagneticStatus = 'engaged' | 'disengaged'
 
-export type ApiTemperatureModule = {|
-  ...ApiBaseModule,
-  moduleModel: TemperatureModuleModel,
-  name: TEMPDECK,
-  data: TemperatureData,
-  status: TemperatureStatus,
-|}
-
-export type ApiTemperatureModuleLegacy = {|
-  ...ApiBaseModuleLegacy,
-  name: TEMPDECK,
-  data: TemperatureData,
-  status: TemperatureStatus,
-|}
-
-export type ApiMagneticModule = {|
-  ...ApiBaseModule,
-  moduleModel: MagneticModuleModel,
-  name: MAGDECK,
-  data: MagneticData,
-  status: MagneticStatus,
-|}
-
-export type ApiMagneticModuleLegacy = {|
-  ...ApiBaseModuleLegacy,
-  name: MAGDECK,
-  data: MagneticData,
-  status: MagneticStatus,
-|}
-
-export type ApiThermocyclerModule = {|
-  ...ApiBaseModule,
-  moduleModel: ThermocyclerModuleModel,
-  name: THERMOCYCLER,
-  data: ThermocyclerData,
-  status: ThermocyclerStatus,
-|}
-
-export type ApiThermocyclerModuleLegacy = {|
-  ...ApiBaseModuleLegacy,
-  name: THERMOCYCLER,
-  data: ThermocyclerData,
-  status: ThermocyclerStatus,
-|}
+export interface ApiTemperatureModule extends ApiBaseModule {
+  moduleModel: TemperatureModuleModel
+  name: typeof TEMPDECK
+  data: TemperatureData
+  status: TemperatureStatus
+}
+
+export interface ApiTemperatureModuleLegacy extends ApiBaseModuleLegacy {
+  name: typeof TEMPDECK
+  data: TemperatureData
+  status: TemperatureStatus
+}
+
+export interface ApiMagneticModule extends ApiBaseModule {
+  moduleModel: MagneticModuleModel
+  name: typeof MAGDECK
+  data: MagneticData
+  status: MagneticStatus
+}
+
+export interface ApiMagneticModuleLegacy extends ApiBaseModuleLegacy {
+  name: typeof MAGDECK
+  data: MagneticData
+  status: MagneticStatus
+}
+
+export interface ApiThermocyclerModule extends ApiBaseModule {
+  moduleModel: ThermocyclerModuleModel
+  name: typeof THERMOCYCLER
+  data: ThermocyclerData
+  status: ThermocyclerStatus
+}
+
+export interface ApiThermocyclerModuleLegacy extends ApiBaseModuleLegacy {
+  name: typeof THERMOCYCLER
+  data: ThermocyclerData
+  status: ThermocyclerStatus
+}
 
 export type ApiAttachedModule =
   | ApiThermocyclerModule
diff --git a/app/src/redux/modules/constants.ts b/app/src/redux/modules/constants.ts
index 4c30cddb815..16093f51119 100644
--- a/app/src/redux/modules/constants.ts
+++ b/app/src/redux/modules/constants.ts
@@ -1,9 +1,13 @@
-// @flow
-import { THERMOCYCLER_MODULE_TYPE } from '@opentrons/shared-data'
+import {
+  ModuleRealType,
+  THERMOCYCLER_MODULE_TYPE,
+} from '@opentrons/shared-data'
 
 // common constants
 
-export const PREPARABLE_MODULE_TYPES = [THERMOCYCLER_MODULE_TYPE]
+export const PREPARABLE_MODULE_TYPES: ModuleRealType[] = [
+  THERMOCYCLER_MODULE_TYPE,
+]
 
 export {
   MAGNETIC_MODULE_TYPE,
diff --git a/app/src/redux/modules/epic/__tests__/fetchModulesEpic.test.ts b/app/src/redux/modules/epic/__tests__/fetchModulesEpic.test.ts
index 16231019ead..95200e12b86 100644
--- a/app/src/redux/modules/epic/__tests__/fetchModulesEpic.test.ts
+++ b/app/src/redux/modules/epic/__tests__/fetchModulesEpic.test.ts
@@ -1,4 +1,3 @@
-// @flow
 import { TestScheduler } from 'rxjs/testing'
 
 import * as RobotApiHttp from '../../../robot-api/http'
@@ -9,10 +8,9 @@ import * as Actions from '../../actions'
 import * as Types from '../../types'
 import { modulesEpic } from '../../epic'
 
-import type { Observable } from 'rxjs'
+import type { Action, State } from '../../../types'
 import type {
-  RobotHost,
-  RobotApiRequestOptions,
+  RobotApiRequestMeta,
   RobotApiResponse,
 } from '../../../robot-api/types'
 
@@ -22,25 +20,25 @@ jest.mock('../../../discovery/selectors')
 const mockState = { state: true }
 const { mockRobot } = Fixtures
 
-const mockFetchRobotApi: JestMockFn<
-  [RobotHost, RobotApiRequestOptions],
-  Observable<RobotApiResponse>
-> = RobotApiHttp.fetchRobotApi
+const mockFetchRobotApi = RobotApiHttp.fetchRobotApi as jest.MockedFunction<
+  typeof RobotApiHttp.fetchRobotApi
+>
 
-const mockGetRobotByName: JestMockFn<[any, string], mixed> =
-  DiscoverySelectors.getRobotByName
+const mockGetRobotByName = DiscoverySelectors.getRobotByName as jest.MockedFunction<
+  typeof DiscoverySelectors.getRobotByName
+>
 
 describe('fetchModulesEpic', () => {
-  let testScheduler
+  let testScheduler: TestScheduler
 
-  const meta = { requestId: '1234' }
+  const meta: RobotApiRequestMeta = { requestId: '1234' } as any
   const action: Types.FetchModulesAction = {
     ...Actions.fetchModules(mockRobot.name),
     meta,
   }
 
   beforeEach(() => {
-    mockGetRobotByName.mockReturnValue(mockRobot)
+    mockGetRobotByName.mockReturnValue(mockRobot as any)
 
     testScheduler = new TestScheduler((actual, expected) => {
       expect(actual).toEqual(expected)
@@ -54,11 +52,13 @@ describe('fetchModulesEpic', () => {
   it('calls GET /modules', () => {
     testScheduler.run(({ hot, cold, expectObservable, flush }) => {
       mockFetchRobotApi.mockReturnValue(
-        cold('r', { r: Fixtures.mockFetchModulesSuccess })
+        cold<RobotApiResponse>('r', {
+          r: Fixtures.mockFetchModulesSuccess,
+        } as any)
       )
 
-      const action$ = hot('--a', { a: action })
-      const state$ = hot('a-a', { a: mockState })
+      const action$ = hot<Action>('--a', { a: action })
+      const state$ = hot<State>('a-a', { a: mockState } as any)
       const output$ = modulesEpic(action$, state$)
 
       expectObservable(output$)
@@ -75,11 +75,13 @@ describe('fetchModulesEpic', () => {
   it('maps successful response to FETCH_MODULES_SUCCESS', () => {
     testScheduler.run(({ hot, cold, expectObservable, flush }) => {
       mockFetchRobotApi.mockReturnValue(
-        cold('r', { r: Fixtures.mockFetchModulesSuccess })
+        cold<RobotApiResponse>('r', {
+          r: Fixtures.mockFetchModulesSuccess,
+        } as any)
       )
 
-      const action$ = hot('--a', { a: action })
-      const state$ = hot('a-a', { a: {} })
+      const action$ = hot<Action>('--a', { a: action })
+      const state$ = hot<State>('a-a', { a: {} } as any)
       const output$ = modulesEpic(action$, state$)
 
       expectObservable(output$).toBe('--a', {
@@ -99,11 +101,13 @@ describe('fetchModulesEpic', () => {
   it('maps successful legacy response to FETCH_MODULES_SUCCESS', () => {
     testScheduler.run(({ hot, cold, expectObservable, flush }) => {
       mockFetchRobotApi.mockReturnValue(
-        cold('r', { r: Fixtures.mockLegacyFetchModulesSuccess })
+        cold<RobotApiResponse>('r', {
+          r: Fixtures.mockLegacyFetchModulesSuccess,
+        })
       )
 
-      const action$ = hot('--a', { a: action })
-      const state$ = hot('a-a', { a: {} })
+      const action$ = hot<Action>('--a', { a: action })
+      const state$ = hot<State>('a-a', { a: {} } as any)
       const output$ = modulesEpic(action$, state$)
 
       expectObservable(output$).toBe('--a', {
@@ -132,11 +136,11 @@ describe('fetchModulesEpic', () => {
   it('maps failed response to FETCH_MODULES_FAILURE', () => {
     testScheduler.run(({ hot, cold, expectObservable, flush }) => {
       mockFetchRobotApi.mockReturnValue(
-        cold('r', { r: Fixtures.mockFetchModulesFailure })
+        cold<RobotApiResponse>('r', { r: Fixtures.mockFetchModulesFailure })
       )
 
-      const action$ = hot('--a', { a: action })
-      const state$ = hot('a-a', { a: {} })
+      const action$ = hot<Action>('--a', { a: action })
+      const state$ = hot<State>('a-a', { a: {} } as any)
       const output$ = modulesEpic(action$, state$)
 
       expectObservable(output$).toBe('--a', {
diff --git a/app/src/redux/modules/epic/__tests__/pollModulesWhileConnectedEpic.test.ts b/app/src/redux/modules/epic/__tests__/pollModulesWhileConnectedEpic.test.ts
index 3fbaf91acd6..4f5f3cf5a12 100644
--- a/app/src/redux/modules/epic/__tests__/pollModulesWhileConnectedEpic.test.ts
+++ b/app/src/redux/modules/epic/__tests__/pollModulesWhileConnectedEpic.test.ts
@@ -1,4 +1,3 @@
-// @flow
 import { TestScheduler } from 'rxjs/testing'
 
 import {
@@ -9,20 +8,19 @@ import * as Fixtures from '../../__fixtures__'
 import * as Actions from '../../actions'
 import { modulesEpic } from '../../epic'
 
-import type { State } from '../../../types'
+import type { Action, State } from '../../../types'
 
 jest.mock('../../../robot/selectors')
 
-const mockState = { state: true }
+const mockState: State = { state: true } as any
 const { mockRobot } = Fixtures
 
-const mockGetConnectedRobotName: JestMockFn<
-  [State],
-  $Call<typeof RobotSelectors.getConnectedRobotName, State>
-> = RobotSelectors.getConnectedRobotName
+const mockGetConnectedRobotName = RobotSelectors.getConnectedRobotName as jest.MockedFunction<
+  typeof RobotSelectors.getConnectedRobotName
+>
 
 describe('pollModulesWhileConnectedEpic', () => {
-  let testScheduler
+  let testScheduler: TestScheduler
 
   beforeEach(() => {
     testScheduler = new TestScheduler((actual, expected) => {
@@ -38,8 +36,8 @@ describe('pollModulesWhileConnectedEpic', () => {
     testScheduler.run(({ hot, expectObservable }) => {
       const action = RobotActions.connectResponse({ message: 'AH' })
 
-      const action$ = hot('--a', { a: action })
-      const state$ = hot('--a', { a: mockState })
+      const action$ = hot<Action>('--a', { a: action })
+      const state$ = hot<State>('--a', { a: mockState })
       const output$ = modulesEpic(action$, state$)
 
       expectObservable(output$).toBe('---')
@@ -56,8 +54,8 @@ describe('pollModulesWhileConnectedEpic', () => {
         .mockReturnValueOnce(mockRobot.name)
         .mockReturnValueOnce(null)
 
-      const action$ = hot('a', { a: action })
-      const state$ = hot('a 15s a', { a: mockState })
+      const action$ = hot<Action>('a', { a: action })
+      const state$ = hot<State>('a 15s a', { a: mockState })
       const output$ = modulesEpic(action$, state$)
 
       expectObservable(output$).toBe('5s a 4999ms a 4999ms a', {
diff --git a/app/src/redux/modules/epic/__tests__/sendModuleCommandEpic.test.ts b/app/src/redux/modules/epic/__tests__/sendModuleCommandEpic.test.ts
index fb4904e0f62..24914c9a045 100644
--- a/app/src/redux/modules/epic/__tests__/sendModuleCommandEpic.test.ts
+++ b/app/src/redux/modules/epic/__tests__/sendModuleCommandEpic.test.ts
@@ -1,4 +1,3 @@
-// @flow
 import { TestScheduler } from 'rxjs/testing'
 
 import * as RobotApiHttp from '../../../robot-api/http'
@@ -9,29 +8,24 @@ import * as Actions from '../../actions'
 import * as Types from '../../types'
 import { modulesEpic } from '../../epic'
 
-import type { Observable } from 'rxjs'
-import type {
-  RobotHost,
-  RobotApiRequestOptions,
-  RobotApiResponse,
-} from '../../../robot-api/types'
+import type { Action, State } from '../../../types'
 
 jest.mock('../../../robot-api/http')
 jest.mock('../../../discovery/selectors')
 
-const mockState = { state: true }
+const mockState: State = { state: true } as any
 const { mockRobot } = Fixtures
 
-const mockFetchRobotApi: JestMockFn<
-  [RobotHost, RobotApiRequestOptions],
-  Observable<RobotApiResponse>
-> = RobotApiHttp.fetchRobotApi
+const mockFetchRobotApi = RobotApiHttp.fetchRobotApi as jest.MockedFunction<
+  typeof RobotApiHttp.fetchRobotApi
+>
 
-const mockGetRobotByName: JestMockFn<[any, string], mixed> =
-  DiscoverySelectors.getRobotByName
+const mockGetRobotByName = DiscoverySelectors.getRobotByName as jest.MockedFunction<
+  typeof DiscoverySelectors.getRobotByName
+>
 
 describe('sendModuleCommand', () => {
-  let testScheduler
+  let testScheduler: TestScheduler
 
   const meta = { requestId: '1234' }
   const action: Types.SendModuleCommandAction = {
@@ -42,7 +36,7 @@ describe('sendModuleCommand', () => {
   }
 
   beforeEach(() => {
-    mockGetRobotByName.mockReturnValue(mockRobot)
+    mockGetRobotByName.mockReturnValue(mockRobot as any)
 
     testScheduler = new TestScheduler((actual, expected) => {
       expect(actual).toEqual(expected)
@@ -59,8 +53,8 @@ describe('sendModuleCommand', () => {
         cold('r', { r: Fixtures.mockSendModuleCommandSuccess })
       )
 
-      const action$ = hot('--a', { a: action })
-      const state$ = hot('a-a', { a: mockState })
+      const action$ = hot<Action>('--a', { a: action })
+      const state$ = hot<State>('a-a', { a: mockState })
       const output$ = modulesEpic(action$, state$)
 
       expectObservable(output$)
@@ -84,8 +78,8 @@ describe('sendModuleCommand', () => {
         cold('r', { r: Fixtures.mockSendModuleCommandSuccess })
       )
 
-      const action$ = hot('--a', { a: action })
-      const state$ = hot('a-a', { a: {} })
+      const action$ = hot<Action>('--a', { a: action })
+      const state$ = hot<State>('a-a', { a: {} } as any)
       const output$ = modulesEpic(action$, state$)
 
       expectObservable(output$).toBe('--a', {
@@ -106,8 +100,8 @@ describe('sendModuleCommand', () => {
         cold('r', { r: Fixtures.mockSendModuleCommandFailure })
       )
 
-      const action$ = hot('--a', { a: action })
-      const state$ = hot('a-a', { a: {} })
+      const action$ = hot<Action>('--a', { a: action })
+      const state$ = hot<State>('a-a', { a: {} } as any)
       const output$ = modulesEpic(action$, state$)
 
       expectObservable(output$).toBe('--a', {
diff --git a/app/src/redux/modules/epic/__tests__/updateModuleEpic.test.ts b/app/src/redux/modules/epic/__tests__/updateModuleEpic.test.ts
index fd28cf1a5d7..0972a82babf 100644
--- a/app/src/redux/modules/epic/__tests__/updateModuleEpic.test.ts
+++ b/app/src/redux/modules/epic/__tests__/updateModuleEpic.test.ts
@@ -1,4 +1,3 @@
-// @flow
 import { TestScheduler } from 'rxjs/testing'
 
 import * as RobotApiHttp from '../../../robot-api/http'
@@ -9,29 +8,24 @@ import * as Actions from '../../actions'
 import * as Types from '../../types'
 import { modulesEpic } from '../../epic'
 
-import type { Observable } from 'rxjs'
-import type {
-  RobotHost,
-  RobotApiRequestOptions,
-  RobotApiResponse,
-} from '../../../robot-api/types'
+import type { Action, State } from '../../../types'
 
 jest.mock('../../../robot-api/http')
 jest.mock('../../../discovery/selectors')
 
-const mockState = { state: true }
+const mockState: State = { state: true } as any
 const { mockRobot } = Fixtures
 
-const mockFetchRobotApi: JestMockFn<
-  [RobotHost, RobotApiRequestOptions],
-  Observable<RobotApiResponse>
-> = RobotApiHttp.fetchRobotApi
+const mockFetchRobotApi = RobotApiHttp.fetchRobotApi as jest.MockedFunction<
+  typeof RobotApiHttp.fetchRobotApi
+>
 
-const mockGetRobotByName: JestMockFn<[any, string], mixed> =
-  DiscoverySelectors.getRobotByName
+const mockGetRobotByName = DiscoverySelectors.getRobotByName as jest.MockedFunction<
+  typeof DiscoverySelectors.getRobotByName
+>
 
 describe('updateModuleEpic', () => {
-  let testScheduler
+  let testScheduler: TestScheduler
 
   const meta = { requestId: '1234' }
   const action: Types.UpdateModuleAction = {
@@ -40,7 +34,7 @@ describe('updateModuleEpic', () => {
   }
 
   beforeEach(() => {
-    mockGetRobotByName.mockReturnValue(mockRobot)
+    mockGetRobotByName.mockReturnValue(mockRobot as any)
 
     testScheduler = new TestScheduler((actual, expected) => {
       expect(actual).toEqual(expected)
@@ -57,8 +51,8 @@ describe('updateModuleEpic', () => {
         cold('r', { r: Fixtures.mockUpdateModuleSuccess })
       )
 
-      const action$ = hot('--a', { a: action })
-      const state$ = hot('a-a', { a: mockState })
+      const action$ = hot<Action>('--a', { a: action })
+      const state$ = hot<State>('a-a', { a: mockState })
       const output$ = modulesEpic(action$, state$)
 
       expectObservable(output$)
@@ -78,8 +72,8 @@ describe('updateModuleEpic', () => {
         cold('r', { r: Fixtures.mockUpdateModuleSuccess })
       )
 
-      const action$ = hot('--a', { a: action })
-      const state$ = hot('a-a', { a: {} })
+      const action$ = hot<Action>('--a', { a: action })
+      const state$ = hot<State>('a-a', { a: {} } as any)
       const output$ = modulesEpic(action$, state$)
 
       expectObservable(output$).toBe('--a', {
@@ -99,8 +93,8 @@ describe('updateModuleEpic', () => {
         cold('r', { r: Fixtures.mockUpdateModuleFailure })
       )
 
-      const action$ = hot('--a', { a: action })
-      const state$ = hot('a-a', { a: {} })
+      const action$ = hot<Action>('--a', { a: action })
+      const state$ = hot<State>('a-a', { a: {} } as any)
       const output$ = modulesEpic(action$, state$)
 
       expectObservable(output$).toBe('--a', {
diff --git a/app/src/redux/modules/epic/fetchModulesEpic.ts b/app/src/redux/modules/epic/fetchModulesEpic.ts
index 18d5c7bfc74..8e3d98ec233 100644
--- a/app/src/redux/modules/epic/fetchModulesEpic.ts
+++ b/app/src/redux/modules/epic/fetchModulesEpic.ts
@@ -1,4 +1,3 @@
-// @flow
 import { ofType } from 'redux-observable'
 
 import { GET } from '../../robot-api/constants'
@@ -26,7 +25,7 @@ import type {
 import * as Actions from '../actions'
 import * as Constants from '../constants'
 
-import type { Epic } from '../../types'
+import type { Action, Epic } from '../../types'
 
 import type {
   ActionToRequestMapper,
@@ -51,24 +50,24 @@ const mapActionToRequest: ActionToRequestMapper<FetchModulesAction> = action =>
 })
 
 type IdentifierWithData =
-  | {|
-      type: typeof MAGNETIC_MODULE_TYPE,
-      model: MagneticModuleModel,
-      data: MagneticData,
-      status: MagneticStatus,
-    |}
-  | {|
-      type: typeof TEMPERATURE_MODULE_TYPE,
-      model: TemperatureModuleModel,
-      data: TemperatureData,
-      status: TemperatureStatus,
-    |}
-  | {|
-      type: typeof THERMOCYCLER_MODULE_TYPE,
-      model: ThermocyclerModuleModel,
-      data: ThermocyclerData,
-      status: ThermocyclerStatus,
-    |}
+  | {
+      type: typeof MAGNETIC_MODULE_TYPE
+      model: MagneticModuleModel
+      data: MagneticData
+      status: MagneticStatus
+    }
+  | {
+      type: typeof TEMPERATURE_MODULE_TYPE
+      model: TemperatureModuleModel
+      data: TemperatureData
+      status: TemperatureStatus
+    }
+  | {
+      type: typeof THERMOCYCLER_MODULE_TYPE
+      model: ThermocyclerModuleModel
+      data: ThermocyclerData
+      status: ThermocyclerStatus
+    }
 
 const normalizeModuleInfoLegacy = (
   response: ApiAttachedModuleLegacy
@@ -78,25 +77,25 @@ const normalizeModuleInfoLegacy = (
       return {
         type: MAGNETIC_MODULE_TYPE,
         model: MAGNETIC_MODULE_V1,
-        data: (response.data: MagneticData),
-        status: (response.status: MagneticStatus),
+        data: response.data,
+        status: response.status,
       }
     case TEMPDECK:
       return {
         type: TEMPERATURE_MODULE_TYPE,
         model: TEMPERATURE_MODULE_V1,
-        data: (response.data: TemperatureData),
-        status: (response.status: TemperatureStatus),
+        data: response.data,
+        status: response.status,
       }
     case THERMOCYCLER:
       return {
         type: THERMOCYCLER_MODULE_TYPE,
         model: THERMOCYCLER_MODULE_V1,
-        data: (response.data: ThermocyclerData),
-        status: (response.status: ThermocyclerStatus),
+        data: response.data,
+        status: response.status,
       }
     default:
-      throw new Error(`bad module name ${response.name}`)
+      throw new Error(`bad module name ${(response as any).name}`)
   }
 }
 
@@ -109,33 +108,33 @@ const normalizeModuleInfoNew = (
       return {
         model: response.moduleModel,
         type: MAGNETIC_MODULE_TYPE,
-        data: (response.data: MagneticData),
-        status: (response.status: MagneticStatus),
+        data: response.data,
+        status: response.status,
       }
     case TEMPERATURE_MODULE_V1:
     case TEMPERATURE_MODULE_V2:
       return {
         model: response.moduleModel,
         type: TEMPERATURE_MODULE_TYPE,
-        data: (response.data: TemperatureData),
-        status: (response.status: TemperatureStatus),
+        data: response.data,
+        status: response.status,
       }
     case THERMOCYCLER_MODULE_V1:
       return {
         model: response.moduleModel,
         type: THERMOCYCLER_MODULE_TYPE,
-        data: (response.data: ThermocyclerData),
-        status: (response.status: ThermocyclerStatus),
+        data: response.data,
+        status: response.status,
       }
     default:
-      throw new Error(`bad module model ${response.moduleModel}`)
+      throw new Error(`bad module model ${(response as any).moduleModel}`)
   }
 }
 
 const normalizeModuleInfo = (
   response: ApiAttachedModule | ApiAttachedModuleLegacy
 ): IdentifierWithData => {
-  if (response.moduleModel) {
+  if ('moduleModel' in response) {
     return normalizeModuleInfoNew(response)
   } else {
     return normalizeModuleInfoLegacy(response)
@@ -173,7 +172,7 @@ const mapResponseToAction: ResponseToActionMapper<FetchModulesAction> = (
 
 export const fetchModulesEpic: Epic = (action$, state$) => {
   return action$.pipe(
-    ofType(Constants.FETCH_MODULES),
+    ofType<Action, FetchModulesAction>(Constants.FETCH_MODULES),
     mapToRobotApiRequest(
       state$,
       a => a.payload.robotName,
diff --git a/app/src/redux/modules/epic/index.ts b/app/src/redux/modules/epic/index.ts
index 19617eb14b8..84180025c2b 100644
--- a/app/src/redux/modules/epic/index.ts
+++ b/app/src/redux/modules/epic/index.ts
@@ -1,4 +1,3 @@
-// @flow
 import { combineEpics } from 'redux-observable'
 import { fetchModulesEpic } from './fetchModulesEpic'
 import { sendModuleCommandEpic } from './sendModuleCommandEpic'
@@ -7,7 +6,7 @@ import { pollModulesWhileConnectedEpic } from './pollModulesWhileConnectedEpic'
 
 import type { Epic } from '../../types'
 
-export const modulesEpic: Epic = combineEpics(
+export const modulesEpic: Epic = combineEpics<Epic>(
   fetchModulesEpic,
   sendModuleCommandEpic,
   updateModuleEpic,
diff --git a/app/src/redux/modules/epic/pollModulesWhileConnectedEpic.ts b/app/src/redux/modules/epic/pollModulesWhileConnectedEpic.ts
index 225b26461fe..2059ff2e279 100644
--- a/app/src/redux/modules/epic/pollModulesWhileConnectedEpic.ts
+++ b/app/src/redux/modules/epic/pollModulesWhileConnectedEpic.ts
@@ -1,4 +1,3 @@
-// @flow
 import { ofType } from 'redux-observable'
 import { interval } from 'rxjs'
 import {
@@ -24,7 +23,9 @@ export const pollModulesWhileConnectedEpic: Epic = (action$, state$) => {
     mergeMap(() => {
       return interval(POLL_MODULE_INTERVAL_MS).pipe(
         withLatestFrom(state$, (_, state) => getConnectedRobotName(state)),
-        takeWhile<string | null, any>(robotName => Boolean(robotName)),
+        takeWhile<string | null, any>((robotName): robotName is string =>
+          Boolean(robotName)
+        ),
         map((robotName: string) => fetchModules(robotName))
       )
     })
diff --git a/app/src/redux/modules/epic/sendModuleCommandEpic.ts b/app/src/redux/modules/epic/sendModuleCommandEpic.ts
index 235b8c62288..f89d93ee4cd 100644
--- a/app/src/redux/modules/epic/sendModuleCommandEpic.ts
+++ b/app/src/redux/modules/epic/sendModuleCommandEpic.ts
@@ -1,4 +1,3 @@
-// @flow
 import { ofType } from 'redux-observable'
 
 import { POST } from '../../robot-api/constants'
@@ -7,7 +6,7 @@ import { mapToRobotApiRequest } from '../../robot-api/operators'
 import * as Actions from '../actions'
 import * as Constants from '../constants'
 
-import type { Epic } from '../../types'
+import type { Action, Epic } from '../../types'
 
 import type {
   ActionToRequestMapper,
@@ -46,7 +45,7 @@ const mapResponseToAction: ResponseToActionMapper<SendModuleCommandAction> = (
 
 export const sendModuleCommandEpic: Epic = (action$, state$) => {
   return action$.pipe(
-    ofType(Constants.SEND_MODULE_COMMAND),
+    ofType<Action, SendModuleCommandAction>(Constants.SEND_MODULE_COMMAND),
     mapToRobotApiRequest(
       state$,
       a => a.payload.robotName,
diff --git a/app/src/redux/modules/epic/updateModuleEpic.ts b/app/src/redux/modules/epic/updateModuleEpic.ts
index e0d4e3e00fa..8289e7c28c3 100644
--- a/app/src/redux/modules/epic/updateModuleEpic.ts
+++ b/app/src/redux/modules/epic/updateModuleEpic.ts
@@ -1,4 +1,3 @@
-// @flow
 import { ofType } from 'redux-observable'
 
 import { POST } from '../../robot-api/constants'
@@ -7,7 +6,7 @@ import { mapToRobotApiRequest } from '../../robot-api/operators'
 import * as Actions from '../actions'
 import * as Constants from '../constants'
 
-import type { Epic } from '../../types'
+import type { Action, Epic } from '../../types'
 
 import type {
   ActionToRequestMapper,
@@ -36,7 +35,7 @@ const mapResponseToAction: ResponseToActionMapper<UpdateModuleAction> = (
 
 export const updateModuleEpic: Epic = (action$, state$) => {
   return action$.pipe(
-    ofType(Constants.UPDATE_MODULE),
+    ofType<Action, UpdateModuleAction>(Constants.UPDATE_MODULE),
     mapToRobotApiRequest(
       state$,
       a => a.payload.robotName,
diff --git a/app/src/redux/modules/hooks.ts b/app/src/redux/modules/hooks.ts
index 8155e82bc7f..93388a80155 100644
--- a/app/src/redux/modules/hooks.ts
+++ b/app/src/redux/modules/hooks.ts
@@ -1,4 +1,3 @@
-// @flow
 import { useCallback } from 'react'
 import { useSelector, useDispatch } from 'react-redux'
 import { sendModuleCommand } from './actions'
@@ -15,14 +14,14 @@ import type { ModuleCommand } from './types'
 export const useSendModuleCommand = (): ((
   moduleId: string,
   command: ModuleCommand,
-  args?: Array<mixed>
+  args?: unknown[]
 ) => void) => {
   const robotName = useSelector(getConnectedRobotName)
   const dispatch = useDispatch<Dispatch>()
   const log = useLogger(__dirname)
 
   return useCallback(
-    (moduleId: string, command: ModuleCommand, args?: Array<mixed>) => {
+    (moduleId: string, command: ModuleCommand, args?: unknown[]) => {
       if (robotName !== null) {
         dispatch(sendModuleCommand(robotName, moduleId, command, args))
       } else {
diff --git a/app/src/redux/modules/i18n.ts b/app/src/redux/modules/i18n.ts
index 4775a711687..6e2a9e3ff94 100644
--- a/app/src/redux/modules/i18n.ts
+++ b/app/src/redux/modules/i18n.ts
@@ -1,4 +1,3 @@
-// @flow
 // TODO(mc, 2020-03-16): i18n
 
 export const CONNECT_FOR_MODULE_CONTROL = 'Connect to robot to control modules'
diff --git a/app/src/redux/modules/index.ts b/app/src/redux/modules/index.ts
index a3d27a149c2..528e52d2e3a 100644
--- a/app/src/redux/modules/index.ts
+++ b/app/src/redux/modules/index.ts
@@ -1,5 +1,3 @@
-// @flow
-
 export * from './actions'
 export * from './constants'
 export * from './selectors'
diff --git a/app/src/redux/modules/reducer.ts b/app/src/redux/modules/reducer.ts
index f2dc22fcf62..2dc3b4b7aec 100644
--- a/app/src/redux/modules/reducer.ts
+++ b/app/src/redux/modules/reducer.ts
@@ -1,9 +1,9 @@
-// @flow
 import keyBy from 'lodash/keyBy'
 import * as Constants from './constants'
 
 import type { Action } from '../types'
 import type { ModulesState, PerRobotModulesState } from './types'
+import { Reducer } from 'redux'
 
 const INITIAL_STATE: ModulesState = {}
 
@@ -11,10 +11,10 @@ const INITIAL_MODULES_STATE: PerRobotModulesState = {
   modulesById: null,
 }
 
-export function modulesReducer(
-  state: ModulesState = INITIAL_STATE,
-  action: Action
-): ModulesState {
+export const modulesReducer: Reducer<ModulesState, Action> = (
+  state = INITIAL_STATE,
+  action
+) => {
   switch (action.type) {
     case Constants.FETCH_MODULES_SUCCESS: {
       const { robotName, modules } = action.payload
diff --git a/app/src/redux/modules/selectors.ts b/app/src/redux/modules/selectors.ts
index 9d369bdb429..83ac06ceb5d 100644
--- a/app/src/redux/modules/selectors.ts
+++ b/app/src/redux/modules/selectors.ts
@@ -1,4 +1,3 @@
-// @flow
 import { createSelector } from 'reselect'
 import sortBy from 'lodash/sortBy'
 
@@ -20,9 +19,17 @@ export { getModuleType } from '@opentrons/shared-data'
 export const getAttachedModules: (
   state: State,
   robotName: string | null
-) => Array<Types.AttachedModule> = createSelector(
-  (state, robotName) =>
-    robotName !== null ? state.modules[robotName]?.modulesById : {},
+) => Types.AttachedModule[] = createSelector(
+  // TODO(IL, 2021-05-27): factor out this inner function for clarity
+  (
+    state: State,
+    robotName: string | null
+  ): { [moduleId: string]: Types.AttachedModule } =>
+    robotName !== null
+      ? (state.modules[robotName]?.modulesById as {
+          [moduleId: string]: Types.AttachedModule
+        })
+      : {},
   // sort by usbPort info, if they do not exist (robot version below 4.3), sort by serial
   modulesByPort =>
     sortBy(modulesByPort, ['usbPort.hub', 'usbPort.port', 'serial'])
@@ -30,7 +37,7 @@ export const getAttachedModules: (
 
 export const getAttachedModulesForConnectedRobot = (
   state: State
-): Array<Types.AttachedModule> => {
+): Types.AttachedModule[] => {
   const robotName = RobotSelectors.getConnectedRobotName(state)
   return getAttachedModules(state, robotName)
 }
@@ -43,7 +50,7 @@ const isModulePrepared = (module: Types.AttachedModule): boolean => {
 
 export const getUnpreparedModules: (
   state: State
-) => Array<Types.AttachedModule> = createSelector(
+) => Types.AttachedModule[] = createSelector(
   getAttachedModulesForConnectedRobot,
   RobotSelectors.getModules,
   (attachedModules, protocolModules) => {
@@ -62,11 +69,11 @@ export const getUnpreparedModules: (
 
 export const getMatchedModules: (
   state: State
-) => Array<Types.MatchedModule> = createSelector(
+) => Types.MatchedModule[] = createSelector(
   getAttachedModulesForConnectedRobot,
   RobotSelectors.getModulesByProtocolLoadOrder,
   (attachedModules, protocolModules) => {
-    const matchedAmod: Array<Types.MatchedModule> = []
+    const matchedAmod: Types.MatchedModule[] = []
     const matchedPmod = []
     protocolModules.forEach(pmod => {
       const compatible =
@@ -86,12 +93,12 @@ export const getMatchedModules: (
 
 export const getMissingModules: (
   state: State
-) => Array<SessionModule> = createSelector(
+) => SessionModule[] = createSelector(
   getAttachedModulesForConnectedRobot,
   RobotSelectors.getModules,
   (attachedModules, protocolModules) => {
-    const matchedAmod = []
-    const matchedPmod = []
+    const matchedAmod: Types.AttachedModule[] = []
+    const matchedPmod: typeof protocolModules = []
     protocolModules.forEach(pmod => {
       const compatible = attachedModules.find(
         amod =>
diff --git a/app/src/redux/modules/types.ts b/app/src/redux/modules/types.ts
index cd3fbec3007..d78cd897cbf 100644
--- a/app/src/redux/modules/types.ts
+++ b/app/src/redux/modules/types.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import type { RobotApiRequestMeta } from '../robot-api/types'
 import type {
   TemperatureModuleModel,
@@ -19,34 +17,31 @@ export * from './api-types'
 
 // common types
 
-export type CommonModuleInfo = $Diff<
+export type CommonModuleInfo = Omit<
   ApiTypes.ApiBaseModule,
-  {| model: mixed, displayName: mixed, moduleModel: mixed |}
+  'model' | 'displayName' | 'moduleModel'
 >
 
-export type TemperatureModule = {|
-  type: typeof TEMPERATURE_MODULE_TYPE,
-  model: TemperatureModuleModel,
-  status: ApiTypes.TemperatureStatus,
-  data: ApiTypes.TemperatureData,
-  ...CommonModuleInfo,
-|}
-
-export type MagneticModule = {|
-  type: typeof MAGNETIC_MODULE_TYPE,
-  model: MagneticModuleModel,
-  status: ApiTypes.MagneticStatus,
-  data: ApiTypes.MagneticData,
-  ...CommonModuleInfo,
-|}
-
-export type ThermocyclerModule = {|
-  type: typeof THERMOCYCLER_MODULE_TYPE,
-  model: ThermocyclerModuleModel,
-  status: ApiTypes.ThermocyclerStatus,
-  data: ApiTypes.ThermocyclerData,
-  ...CommonModuleInfo,
-|}
+export interface TemperatureModule extends CommonModuleInfo {
+  type: typeof TEMPERATURE_MODULE_TYPE
+  model: TemperatureModuleModel
+  status: ApiTypes.TemperatureStatus
+  data: ApiTypes.TemperatureData
+}
+
+export interface MagneticModule extends CommonModuleInfo {
+  type: typeof MAGNETIC_MODULE_TYPE
+  model: MagneticModuleModel
+  status: ApiTypes.MagneticStatus
+  data: ApiTypes.MagneticData
+}
+
+export interface ThermocyclerModule extends CommonModuleInfo {
+  type: typeof THERMOCYCLER_MODULE_TYPE
+  model: ThermocyclerModuleModel
+  status: ApiTypes.ThermocyclerStatus
+  data: ApiTypes.ThermocyclerData
+}
 
 export type AttachedModule =
   | TemperatureModule
@@ -54,93 +49,93 @@ export type AttachedModule =
   | ThermocyclerModule
 // action object types
 
-export type MatchedModule = {|
-  slot: Slot,
-  module: AttachedModule,
-|}
+export interface MatchedModule {
+  slot: Slot
+  module: AttachedModule
+}
 
 // fetch modules
 
-export type FetchModulesAction = {|
-  type: 'modules:FETCH_MODULES',
-  payload: {| robotName: string |},
-  meta: RobotApiRequestMeta,
-|}
+export interface FetchModulesAction {
+  type: 'modules:FETCH_MODULES'
+  payload: { robotName: string }
+  meta: RobotApiRequestMeta | {}
+}
 
-export type FetchModulesSuccessAction = {|
-  type: 'modules:FETCH_MODULES_SUCCESS',
-  payload: {| robotName: string, modules: Array<AttachedModule> |},
-  meta: RobotApiRequestMeta,
-|}
+export interface FetchModulesSuccessAction {
+  type: 'modules:FETCH_MODULES_SUCCESS'
+  payload: { robotName: string; modules: AttachedModule[] }
+  meta: RobotApiRequestMeta
+}
 
-export type FetchModulesFailureAction = {|
-  type: 'modules:FETCH_MODULES_FAILURE',
-  payload: {| robotName: string, error: {} |},
-  meta: RobotApiRequestMeta,
-|}
+export interface FetchModulesFailureAction {
+  type: 'modules:FETCH_MODULES_FAILURE'
+  payload: { robotName: string; error: {} }
+  meta: RobotApiRequestMeta
+}
 
 // fetch module data
 
-export type SendModuleCommandAction = {|
-  type: 'modules:SEND_MODULE_COMMAND',
-  payload: {|
-    robotName: string,
-    moduleId: string,
-    command: ApiTypes.ModuleCommand,
-    args: Array<mixed>,
-  |},
-  meta: RobotApiRequestMeta,
-|}
-
-export type SendModuleCommandSuccessAction = {|
-  type: 'modules:SEND_MODULE_COMMAND_SUCCESS',
-  payload: {|
-    robotName: string,
-    moduleId: string,
-    command: ApiTypes.ModuleCommand,
-    returnValue: mixed,
-  |},
-  meta: RobotApiRequestMeta,
-|}
-
-export type SendModuleCommandFailureAction = {|
-  type: 'modules:SEND_MODULE_COMMAND_FAILURE',
-  payload: {|
-    robotName: string,
-    moduleId: string,
-    command: ApiTypes.ModuleCommand,
-    error: {},
-  |},
-  meta: RobotApiRequestMeta,
-|}
+export interface SendModuleCommandAction {
+  type: 'modules:SEND_MODULE_COMMAND'
+  payload: {
+    robotName: string
+    moduleId: string
+    command: ApiTypes.ModuleCommand
+    args: unknown[]
+  }
+  meta: RobotApiRequestMeta | {}
+}
+
+export interface SendModuleCommandSuccessAction {
+  type: 'modules:SEND_MODULE_COMMAND_SUCCESS'
+  payload: {
+    robotName: string
+    moduleId: string
+    command: ApiTypes.ModuleCommand
+    returnValue: unknown
+  }
+  meta: RobotApiRequestMeta
+}
+
+export interface SendModuleCommandFailureAction {
+  type: 'modules:SEND_MODULE_COMMAND_FAILURE'
+  payload: {
+    robotName: string
+    moduleId: string
+    command: ApiTypes.ModuleCommand
+    error: {}
+  }
+  meta: RobotApiRequestMeta
+}
 
 // fetch modules
 
-export type UpdateModuleAction = {|
-  type: 'modules:UPDATE_MODULE',
-  payload: {| robotName: string, moduleId: string |},
-  meta: RobotApiRequestMeta,
-|}
-
-export type UpdateModuleSuccessAction = {|
-  type: 'modules:UPDATE_MODULE_SUCCESS',
-  payload: {|
-    robotName: string,
-    moduleId: string,
-    message: string,
-  |},
-  meta: RobotApiRequestMeta,
-|}
-
-export type UpdateModuleFailureAction = {|
-  type: 'modules:UPDATE_MODULE_FAILURE',
-  payload: {|
-    robotName: string,
-    moduleId: string,
-    error: {},
-  |},
-  meta: RobotApiRequestMeta,
-|}
+export interface UpdateModuleAction {
+  type: 'modules:UPDATE_MODULE'
+  payload: { robotName: string; moduleId: string }
+  meta: RobotApiRequestMeta | {}
+}
+
+export interface UpdateModuleSuccessAction {
+  type: 'modules:UPDATE_MODULE_SUCCESS'
+  payload: {
+    robotName: string
+    moduleId: string
+    message: string
+  }
+  meta: RobotApiRequestMeta
+}
+
+export interface UpdateModuleFailureAction {
+  type: 'modules:UPDATE_MODULE_FAILURE'
+  payload: {
+    robotName: string
+    moduleId: string
+    error: {}
+  }
+  meta: RobotApiRequestMeta
+}
 
 // action union
 
@@ -157,16 +152,14 @@ export type ModulesAction =
 
 // state types
 
-export type AttachedModulesById = $Shape<
-  $ReadOnly<{| [moduleId: string]: AttachedModule |}>
->
+export type AttachedModulesById = Partial<{
+  readonly [moduleId: string]: AttachedModule
+}>
 
-export type PerRobotModulesState = $ReadOnly<{|
-  modulesById: AttachedModulesById | null,
-|}>
+export interface PerRobotModulesState {
+  readonly modulesById: AttachedModulesById | null
+}
 
-export type ModulesState = $Shape<
-  $ReadOnly<{|
-    [robotName: string]: void | PerRobotModulesState,
-  |}>
->
+export type ModulesState = Partial<{
+  readonly [robotName: string]: undefined | PerRobotModulesState
+}>
diff --git a/app/src/redux/nav/__tests__/calibrate-selectors.test.ts b/app/src/redux/nav/__tests__/calibrate-selectors.test.ts
index 160d14c2595..5b42abce43f 100644
--- a/app/src/redux/nav/__tests__/calibrate-selectors.test.ts
+++ b/app/src/redux/nav/__tests__/calibrate-selectors.test.ts
@@ -1,4 +1,3 @@
-// @flow
 import noop from 'lodash/noop'
 
 import * as RobotSelectors from '../../robot/selectors'
@@ -7,31 +6,26 @@ import * as CalibrateSelectors from '../calibrate-selectors'
 
 import type { State } from '../../types'
 
-type SelectorSpec = {|
-  name: string,
-  selector: State => mixed,
-  before?: () => mixed,
-  after?: () => mixed,
-  expected: mixed,
-|}
+interface SelectorSpec {
+  name: string
+  selector: (state: State) => unknown
+  before?: () => unknown
+  after?: () => unknown
+  expected: unknown
+}
 
 jest.mock('../selectors')
 jest.mock('../../robot/selectors')
 
-const mockGetCalibrateLocation: JestMockFn<
-  [State],
-  $Call<typeof NavSelectors.getCalibrateLocation, State>
-> = NavSelectors.getCalibrateLocation
-
-const mockGetPipettes: JestMockFn<
-  [State],
-  $Call<typeof RobotSelectors.getPipettes, State>
-> = RobotSelectors.getPipettes
-
-const mockGetTipracksByMount: JestMockFn<
-  [State],
-  $Call<typeof RobotSelectors.getTipracksByMount, State>
-> = RobotSelectors.getTipracksByMount
+const mockGetCalibrateLocation = NavSelectors.getCalibrateLocation as jest.MockedFunction<
+  typeof NavSelectors.getCalibrateLocation
+>
+const mockGetPipettes = RobotSelectors.getPipettes as jest.MockedFunction<
+  typeof RobotSelectors.getPipettes
+>
+const mockGetTipracksByMount = RobotSelectors.getTipracksByMount as jest.MockedFunction<
+  typeof RobotSelectors.getTipracksByMount
+>
 
 const ENABLED_CALIBRATE = {
   id: 'calibrate',
@@ -47,10 +41,10 @@ const DISABLED_CALIBRATE = {
 }
 
 describe('calibrate nav selectors', () => {
-  const mockState: State = ({ mockState: true }: any)
+  const mockState: State = { mockState: true } as any
 
   beforeEach(() => {
-    mockGetCalibrateLocation.mockReturnValue(DISABLED_CALIBRATE)
+    mockGetCalibrateLocation.mockReturnValue(DISABLED_CALIBRATE as any)
     mockGetPipettes.mockReturnValue([])
     mockGetTipracksByMount.mockReturnValue({ left: [], right: [] })
   })
@@ -59,7 +53,7 @@ describe('calibrate nav selectors', () => {
     jest.resetAllMocks()
   })
 
-  const SPECS: Array<SelectorSpec> = [
+  const SPECS: SelectorSpec[] = [
     {
       name:
         'getCalibratePipettesLocations returns disabled if /calibrate disabled',
@@ -82,7 +76,8 @@ describe('calibrate nav selectors', () => {
     {
       name: 'getCalibratePipettesLocations returns disabled if no pipettes',
       selector: CalibrateSelectors.getCalibratePipettesLocations,
-      before: () => mockGetCalibrateLocation.mockReturnValue(ENABLED_CALIBRATE),
+      before: () =>
+        mockGetCalibrateLocation.mockReturnValue(ENABLED_CALIBRATE as any),
       expected: {
         left: {
           default: {
@@ -102,9 +97,9 @@ describe('calibrate nav selectors', () => {
       name: 'getCalibratePipettesLocations returns disabled if pipette unused',
       selector: CalibrateSelectors.getCalibratePipettesLocations,
       before: () => {
-        mockGetCalibrateLocation.mockReturnValue(ENABLED_CALIBRATE)
+        mockGetCalibrateLocation.mockReturnValue(ENABLED_CALIBRATE as any)
         mockGetPipettes.mockReturnValue([
-          ({ _id: 0, mount: 'right', tipRacks: [] }: any),
+          { _id: 0, mount: 'right', tipRacks: [] } as any,
         ])
       },
       expected: {
@@ -126,9 +121,9 @@ describe('calibrate nav selectors', () => {
       name: 'getCalibratePipettesLocations returns enabled if pipette used',
       selector: CalibrateSelectors.getCalibratePipettesLocations,
       before: () => {
-        mockGetCalibrateLocation.mockReturnValue(ENABLED_CALIBRATE)
+        mockGetCalibrateLocation.mockReturnValue(ENABLED_CALIBRATE as any)
         mockGetPipettes.mockReturnValue([
-          ({ _id: 0, mount: 'right', tipRacks: [1, 2] }: any),
+          { _id: 0, mount: 'right', tipRacks: [1, 2] } as any,
         ])
       },
       expected: {
@@ -151,17 +146,17 @@ describe('calibrate nav selectors', () => {
         'getCalibratePipetteLocations returns specifications for all tipracks',
       selector: CalibrateSelectors.getCalibratePipettesLocations,
       before: () => {
-        mockGetCalibrateLocation.mockReturnValue(ENABLED_CALIBRATE)
+        mockGetCalibrateLocation.mockReturnValue(ENABLED_CALIBRATE as any)
         mockGetPipettes.mockReturnValue([
-          ({ _id: 0, mount: 'right', tipRacks: [1, 2] }: any),
+          { _id: 0, mount: 'right', tipRacks: [1, 2] } as any,
         ])
         mockGetTipracksByMount.mockReturnValue({
           right: [
-            ({ _id: 1, definitionHash: 'hash-1' }: any),
-            ({ _id: 2, definitionHash: 'hash-2' }: any),
-            ({ _id: 3, definitionHash: null }: any),
+            { _id: 1, definitionHash: 'hash-1' } as any,
+            { _id: 2, definitionHash: 'hash-2' } as any,
+            { _id: 3, definitionHash: null } as any,
           ],
-          left: [({ _id: 1, definitionHash: 'hash-1' }: any)],
+          left: [{ _id: 1, definitionHash: 'hash-1' } as any],
         })
       },
       expected: {
diff --git a/app/src/redux/nav/__tests__/selectors.test.ts b/app/src/redux/nav/__tests__/selectors.test.ts
index 7e98faca37f..44fb2e77545 100644
--- a/app/src/redux/nav/__tests__/selectors.test.ts
+++ b/app/src/redux/nav/__tests__/selectors.test.ts
@@ -1,4 +1,3 @@
-// @flow
 import noop from 'lodash/noop'
 
 import * as CalibrationSelectors from '../../calibration/selectors'
@@ -14,15 +13,15 @@ import { NOT_APPLICABLE, OUTDATED } from '../../system-info'
 
 import { DECK_CAL_STATUS_OK, DECK_CAL_STATUS_IDENTITY } from '../../calibration'
 import type { State } from '../../types'
-import type { Robot, ViewableRobot } from '../../discovery/types'
+import type { Robot } from '../../discovery/types'
 
-type SelectorSpec = {|
-  name: string,
-  selector: State => mixed,
-  before?: () => mixed,
-  after?: () => mixed,
-  expected: mixed,
-|}
+interface SelectorSpec {
+  name: string
+  selector: (state: State) => unknown
+  before?: () => unknown
+  after?: () => unknown
+  expected: unknown
+}
 
 jest.mock('../../calibration/selectors')
 jest.mock('../../discovery/selectors')
@@ -32,64 +31,44 @@ jest.mock('../../system-info/selectors')
 jest.mock('../../shell')
 jest.mock('../../robot/selectors')
 
-const mockGetConnectedRobot: JestMockFn<
-  [State],
-  $Call<typeof DiscoverySelectors.getConnectedRobot, State>
-> = DiscoverySelectors.getConnectedRobot
-
-const mockGetProtocolPipettesMatching: JestMockFn<
-  [State, string],
-  $Call<typeof PipetteSelectors.getProtocolPipettesMatching, State, string>
-> = PipetteSelectors.getProtocolPipettesMatching
-
-const mockGetProtocolPipettesCalibrated: JestMockFn<
-  [State, string],
-  $Call<typeof PipetteSelectors.getProtocolPipettesCalibrated, State, string>
-> = PipetteSelectors.getProtocolPipettesCalibrated
-
-const mockGetAvailableShellUpdate: JestMockFn<
-  [State],
-  $Call<typeof ShellSelectors.getAvailableShellUpdate, State>
-> = ShellSelectors.getAvailableShellUpdate
-
-const mockGetU2EWindowsDriverStatus: JestMockFn<
-  [State],
-  $Call<typeof SystemInfoSelectors.getU2EWindowsDriverStatus, State>
-> = SystemInfoSelectors.getU2EWindowsDriverStatus
-
-const mockGetBuildrootUpdateAvailable: JestMockFn<
-  [State, ViewableRobot],
-  $Call<
-    typeof BuildrootSelectors.getBuildrootUpdateAvailable,
-    State,
-    ViewableRobot
-  >
-> = BuildrootSelectors.getBuildrootUpdateAvailable
+const mockGetConnectedRobot = DiscoverySelectors.getConnectedRobot as jest.MockedFunction<
+  typeof DiscoverySelectors.getConnectedRobot
+>
+const mockGetProtocolPipettesMatching = PipetteSelectors.getProtocolPipettesMatching as jest.MockedFunction<
+  typeof PipetteSelectors.getProtocolPipettesMatching
+>
+const mockGetProtocolPipettesCalibrated = PipetteSelectors.getProtocolPipettesCalibrated as jest.MockedFunction<
+  typeof PipetteSelectors.getProtocolPipettesCalibrated
+>
+const mockGetAvailableShellUpdate = ShellSelectors.getAvailableShellUpdate as jest.MockedFunction<
+  typeof ShellSelectors.getAvailableShellUpdate
+>
+const mockGetU2EWindowsDriverStatus = SystemInfoSelectors.getU2EWindowsDriverStatus as jest.MockedFunction<
+  typeof SystemInfoSelectors.getU2EWindowsDriverStatus
+>
+const mockGetBuildrootUpdateAvailable = BuildrootSelectors.getBuildrootUpdateAvailable as jest.MockedFunction<
+  typeof BuildrootSelectors.getBuildrootUpdateAvailable
+>
 
-const mockGetIsRunning: JestMockFn<
-  [State],
-  $Call<typeof RobotSelectors.getIsRunning, State>
-> = RobotSelectors.getIsRunning
+const mockGetIsRunning = RobotSelectors.getIsRunning as jest.MockedFunction<
+  typeof RobotSelectors.getIsRunning
+>
 
-const mockGetIsDone: JestMockFn<
-  [State],
-  $Call<typeof RobotSelectors.getIsDone, State>
-> = RobotSelectors.getIsDone
+const mockGetIsDone = RobotSelectors.getIsDone as jest.MockedFunction<
+  typeof RobotSelectors.getIsDone
+>
 
-const mockGetSessionIsLoaded: JestMockFn<
-  [State],
-  $Call<typeof RobotSelectors.getSessionIsLoaded, State>
-> = RobotSelectors.getSessionIsLoaded
+const mockGetSessionIsLoaded = RobotSelectors.getSessionIsLoaded as jest.MockedFunction<
+  typeof RobotSelectors.getSessionIsLoaded
+>
 
-const mockGetCommands: JestMockFn<
-  [State],
-  any
-> = (RobotSelectors.getCommands: any)
+const mockGetCommands = RobotSelectors.getCommands as jest.MockedFunction<
+  typeof RobotSelectors.getCommands
+>
 
-const mockGetDeckCalibrationStatus: JestMockFn<
-  [State, string],
-  $Call<typeof CalibrationSelectors.getDeckCalibrationStatus, State, string>
-> = CalibrationSelectors.getDeckCalibrationStatus
+const mockGetDeckCalibrationStatus = CalibrationSelectors.getDeckCalibrationStatus as jest.MockedFunction<
+  typeof CalibrationSelectors.getDeckCalibrationStatus
+>
 
 const EXPECTED_ROBOTS = {
   id: 'robots',
@@ -133,8 +112,8 @@ const EXPECTED_MORE = {
 }
 
 describe('nav selectors', () => {
-  const mockState: State = ({ mockState: true }: any)
-  const mockRobot: Robot = ({ mockRobot: true, name: 'mock-robot' }: any)
+  const mockState: State = { mockState: true } as any
+  const mockRobot: Robot = { mockRobot: true, name: 'mock-robot' } as any
 
   beforeEach(() => {
     mockGetConnectedRobot.mockReturnValue(null)
@@ -154,7 +133,7 @@ describe('nav selectors', () => {
     jest.resetAllMocks()
   })
 
-  const SPECS: Array<SelectorSpec> = [
+  const SPECS: SelectorSpec[] = [
     {
       name: 'getNavbarLocations without any robot',
       selector: Selectors.getNavbarLocations,
@@ -246,7 +225,7 @@ describe('nav selectors', () => {
         mockGetSessionIsLoaded.mockReturnValue(true)
         mockGetCommands.mockReturnValue([
           { id: 0, description: 'Foo', handledAt: null, children: [] },
-        ])
+        ] as any)
       },
       expected: [
         EXPECTED_ROBOTS,
@@ -271,7 +250,7 @@ describe('nav selectors', () => {
         mockGetSessionIsLoaded.mockReturnValue(true)
         mockGetCommands.mockReturnValue([
           { id: 0, description: 'Foo', handledAt: null, children: [] },
-        ])
+        ] as any)
         mockGetProtocolPipettesMatching.mockReturnValue(true)
       },
       expected: [
@@ -324,7 +303,7 @@ describe('nav selectors', () => {
         mockGetSessionIsLoaded.mockReturnValue(true)
         mockGetCommands.mockReturnValue([
           { id: 0, description: 'Foo', handledAt: null, children: [] },
-        ])
+        ] as any)
         mockGetProtocolPipettesMatching.mockReturnValue(true)
         mockGetProtocolPipettesCalibrated.mockReturnValue(true)
       },
diff --git a/app/src/redux/nav/calibrate-selectors.ts b/app/src/redux/nav/calibrate-selectors.ts
index 6cb1c6c7c30..9311a588759 100644
--- a/app/src/redux/nav/calibrate-selectors.ts
+++ b/app/src/redux/nav/calibrate-selectors.ts
@@ -1,4 +1,3 @@
-// @flow
 // calibrate sublocations
 import { createSelector } from 'reselect'
 
@@ -9,6 +8,7 @@ import { getCalibrateLocation } from './selectors'
 import type { State } from '../types'
 import type { SubnavLocation } from './types'
 import type { Labware } from '../robot/types'
+import type { Mount } from '../pipettes/types'
 
 // TODO(mc, 2019-12-10): i18n
 const NO_PIPETTE_SPECIFIED_FOR_THIS_MOUNT =
@@ -16,23 +16,28 @@ const NO_PIPETTE_SPECIFIED_FOR_THIS_MOUNT =
 const PIPETTE_IS_NOT_USED_IN_THIS_PROTOCOL =
   'This pipette is not used in this protocol'
 
-type PerTiprackSubnav = {
-  default: SubnavLocation,
-  [string]: SubnavLocation,
+interface PerTiprackSubnav {
+  default: SubnavLocation
+  [key: string]: SubnavLocation
 }
 
-export const getCalibratePipettesLocations: State => {|
-  left: PerTiprackSubnav,
-  right: PerTiprackSubnav,
-|} = createSelector(
+export const getCalibratePipettesLocations: (
+  state: State
+) => {
+  left: PerTiprackSubnav
+  right: PerTiprackSubnav
+} = createSelector(
   getCalibrateLocation,
   RobotSelectors.getPipettes,
   RobotSelectors.getTipracksByMount,
   (parentLocation, pipettes, tipracksByMount) => {
-    const makePathForMount = mount => `${parentLocation.path}/pipettes/${mount}`
-    const makePathForMountTiprackCombo = (mount, definitionHash) =>
-      `${makePathForMount(mount)}/${definitionHash}`
-    const makeDisReason = mount => {
+    const makePathForMount = (mount: Mount): string =>
+      `${parentLocation.path}/pipettes/${mount}`
+    const makePathForMountTiprackCombo = (
+      mount: Mount,
+      definitionHash: string
+    ): string => `${makePathForMount(mount)}/${definitionHash}`
+    const makeDisReason = (mount: Mount): string | null => {
       const pipette = pipettes.find(p => p.mount === mount)
       let disabledReason = null
 
@@ -47,25 +52,28 @@ export const getCalibratePipettesLocations: State => {|
       return disabledReason
     }
 
-    const disReasons = {
+    const disReasons: { [mount in Mount]: string | null } = {
       left: makeDisReason('left'),
       right: makeDisReason('right'),
     }
 
-    const buildTiprackPathsForMount: (
-      'left' | 'right',
-      Array<Labware>
-    ) => { [string]: SubnavLocation } = (mount, tipracks) => {
-      const hashes: Array<string> = tipracks
+    const buildTiprackPathsForMount = (
+      mount: Mount,
+      tipracks: Labware[]
+    ): { [hash: string]: SubnavLocation } => {
+      const hashes: string[] = tipracks
         .map(tr => tr.definitionHash)
-        .filter(Boolean)
-      return hashes.reduce((pathMap, hash) => {
-        pathMap[hash] = {
-          path: makePathForMountTiprackCombo(mount, hash),
-          disabledReason: disReasons[mount],
-        }
-        return pathMap
-      }, {})
+        .filter<string>((tr): tr is string => Boolean(tr))
+      return hashes.reduce<{ [hash: string]: SubnavLocation }>(
+        (pathMap, hash) => {
+          pathMap[hash] = {
+            path: makePathForMountTiprackCombo(mount, hash),
+            disabledReason: disReasons[mount],
+          }
+          return pathMap
+        },
+        {}
+      )
     }
 
     return {
diff --git a/app/src/redux/nav/index.ts b/app/src/redux/nav/index.ts
index 367b7f2bb95..c4e5c29dc36 100644
--- a/app/src/redux/nav/index.ts
+++ b/app/src/redux/nav/index.ts
@@ -1,4 +1,2 @@
-// @flow
-
 export * from './selectors'
 export * from './calibrate-selectors'
diff --git a/app/src/redux/nav/selectors.ts b/app/src/redux/nav/selectors.ts
index affeca08569..cb60aa9a08c 100644
--- a/app/src/redux/nav/selectors.ts
+++ b/app/src/redux/nav/selectors.ts
@@ -1,4 +1,3 @@
-// @flow
 import { createSelector } from 'reselect'
 
 import { getConnectedRobot } from '../discovery'
@@ -97,7 +96,7 @@ const getRobotCalibrationOk = (state: State): boolean => {
   return deckCalOk
 }
 
-const getRunDisabledReason: State => string | null = createSelector(
+const getRunDisabledReason: (state: State) => string | null = createSelector(
   getConnectedRobot,
   RobotSelectors.getSessionIsLoaded,
   RobotSelectors.getCommands,
@@ -115,7 +114,7 @@ const getRunDisabledReason: State => string | null = createSelector(
   }
 )
 
-export const getRobotsLocation: State => NavLocation = createSelector(
+export const getRobotsLocation: (state: State) => NavLocation = createSelector(
   getConnectedRobot,
   getConnectedRobotUpdateAvailable,
   getRobotCalibrationOk,
@@ -129,7 +128,7 @@ export const getRobotsLocation: State => NavLocation = createSelector(
   })
 )
 
-export const getUploadLocation: State => NavLocation = createSelector(
+export const getUploadLocation: (state: State) => NavLocation = createSelector(
   getConnectedRobot,
   RobotSelectors.getIsRunning,
   getDeckCalibrationOk,
@@ -153,7 +152,9 @@ export const getUploadLocation: State => NavLocation = createSelector(
   }
 )
 
-export const getCalibrateLocation: State => NavLocation = createSelector(
+export const getCalibrateLocation: (
+  state: State
+) => NavLocation = createSelector(
   RobotSelectors.getIsRunning,
   RobotSelectors.getIsDone,
   getRunDisabledReason,
@@ -177,7 +178,7 @@ export const getCalibrateLocation: State => NavLocation = createSelector(
   }
 )
 
-export const getRunLocation: State => NavLocation = createSelector(
+export const getRunLocation: (state: State) => NavLocation = createSelector(
   getRunDisabledReason,
   disabledReason => {
     return {
@@ -190,7 +191,7 @@ export const getRunLocation: State => NavLocation = createSelector(
   }
 )
 
-export const getMoreLocation: State => NavLocation = createSelector(
+export const getMoreLocation: (state: State) => NavLocation = createSelector(
   getAvailableShellUpdate,
   getU2EWindowsDriverStatus,
   (appUpdate, driverStatus) => {
@@ -211,7 +212,9 @@ export const getMoreLocation: State => NavLocation = createSelector(
   }
 )
 
-export const getNavbarLocations: State => Array<NavLocation> = createSelector(
+export const getNavbarLocations: (
+  state: State
+) => NavLocation[] = createSelector(
   getRobotsLocation,
   getUploadLocation,
   getCalibrateLocation,
diff --git a/app/src/redux/nav/types.ts b/app/src/redux/nav/types.ts
index b009ceb762f..3360387ff18 100644
--- a/app/src/redux/nav/types.ts
+++ b/app/src/redux/nav/types.ts
@@ -1,18 +1,16 @@
-// @flow
-
 import type { IconName } from '@opentrons/components'
 
-export type NavLocation = {|
-  id: string,
-  path: string,
-  title: string,
-  iconName: IconName,
-  disabledReason?: string | null,
-  notificationReason?: string | null,
-  warningReason?: string | null,
-|}
+export interface NavLocation {
+  id: string
+  path: string
+  title: string
+  iconName: IconName
+  disabledReason?: string | null
+  notificationReason?: string | null
+  warningReason?: string | null
+}
 
-export type SubnavLocation = {|
-  path: string,
-  disabledReason?: string | null,
-|}
+export interface SubnavLocation {
+  path: string
+  disabledReason?: string | null
+}
diff --git a/app/src/redux/networking/__fixtures__/configure.ts b/app/src/redux/networking/__fixtures__/configure.ts
index 1aa93d560a5..ee71378bdae 100644
--- a/app/src/redux/networking/__fixtures__/configure.ts
+++ b/app/src/redux/networking/__fixtures__/configure.ts
@@ -1,4 +1,3 @@
-// @flow
 // fixtures for /wifi/configure
 
 import { POST } from '../../robot-api'
@@ -18,7 +17,7 @@ const {
   failure,
 }: ResponseFixtures<
   WifiConfigureResponse,
-  {| message: string |}
+  { message: string }
 > = makeResponseFixtures({
   method: POST,
   path: WIFI_CONFIGURE_PATH,
diff --git a/app/src/redux/networking/__fixtures__/disconnect.ts b/app/src/redux/networking/__fixtures__/disconnect.ts
index b391264408d..d1bfeecc7e1 100644
--- a/app/src/redux/networking/__fixtures__/disconnect.ts
+++ b/app/src/redux/networking/__fixtures__/disconnect.ts
@@ -1,4 +1,3 @@
-// @flow
 // fixtures for /wifi/disconnect
 
 import { POST } from '../../robot-api'
@@ -21,7 +20,7 @@ const {
   failure,
 }: ResponseFixtures<
   NetworkingDisconnectResponse,
-  {| message: string |}
+  { message: string }
 > = makeResponseFixtures({
   method: POST,
   path: '/wifi/disconnect',
diff --git a/app/src/redux/networking/__fixtures__/eap-options.ts b/app/src/redux/networking/__fixtures__/eap-options.ts
index cff65629334..f11ee4703be 100644
--- a/app/src/redux/networking/__fixtures__/eap-options.ts
+++ b/app/src/redux/networking/__fixtures__/eap-options.ts
@@ -1,4 +1,3 @@
-// @flow
 // fixtures for /wifi/eap-options
 
 import { GET } from '../../robot-api'
@@ -55,7 +54,7 @@ const {
   failure,
 }: ResponseFixtures<
   FetchEapOptionsResponse,
-  {| message: string |}
+  { message: string }
 > = makeResponseFixtures({
   method: GET,
   path: EAP_OPTIONS_PATH,
diff --git a/app/src/redux/networking/__fixtures__/index.ts b/app/src/redux/networking/__fixtures__/index.ts
index 39f1e007c93..9f8eb945116 100644
--- a/app/src/redux/networking/__fixtures__/index.ts
+++ b/app/src/redux/networking/__fixtures__/index.ts
@@ -1,4 +1,3 @@
-// @flow
 // mock responses for networking endpoints
 
 export * from './configure'
diff --git a/app/src/redux/networking/__fixtures__/keys.ts b/app/src/redux/networking/__fixtures__/keys.ts
index cae38ddf8bc..3477b77d3e0 100644
--- a/app/src/redux/networking/__fixtures__/keys.ts
+++ b/app/src/redux/networking/__fixtures__/keys.ts
@@ -1,4 +1,3 @@
-// @flow
 // fixtures for /wifi/keys
 
 import { GET, POST } from '../../robot-api'
@@ -25,7 +24,7 @@ export const {
   failure: mockFetchWifiKeysFailure,
 }: ResponseFixtures<
   FetchWifiKeysResponse,
-  {| message: string |}
+  { message: string }
 > = makeResponseFixtures({
   method: GET,
   path: WIFI_KEYS_PATH,
@@ -42,7 +41,7 @@ export const {
   failure: mockPostWifiKeysFailure,
 }: ResponseFixtures<
   PostWifiKeysResponse,
-  {| message: string |}
+  { message: string }
 > = makeResponseFixtures({
   method: POST,
   path: WIFI_KEYS_PATH,
diff --git a/app/src/redux/networking/__fixtures__/list.ts b/app/src/redux/networking/__fixtures__/list.ts
index bfb41cc5a91..1079af27892 100644
--- a/app/src/redux/networking/__fixtures__/list.ts
+++ b/app/src/redux/networking/__fixtures__/list.ts
@@ -1,4 +1,3 @@
-// @flow
 // fixtures for /wifi/list
 
 import { GET } from '../../robot-api'
@@ -28,7 +27,7 @@ const {
   failure,
 }: ResponseFixtures<
   WifiListResponse,
-  {| message: string |}
+  { message: string }
 > = makeResponseFixtures({
   method: GET,
   path: WIFI_LIST_PATH,
diff --git a/app/src/redux/networking/__fixtures__/status.ts b/app/src/redux/networking/__fixtures__/status.ts
index f78f94edae9..294ca7867d0 100644
--- a/app/src/redux/networking/__fixtures__/status.ts
+++ b/app/src/redux/networking/__fixtures__/status.ts
@@ -1,4 +1,3 @@
-// @flow
 // fixtures for /networking/status
 
 import { GET } from '../../robot-api'
@@ -8,9 +7,9 @@ import {
 } from '../../robot-api/__fixtures__'
 
 import type { ResponseFixtures } from '../../robot-api/__fixtures__'
-import type { NetworkingStatusResponse } from '../types'
+import type { NetworkingStatusResponse, InterfaceStatus } from '../types'
 
-export const mockWifiInterface = {
+export const mockWifiInterface: InterfaceStatus = {
   ipAddress: '192.168.43.97/24',
   macAddress: 'B8:27:EB:6C:95:CF',
   gatewayAddress: '192.168.43.161',
@@ -18,7 +17,7 @@ export const mockWifiInterface = {
   type: 'wifi',
 }
 
-export const mockEthernetInterface = {
+export const mockEthernetInterface: InterfaceStatus = {
   ipAddress: '169.254.229.173/16',
   macAddress: 'B8:27:EB:39:C0:9A',
   gatewayAddress: null,
@@ -41,7 +40,7 @@ const {
   failure,
 }: ResponseFixtures<
   NetworkingStatusResponse,
-  {| message: string |}
+  { message: string }
 > = makeResponseFixtures({
   method: GET,
   path: '/networking/status',
diff --git a/app/src/redux/networking/__tests__/actions.test.ts b/app/src/redux/networking/__tests__/actions.test.ts
index 38914409f14..8b74a61ea0e 100644
--- a/app/src/redux/networking/__tests__/actions.test.ts
+++ b/app/src/redux/networking/__tests__/actions.test.ts
@@ -1,20 +1,18 @@
-// @flow
-
 import { mockRobot, mockRequestMeta } from '../../robot-api/__fixtures__'
 import * as Actions from '../actions'
 import * as Fixtures from '../__fixtures__'
 
 import type { NetworkingAction } from '../types'
 
-type ActionSpec = {|
-  name: string,
-  creator: (...Array<any>) => mixed,
-  args: Array<mixed>,
-  expected: NetworkingAction,
-|}
+interface ActionSpec {
+  name: string
+  creator: (...args: any[]) => unknown
+  args: unknown[]
+  expected: NetworkingAction
+}
 
 describe('networking actions', () => {
-  const SPECS: Array<ActionSpec> = [
+  const SPECS: ActionSpec[] = [
     {
       name: 'can create networking:FETCH_STATUS',
       creator: Actions.fetchStatus,
@@ -22,7 +20,7 @@ describe('networking actions', () => {
       expected: {
         type: 'networking:FETCH_STATUS',
         payload: { robotName: mockRobot.name },
-        meta: {},
+        meta: {} as any,
       },
     },
     {
@@ -68,7 +66,7 @@ describe('networking actions', () => {
       expected: {
         type: 'networking:FETCH_WIFI_LIST',
         payload: { robotName: mockRobot.name },
-        meta: {},
+        meta: {} as any,
       },
     },
     {
@@ -115,7 +113,7 @@ describe('networking actions', () => {
           robotName: mockRobot.name,
           options: { ssid: 'network-name', psk: 'network-password' },
         },
-        meta: {},
+        meta: {} as any,
       },
     },
     {
@@ -155,7 +153,7 @@ describe('networking actions', () => {
       expected: {
         type: 'networking:FETCH_WIFI_KEYS',
         payload: { robotName: mockRobot.name },
-        meta: {},
+        meta: {} as any,
       },
     },
     {
@@ -191,14 +189,14 @@ describe('networking actions', () => {
     {
       name: 'can create networking:POST_WIFI_KEYS',
       creator: Actions.postWifiKeys,
-      args: [mockRobot.name, (({ name: 'key.crt' }: any): File)],
+      args: [mockRobot.name, { name: 'key.crt' } as File],
       expected: {
         type: 'networking:POST_WIFI_KEYS',
         payload: {
           robotName: mockRobot.name,
-          keyFile: (({ name: 'key.crt' }: any): File),
+          keyFile: { name: 'key.crt' } as File,
         },
-        meta: {},
+        meta: {} as any,
       },
     },
     {
@@ -238,7 +236,7 @@ describe('networking actions', () => {
       expected: {
         type: 'networking:FETCH_EAP_OPTIONS',
         payload: { robotName: mockRobot.name },
-        meta: {},
+        meta: {} as any,
       },
     },
     {
@@ -281,7 +279,7 @@ describe('networking actions', () => {
           robotName: mockRobot.name,
           ...Fixtures.mockNetworkingDisconnect,
         },
-        meta: {},
+        meta: {} as any,
       },
     },
     {
diff --git a/app/src/redux/networking/__tests__/reducer.test.ts b/app/src/redux/networking/__tests__/reducer.test.ts
index 6fc8689a0a4..7f9c97dd3e8 100644
--- a/app/src/redux/networking/__tests__/reducer.test.ts
+++ b/app/src/redux/networking/__tests__/reducer.test.ts
@@ -1,4 +1,3 @@
-// @flow
 import * as Fixtures from '../__fixtures__'
 import { networkingReducer } from '../reducer'
 import * as Actions from '../actions'
@@ -6,23 +5,23 @@ import * as Actions from '../actions'
 import type { Action } from '../../types'
 import type { NetworkingState } from '../types'
 
-type ReducerSpec = {|
-  name: string,
-  state: NetworkingState,
-  action: Action,
-  expected: NetworkingState,
-|}
+interface ReducerSpec {
+  name: string
+  state: NetworkingState
+  action: Action
+  expected: NetworkingState
+}
 
 const ROBOT_NAME = 'robotName'
 
-const SPECS: Array<ReducerSpec> = [
+const SPECS: ReducerSpec[] = [
   {
     name: 'handles fetch status success action',
     action: Actions.fetchStatusSuccess(
       ROBOT_NAME,
       Fixtures.mockNetworkingStatus.status,
       Fixtures.mockNetworkingStatus.interfaces,
-      {}
+      {} as any
     ),
     state: {
       [ROBOT_NAME]: {
@@ -42,7 +41,7 @@ const SPECS: Array<ReducerSpec> = [
     action: Actions.fetchWifiListSuccess(
       ROBOT_NAME,
       [Fixtures.mockWifiNetwork],
-      {}
+      {} as any
     ),
     state: {
       [ROBOT_NAME]: {
@@ -64,7 +63,7 @@ const SPECS: Array<ReducerSpec> = [
     action: Actions.fetchWifiKeysSuccess(
       ROBOT_NAME,
       [Fixtures.mockWifiKey],
-      {}
+      {} as any
     ),
     state: {
       [ROBOT_NAME]: {
@@ -86,7 +85,7 @@ const SPECS: Array<ReducerSpec> = [
     action: Actions.postWifiKeysSuccess(
       ROBOT_NAME,
       { ...Fixtures.mockWifiKey, id: 'foobar' },
-      {}
+      {} as any
     ),
     state: {
       [ROBOT_NAME]: {
@@ -110,7 +109,7 @@ const SPECS: Array<ReducerSpec> = [
     name: 'handles post wifi keys success action with requestId',
     action: Actions.postWifiKeysSuccess(ROBOT_NAME, Fixtures.mockWifiKey, {
       requestId: 'request-id',
-    }),
+    } as any),
     state: {
       [ROBOT_NAME]: {
         wifiList: [],
@@ -133,7 +132,11 @@ const SPECS: Array<ReducerSpec> = [
   },
   {
     name: 'handles post wifi keys success action with existing key',
-    action: Actions.postWifiKeysSuccess(ROBOT_NAME, Fixtures.mockWifiKey, {}),
+    action: Actions.postWifiKeysSuccess(
+      ROBOT_NAME,
+      Fixtures.mockWifiKey,
+      {} as any
+    ),
     state: {
       [ROBOT_NAME]: {
         wifiList: [],
@@ -157,7 +160,7 @@ const SPECS: Array<ReducerSpec> = [
         { ...Fixtures.mockWifiKey, id: 'def' },
         { ...Fixtures.mockWifiKey, id: 'abc' },
       ],
-      {}
+      {} as any
     ),
     state: {
       [ROBOT_NAME]: {
@@ -185,7 +188,7 @@ const SPECS: Array<ReducerSpec> = [
     action: Actions.fetchWifiKeysSuccess(
       ROBOT_NAME,
       [{ ...Fixtures.mockWifiKey, id: 'abc' }],
-      {}
+      {} as any
     ),
     state: {
       [ROBOT_NAME]: {
@@ -212,7 +215,7 @@ const SPECS: Array<ReducerSpec> = [
     action: Actions.fetchEapOptionsSuccess(
       ROBOT_NAME,
       [Fixtures.mockEapOption],
-      {}
+      {} as any
     ),
     state: {
       [ROBOT_NAME]: { wifiKeyIds: [], wifiKeysById: {}, eapOptions: [] },
diff --git a/app/src/redux/networking/__tests__/selectors.test.ts b/app/src/redux/networking/__tests__/selectors.test.ts
index e4958e9948c..c55ecf0b219 100644
--- a/app/src/redux/networking/__tests__/selectors.test.ts
+++ b/app/src/redux/networking/__tests__/selectors.test.ts
@@ -1,4 +1,3 @@
-// @flow
 import noop from 'lodash/noop'
 import * as Discovery from '../../discovery'
 import * as Selectors from '../selectors'
@@ -10,30 +9,29 @@ import type { State } from '../../types'
 jest.mock('../../config/selectors')
 jest.mock('../../discovery/selectors')
 
-const getRobotApiVersionByName: JestMockFn<
-  [State, string],
-  $Call<typeof Discovery.getRobotApiVersionByName, State, string>
-> = Discovery.getRobotApiVersionByName
+const getRobotApiVersionByName = Discovery.getRobotApiVersionByName as jest.MockedFunction<
+  typeof Discovery.getRobotApiVersionByName
+>
 
-type SelectorSpec = {|
-  name: string,
-  selector: ($Shape<State>, ...Array<any>) => mixed,
-  state: $Shape<State>,
-  args?: Array<any>,
-  before?: (spec: SelectorSpec) => mixed,
-  expected: mixed,
-|}
+interface SelectorSpec {
+  name: string
+  selector: (state: State, ...args: any[]) => unknown
+  state: State
+  args?: any[]
+  before?: (spec: SelectorSpec) => unknown
+  expected: unknown
+}
 
 describe('robot settings selectors', () => {
   afterEach(() => {
     jest.resetAllMocks()
   })
 
-  const SPECS: Array<SelectorSpec> = [
+  const SPECS: SelectorSpec[] = [
     {
       name: 'getInternetStatus returns null if unavailable',
       selector: Selectors.getInternetStatus,
-      state: { networking: {} },
+      state: { networking: {} } as any,
       args: ['robotName'],
       expected: null,
     },
@@ -46,14 +44,14 @@ describe('robot settings selectors', () => {
             internetStatus: Constants.STATUS_FULL,
           },
         },
-      },
+      } as any,
       args: ['robotName'],
       expected: Constants.STATUS_FULL,
     },
     {
       name: 'getNetworkInterfaces returns null if unavailable',
       selector: Selectors.getNetworkInterfaces,
-      state: { networking: {} },
+      state: { networking: {} } as any,
       args: ['robotName'],
       expected: { wifi: null, ethernet: null },
     },
@@ -69,7 +67,7 @@ describe('robot settings selectors', () => {
             },
           },
         },
-      },
+      } as any,
       args: ['robotName'],
       expected: {
         wifi: {
@@ -100,7 +98,7 @@ describe('robot settings selectors', () => {
             },
           },
         },
-      },
+      } as any,
       args: ['robotName'],
       expected: {
         wifi: null,
@@ -126,7 +124,7 @@ describe('robot settings selectors', () => {
             },
           },
         },
-      },
+      } as any,
       args: ['robotName'],
       expected: {
         ethernet: null,
@@ -143,7 +141,7 @@ describe('robot settings selectors', () => {
       selector: Selectors.getWifiList,
       state: {
         networking: {},
-      },
+      } as any,
       args: ['robotName'],
       expected: [],
     },
@@ -156,7 +154,7 @@ describe('robot settings selectors', () => {
             wifiList: [Fixtures.mockWifiNetwork],
           },
         },
-      },
+      } as any,
       args: ['robotName'],
       expected: [Fixtures.mockWifiNetwork],
     },
@@ -169,7 +167,7 @@ describe('robot settings selectors', () => {
             wifiList: [Fixtures.mockWifiNetwork, Fixtures.mockWifiNetwork],
           },
         },
-      },
+      } as any,
       args: ['robotName'],
       expected: [Fixtures.mockWifiNetwork],
     },
@@ -186,7 +184,7 @@ describe('robot settings selectors', () => {
             ],
           },
         },
-      },
+      } as any,
       args: ['robotName'],
       expected: [
         { ...Fixtures.mockWifiNetwork, active: true, ssid: 'zzz' },
@@ -207,7 +205,7 @@ describe('robot settings selectors', () => {
             ],
           },
         },
-      },
+      } as any,
       args: ['robotName'],
       expected: [
         { ...Fixtures.mockWifiNetwork, active: true, ssid: 'aaa' },
@@ -219,7 +217,7 @@ describe('robot settings selectors', () => {
       selector: Selectors.getWifiKeys,
       state: {
         networking: {},
-      },
+      } as any,
       args: ['robotName'],
       expected: [],
     },
@@ -236,7 +234,7 @@ describe('robot settings selectors', () => {
             },
           },
         },
-      },
+      } as any,
       args: ['robotName'],
       expected: [
         { ...Fixtures.mockWifiKey, id: 'abc' },
@@ -256,7 +254,7 @@ describe('robot settings selectors', () => {
             },
           },
         },
-      },
+      } as any,
       args: ['robotName', 'foobar'],
       expected: { ...Fixtures.mockWifiKey, id: 'abc', requestId: 'foobar' },
     },
@@ -273,7 +271,7 @@ describe('robot settings selectors', () => {
             },
           },
         },
-      },
+      } as any,
       args: ['robotName', 'foobar'],
       expected: null,
     },
@@ -282,7 +280,7 @@ describe('robot settings selectors', () => {
       selector: Selectors.getEapOptions,
       state: {
         networking: {},
-      },
+      } as any,
       args: ['robotName'],
       expected: [],
     },
@@ -295,7 +293,7 @@ describe('robot settings selectors', () => {
             eapOptions: [Fixtures.mockEapOption],
           },
         },
-      },
+      } as any,
       args: ['robotName'],
       expected: [Fixtures.mockEapOption],
     },
@@ -308,7 +306,7 @@ describe('robot settings selectors', () => {
             wifiList: [{ ...Fixtures.mockWifiNetwork, active: true }],
           },
         },
-      },
+      } as any,
       args: ['robotName'],
       before: ({ state: mockState }) => {
         getRobotApiVersionByName.mockImplementation((state, robotName) => {
diff --git a/app/src/redux/networking/actions.ts b/app/src/redux/networking/actions.ts
index 414bc248de1..8f685ca06fc 100644
--- a/app/src/redux/networking/actions.ts
+++ b/app/src/redux/networking/actions.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import * as Constants from './constants'
 import * as Types from './types'
 
@@ -45,7 +43,7 @@ export const fetchWifiList = (
 
 export const fetchWifiListSuccess = (
   robotName: string,
-  wifiList: Array<Types.WifiNetwork>,
+  wifiList: Types.WifiNetwork[],
   meta: RobotApiRequestMeta
 ): Types.FetchWifiListSuccessAction => ({
   type: Constants.FETCH_WIFI_LIST_SUCCESS,
@@ -102,7 +100,7 @@ export const fetchWifiKeys = (
 
 export const fetchWifiKeysSuccess = (
   robotName: string,
-  wifiKeys: Array<Types.ApiWifiKey>,
+  wifiKeys: Types.ApiWifiKey[],
   meta: RobotApiRequestMeta
 ): Types.FetchWifiKeysSuccessAction => ({
   type: Constants.FETCH_WIFI_KEYS_SUCCESS,
@@ -159,7 +157,7 @@ export const fetchEapOptions = (
 
 export const fetchEapOptionsSuccess = (
   robotName: string,
-  eapOptions: Array<Types.EapOption>,
+  eapOptions: Types.EapOption[],
   meta: RobotApiRequestMeta
 ): Types.FetchEapOptionsSuccessAction => ({
   type: Constants.FETCH_EAP_OPTIONS_SUCCESS,
diff --git a/app/src/redux/networking/api-types.ts b/app/src/redux/networking/api-types.ts
index 86dba5276cf..5c807e5eaec 100644
--- a/app/src/redux/networking/api-types.ts
+++ b/app/src/redux/networking/api-types.ts
@@ -1,6 +1,4 @@
-// @flow
-
-import typeof {
+import {
   STATUS_NONE,
   STATUS_PORTAL,
   STATUS_LIMITED,
@@ -23,116 +21,115 @@ import typeof {
 // GET /networking/status
 
 export type InternetStatus =
-  | STATUS_NONE
-  | STATUS_PORTAL
-  | STATUS_LIMITED
-  | STATUS_FULL
-  | STATUS_UNKNOWN
+  | typeof STATUS_NONE
+  | typeof STATUS_PORTAL
+  | typeof STATUS_LIMITED
+  | typeof STATUS_FULL
+  | typeof STATUS_UNKNOWN
 
 export type InterfaceState =
-  | INTERFACE_CONNECTED
-  | INTERFACE_CONNECTING
-  | INTERFACE_DISCONNECTED
-  | INTERFACE_UNAVAILABLE
-
-export type InterfaceType = INTERFACE_WIFI | INTERFACE_ETHERNET
-
-export type InterfaceStatus = {|
-  ipAddress: string | null,
-  macAddress: string,
-  gatewayAddress: string | null,
-  state: InterfaceState,
-  type: InterfaceType,
-|}
-
-export type InterfaceStatusMap = $Shape<{|
-  [device: string]: InterfaceStatus,
-|}>
-
-export type NetworkingStatusResponse = {|
-  status: InternetStatus,
-  interfaces: InterfaceStatusMap,
-|}
+  | typeof INTERFACE_CONNECTED
+  | typeof INTERFACE_CONNECTING
+  | typeof INTERFACE_DISCONNECTED
+  | typeof INTERFACE_UNAVAILABLE
+
+export type InterfaceType = typeof INTERFACE_WIFI | typeof INTERFACE_ETHERNET
+
+export interface InterfaceStatus {
+  ipAddress: string | null
+  macAddress: string
+  gatewayAddress: string | null
+  state: InterfaceState
+  type: InterfaceType
+}
+
+export type InterfaceStatusMap = Partial<{
+  [device: string]: InterfaceStatus
+}>
+
+export interface NetworkingStatusResponse {
+  status: InternetStatus
+  interfaces: InterfaceStatusMap
+}
 
 // GET /wifi/list
 
 export type WifiSecurityType =
-  | SECURITY_NONE
-  | SECURITY_WPA_PSK
-  | SECURITY_WPA_EAP
-
-export type WifiNetwork = {|
-  ssid: string,
-  signal: number,
-  active: boolean,
-  security: string,
-  securityType: WifiSecurityType,
-|}
-
-export type WifiListResponse = {|
-  list: Array<WifiNetwork>,
-|}
+  | typeof SECURITY_NONE
+  | typeof SECURITY_WPA_PSK
+  | typeof SECURITY_WPA_EAP
+
+export interface WifiNetwork {
+  ssid: string
+  signal: number
+  active: boolean
+  security: string
+  securityType: WifiSecurityType
+}
+
+export interface WifiListResponse {
+  list: WifiNetwork[]
+}
 
 // POST /wifi/configure
 
-export type WifiEapConfig = {|
-  [eapOption: string]: string,
-  eapType: string,
-|}
+export interface WifiEapConfig {
+  [eapOption: string]: string
+  eapType: string
+}
 
-export type WifiConfigureRequest = {|
-  ssid: string,
-  psk?: string,
-  securityType?: WifiSecurityType,
-  hidden?: boolean,
-  eapConfig?: WifiEapConfig,
-|}
+export interface WifiConfigureRequest {
+  ssid: string
+  psk?: string
+  securityType?: WifiSecurityType
+  hidden?: boolean
+  eapConfig?: WifiEapConfig
+}
 
-export type WifiConfigureResponse = {|
-  ssid: string,
-  message: string,
-|}
+export interface WifiConfigureResponse {
+  ssid: string
+  message: string
+}
 
 // GET /wifi/keys
 
-export type ApiWifiKey = {|
-  id: string,
-  uri: string,
-  name: string,
-|}
+export interface ApiWifiKey {
+  id: string
+  uri: string
+  name: string
+}
 
-export type FetchWifiKeysResponse = {|
-  keys: Array<ApiWifiKey>,
-|}
+export interface FetchWifiKeysResponse {
+  keys: ApiWifiKey[]
+}
 
 // POST /wifi/keys
 
-export type PostWifiKeysResponse = {|
-  ...ApiWifiKey,
-  message?: string,
-|}
+export interface PostWifiKeysResponse extends ApiWifiKey {
+  message?: string
+}
 
 // GET /wifi/eap-options
 
 export type WifiAuthFieldType =
-  | AUTH_TYPE_STRING
-  | AUTH_TYPE_PASSWORD
-  | AUTH_TYPE_FILE
-
-export type WifiAuthField = {|
-  name: string,
-  displayName: string,
-  required: boolean,
-  type: WifiAuthFieldType,
-|}
-
-export type EapOption = {|
-  name: string,
+  | typeof AUTH_TYPE_STRING
+  | typeof AUTH_TYPE_PASSWORD
+  | typeof AUTH_TYPE_FILE
+
+export interface WifiAuthField {
+  name: string
+  displayName: string
+  required: boolean
+  type: WifiAuthFieldType
+}
+
+export interface EapOption {
+  name: string
   // displayName added to response in API v3.4.0
-  displayName?: string,
-  options: Array<WifiAuthField>,
-|}
+  displayName?: string
+  options: WifiAuthField[]
+}
 
-export type FetchEapOptionsResponse = {|
-  options: Array<EapOption>,
-|}
+export interface FetchEapOptionsResponse {
+  options: EapOption[]
+}
diff --git a/app/src/redux/networking/constants.ts b/app/src/redux/networking/constants.ts
index dc9609bd229..d8cf2e43f51 100644
--- a/app/src/redux/networking/constants.ts
+++ b/app/src/redux/networking/constants.ts
@@ -1,5 +1,3 @@
-// @flow
-
 // common constants
 
 export const STATUS_NONE: 'none' = 'none'
diff --git a/app/src/redux/networking/epic/__tests__/disconnectEpic.test.ts b/app/src/redux/networking/epic/__tests__/disconnectEpic.test.ts
index c7a34a0c5ad..6cc46050e74 100644
--- a/app/src/redux/networking/epic/__tests__/disconnectEpic.test.ts
+++ b/app/src/redux/networking/epic/__tests__/disconnectEpic.test.ts
@@ -1,9 +1,10 @@
-// @flow
 import { setupEpicTestMocks, runEpicTest } from '../../../robot-api/__utils__'
 import * as Fixtures from '../../__fixtures__'
 import * as Actions from '../../actions'
 import { networkingEpic } from '..'
 
+import type { Action } from '../../../types'
+
 const makeTriggerAction = (robotName: string) =>
   Actions.postWifiDisconnect(robotName, 'network-name')
 
@@ -18,7 +19,7 @@ describe('networking disconnectEpic', () => {
       Fixtures.mockNetworkingDisconnectSuccess
     )
 
-    runEpicTest(mocks, ({ hot, expectObservable, flush }) => {
+    runEpicTest<Action>(mocks, ({ hot, expectObservable, flush }) => {
       const action$ = hot('--a', { a: mocks.action })
       const state$ = hot('s-s', { s: mocks.state })
       const output$ = networkingEpic(action$, state$)
@@ -80,7 +81,7 @@ describe('networking disconnectEpic', () => {
 
   it('dispatches FETCH_WIFI_LIST on POST_WIFI_DISCONNECT_SUCCESS', () => {
     const mocks = setupEpicTestMocks(robotName =>
-      Actions.postWifiDisconnectSuccess(robotName, {})
+      Actions.postWifiDisconnectSuccess(robotName, {} as any)
     )
 
     runEpicTest(mocks, ({ hot, expectObservable }) => {
diff --git a/app/src/redux/networking/epic/__tests__/fetchEapOptionsEpic.test.ts b/app/src/redux/networking/epic/__tests__/fetchEapOptionsEpic.test.ts
index 096fafbae31..7ef7b7db242 100644
--- a/app/src/redux/networking/epic/__tests__/fetchEapOptionsEpic.test.ts
+++ b/app/src/redux/networking/epic/__tests__/fetchEapOptionsEpic.test.ts
@@ -1,10 +1,12 @@
-// @flow
 import { setupEpicTestMocks, runEpicTest } from '../../../robot-api/__utils__'
 import * as Fixtures from '../../__fixtures__'
 import * as Actions from '../../actions'
 import { networkingEpic } from '..'
 
-const makeTriggerAction = robotName => Actions.fetchEapOptions(robotName)
+import type { Action } from '../../../types'
+
+const makeTriggerAction = (robotName: string) =>
+  Actions.fetchEapOptions(robotName)
 
 describe('networking fetch eap option epic', () => {
   afterEach(() => {
@@ -17,7 +19,7 @@ describe('networking fetch eap option epic', () => {
       Fixtures.mockFetchEapOptionsSuccess
     )
 
-    runEpicTest(mocks, ({ hot, expectObservable, flush }) => {
+    runEpicTest<Action>(mocks, ({ hot, expectObservable, flush }) => {
       const action$ = hot('--a', { a: mocks.action })
       const state$ = hot('s-s', { s: mocks.state })
       const output$ = networkingEpic(action$, state$)
@@ -38,7 +40,7 @@ describe('networking fetch eap option epic', () => {
       Fixtures.mockFetchEapOptionsSuccess
     )
 
-    runEpicTest(mocks, ({ hot, expectObservable }) => {
+    runEpicTest<Action>(mocks, ({ hot, expectObservable }) => {
       const action$ = hot('--a', { a: mocks.action })
       const state$ = hot('s-s', { s: mocks.state })
       const output$ = networkingEpic(action$, state$)
@@ -59,7 +61,7 @@ describe('networking fetch eap option epic', () => {
       Fixtures.mockFetchEapOptionsFailure
     )
 
-    runEpicTest(mocks, ({ hot, expectObservable }) => {
+    runEpicTest<Action>(mocks, ({ hot, expectObservable }) => {
       const action$ = hot('--a', { a: mocks.action })
       const state$ = hot('s-s', { s: mocks.state })
       const output$ = networkingEpic(action$, state$)
diff --git a/app/src/redux/networking/epic/__tests__/fetchWifiKeysEpic.test.ts b/app/src/redux/networking/epic/__tests__/fetchWifiKeysEpic.test.ts
index 55c74edc3c5..2ef826c5b98 100644
--- a/app/src/redux/networking/epic/__tests__/fetchWifiKeysEpic.test.ts
+++ b/app/src/redux/networking/epic/__tests__/fetchWifiKeysEpic.test.ts
@@ -1,10 +1,12 @@
-// @flow
 import { setupEpicTestMocks, runEpicTest } from '../../../robot-api/__utils__'
 import * as Fixtures from '../../__fixtures__'
 import * as Actions from '../../actions'
 import { networkingEpic } from '..'
 
-const makeTriggerAction = robotName => Actions.fetchWifiKeys(robotName)
+import type { Action } from '../../../types'
+
+const makeTriggerAction = (robotName: string) =>
+  Actions.fetchWifiKeys(robotName)
 
 describe('networking fetch wifi keys epic', () => {
   afterEach(() => {
@@ -17,7 +19,7 @@ describe('networking fetch wifi keys epic', () => {
       Fixtures.mockFetchWifiKeysSuccess
     )
 
-    runEpicTest(mocks, ({ hot, expectObservable, flush }) => {
+    runEpicTest<Action>(mocks, ({ hot, expectObservable, flush }) => {
       const action$ = hot('--a', { a: mocks.action })
       const state$ = hot('s-s', { s: mocks.state })
       const output$ = networkingEpic(action$, state$)
diff --git a/app/src/redux/networking/epic/__tests__/postWifiKeysEpic.test.ts b/app/src/redux/networking/epic/__tests__/postWifiKeysEpic.test.ts
index 62646377689..f1009a7407b 100644
--- a/app/src/redux/networking/epic/__tests__/postWifiKeysEpic.test.ts
+++ b/app/src/redux/networking/epic/__tests__/postWifiKeysEpic.test.ts
@@ -1,11 +1,13 @@
-// @flow
 import { setupEpicTestMocks, runEpicTest } from '../../../robot-api/__utils__'
 import * as Fixtures from '../../__fixtures__'
 import * as Actions from '../../actions'
 import { networkingEpic } from '..'
 
+import type { Action } from '../../../types'
+
 const keyFile = new File([Buffer.from('contents')], 'key.crt')
-const makeTriggerAction = robotName => Actions.postWifiKeys(robotName, keyFile)
+const makeTriggerAction = (robotName: string) =>
+  Actions.postWifiKeys(robotName, keyFile)
 
 describe('networking post wifi keys epic', () => {
   afterEach(() => {
@@ -18,7 +20,7 @@ describe('networking post wifi keys epic', () => {
       Fixtures.mockPostWifiKeysSuccess
     )
 
-    runEpicTest(mocks, ({ hot, expectObservable, flush }) => {
+    runEpicTest<Action>(mocks, ({ hot, expectObservable, flush }) => {
       const action$ = hot('--a', { a: mocks.action })
       const state$ = hot('s-s', { s: mocks.state })
       const output$ = networkingEpic(action$, state$)
@@ -43,7 +45,7 @@ describe('networking post wifi keys epic', () => {
       Fixtures.mockPostWifiKeysSuccess
     )
 
-    runEpicTest(mocks, ({ hot, expectObservable }) => {
+    runEpicTest<Action>(mocks, ({ hot, expectObservable }) => {
       const action$ = hot('--a', { a: mocks.action })
       const state$ = hot('s-s', { s: mocks.state })
       const output$ = networkingEpic(action$, state$)
@@ -63,7 +65,7 @@ describe('networking post wifi keys epic', () => {
       Fixtures.mockPostWifiKeysFailure
     )
 
-    runEpicTest(mocks, ({ hot, expectObservable }) => {
+    runEpicTest<Action>(mocks, ({ hot, expectObservable }) => {
       const action$ = hot('--a', { a: mocks.action })
       const state$ = hot('s-s', { s: mocks.state })
       const output$ = networkingEpic(action$, state$)
diff --git a/app/src/redux/networking/epic/__tests__/statusEpic.test.ts b/app/src/redux/networking/epic/__tests__/statusEpic.test.ts
index ef1be26957c..16a09cba35a 100644
--- a/app/src/redux/networking/epic/__tests__/statusEpic.test.ts
+++ b/app/src/redux/networking/epic/__tests__/statusEpic.test.ts
@@ -1,10 +1,11 @@
-// @flow
 import { setupEpicTestMocks, runEpicTest } from '../../../robot-api/__utils__'
 import * as Fixtures from '../../__fixtures__'
 import * as Actions from '../../actions'
 import { networkingEpic } from '..'
 
-const makeTriggerAction = robotName => Actions.fetchStatus(robotName)
+import type { Action } from '../../../types'
+
+const makeTriggerAction = (robotName: string) => Actions.fetchStatus(robotName)
 
 describe('networking statusEpic', () => {
   afterEach(() => {
@@ -17,7 +18,7 @@ describe('networking statusEpic', () => {
       Fixtures.mockNetworkingStatusSuccess
     )
 
-    runEpicTest(mocks, ({ hot, expectObservable, flush }) => {
+    runEpicTest<Action>(mocks, ({ hot, expectObservable, flush }) => {
       const action$ = hot('--a', { a: mocks.action })
       const state$ = hot('s-s', { s: mocks.state })
       const output$ = networkingEpic(action$, state$)
diff --git a/app/src/redux/networking/epic/__tests__/wifiConfigureEpic.test.ts b/app/src/redux/networking/epic/__tests__/wifiConfigureEpic.test.ts
index fced46e3eae..41875242f31 100644
--- a/app/src/redux/networking/epic/__tests__/wifiConfigureEpic.test.ts
+++ b/app/src/redux/networking/epic/__tests__/wifiConfigureEpic.test.ts
@@ -1,4 +1,3 @@
-// @flow
 import { setupEpicTestMocks, runEpicTest } from '../../../robot-api/__utils__'
 
 import * as Discovery from '../../../discovery'
@@ -6,7 +5,9 @@ import * as Fixtures from '../../__fixtures__'
 import * as Actions from '../../actions'
 import { networkingEpic } from '..'
 
-const makeTriggerAction = robotName =>
+import type { Action } from '../../../types'
+
+const makeTriggerAction = (robotName: string) =>
   Actions.postWifiConfigure(robotName, {
     ssid: 'network-name',
     psk: 'network-password',
@@ -23,7 +24,7 @@ describe('networking wifiConfigureEpic', () => {
       Fixtures.mockWifiConfigureSuccess
     )
 
-    runEpicTest(mocks, ({ hot, expectObservable, flush }) => {
+    runEpicTest<Action>(mocks, ({ hot, expectObservable, flush }) => {
       const action$ = hot('--a', { a: mocks.action })
       const state$ = hot('s-s', { s: mocks.state })
       const output$ = networkingEpic(action$, state$)
@@ -45,7 +46,7 @@ describe('networking wifiConfigureEpic', () => {
       Fixtures.mockWifiConfigureSuccess
     )
 
-    runEpicTest(mocks, ({ hot, expectObservable }) => {
+    runEpicTest<Action>(mocks, ({ hot, expectObservable }) => {
       const action$ = hot('--a', { a: mocks.action })
       const state$ = hot('s-s', { s: mocks.state })
       const output$ = networkingEpic(action$, state$)
@@ -66,7 +67,7 @@ describe('networking wifiConfigureEpic', () => {
       Fixtures.mockWifiConfigureFailure
     )
 
-    runEpicTest(mocks, ({ hot, expectObservable }) => {
+    runEpicTest<Action>(mocks, ({ hot, expectObservable }) => {
       const action$ = hot('--a', { a: mocks.action })
       const state$ = hot('s-s', { s: mocks.state })
       const output$ = networkingEpic(action$, state$)
@@ -83,10 +84,10 @@ describe('networking wifiConfigureEpic', () => {
 
   it('dispatches FETCH_WIFI_LIST and START_DISCOVERY on success', () => {
     const mocks = setupEpicTestMocks(robotName =>
-      Actions.postWifiConfigureSuccess(robotName, 'network-name', {})
+      Actions.postWifiConfigureSuccess(robotName, 'network-name', {} as any)
     )
 
-    runEpicTest(mocks, ({ hot, expectObservable }) => {
+    runEpicTest<Action>(mocks, ({ hot, expectObservable }) => {
       const action$ = hot('--a', { a: mocks.action })
       const state$ = hot('s-s', { s: mocks.state })
       const output$ = networkingEpic(action$, state$)
diff --git a/app/src/redux/networking/epic/__tests__/wifiListEpic.test.ts b/app/src/redux/networking/epic/__tests__/wifiListEpic.test.ts
index b0c7e69f5c8..aa2f227fffa 100644
--- a/app/src/redux/networking/epic/__tests__/wifiListEpic.test.ts
+++ b/app/src/redux/networking/epic/__tests__/wifiListEpic.test.ts
@@ -1,10 +1,12 @@
-// @flow
 import { setupEpicTestMocks, runEpicTest } from '../../../robot-api/__utils__'
 import * as Fixtures from '../../__fixtures__'
 import * as Actions from '../../actions'
 import { networkingEpic } from '..'
 
-const makeTriggerAction = robotName => Actions.fetchWifiList(robotName)
+import type { Action } from '../../../types'
+
+const makeTriggerAction = (robotName: string) =>
+  Actions.fetchWifiList(robotName)
 
 describe('networking wifiListEpic', () => {
   afterEach(() => {
@@ -17,7 +19,7 @@ describe('networking wifiListEpic', () => {
       Fixtures.mockWifiListSuccess
     )
 
-    runEpicTest(mocks, ({ hot, expectObservable, flush }) => {
+    runEpicTest<Action>(mocks, ({ hot, expectObservable, flush }) => {
       const action$ = hot('--a', { a: mocks.action })
       const state$ = hot('s-s', { s: mocks.state })
       const output$ = networkingEpic(action$, state$)
diff --git a/app/src/redux/networking/epic/disconnectEpic.ts b/app/src/redux/networking/epic/disconnectEpic.ts
index 2075dc7a185..176f886287f 100644
--- a/app/src/redux/networking/epic/disconnectEpic.ts
+++ b/app/src/redux/networking/epic/disconnectEpic.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import { ofType, combineEpics } from 'redux-observable'
 import { map } from 'rxjs/operators'
 
@@ -12,8 +10,11 @@ import type {
 import * as Actions from '../actions'
 import * as Constants from '../constants'
 
-import type { Epic } from '../../types'
-import type { PostWifiDisconnectAction } from '../types'
+import type { Action, Epic } from '../../types'
+import {
+  PostWifiDisconnectAction,
+  PostWifiDisconnectSuccessAction,
+} from '../types'
 
 const mapActionToRequest: ActionToRequestMapper<PostWifiDisconnectAction> = action => ({
   method: POST,
@@ -35,7 +36,7 @@ const mapResponseToAction: ResponseToActionMapper<PostWifiDisconnectAction> = (
 
 const postDisconnectEpic: Epic = (action$, state$) =>
   action$.pipe(
-    ofType(Constants.POST_WIFI_DISCONNECT),
+    ofType<Action, PostWifiDisconnectAction>(Constants.POST_WIFI_DISCONNECT),
     mapToRobotApiRequest(
       state$,
       a => a.payload.robotName,
@@ -46,12 +47,14 @@ const postDisconnectEpic: Epic = (action$, state$) =>
 
 const handlePostDisconnectNetworkSuccessEpic: Epic = action$ => {
   return action$.pipe(
-    ofType(Constants.POST_WIFI_DISCONNECT_SUCCESS),
+    ofType<Action, PostWifiDisconnectSuccessAction>(
+      Constants.POST_WIFI_DISCONNECT_SUCCESS
+    ),
     map(action => Actions.fetchWifiList(action.payload.robotName))
   )
 }
 
-export const disconnectEpic: Epic = combineEpics(
+export const disconnectEpic: Epic = combineEpics<Epic>(
   postDisconnectEpic,
   handlePostDisconnectNetworkSuccessEpic
 )
diff --git a/app/src/redux/networking/epic/fetchEapOptionsEpic.ts b/app/src/redux/networking/epic/fetchEapOptionsEpic.ts
index 13fa9f63917..4667558ad5b 100644
--- a/app/src/redux/networking/epic/fetchEapOptionsEpic.ts
+++ b/app/src/redux/networking/epic/fetchEapOptionsEpic.ts
@@ -1,4 +1,3 @@
-// @flow
 import { ofType } from 'redux-observable'
 
 import { GET } from '../../robot-api/constants'
@@ -10,15 +9,15 @@ import type {
   ActionToRequestMapper,
   ResponseToActionMapper,
 } from '../../robot-api/operators'
-import type { Epic } from '../../types'
-import type { FetchWifiKeysAction } from '../types'
+import type { Action, Epic } from '../../types'
+import { FetchEapOptionsAction } from '../types'
 
-const mapActionToRequest: ActionToRequestMapper<FetchWifiKeysAction> = action => ({
+const mapActionToRequest: ActionToRequestMapper<FetchEapOptionsAction> = action => ({
   method: GET,
   path: EAP_OPTIONS_PATH,
 })
 
-const mapResponseToAction: ResponseToActionMapper<FetchWifiKeysAction> = (
+const mapResponseToAction: ResponseToActionMapper<FetchEapOptionsAction> = (
   response,
   originalAction
 ) => {
@@ -32,7 +31,7 @@ const mapResponseToAction: ResponseToActionMapper<FetchWifiKeysAction> = (
 
 export const fetchEapOptionsEpic: Epic = (action$, state$) => {
   return action$.pipe(
-    ofType(FETCH_EAP_OPTIONS),
+    ofType<Action, FetchEapOptionsAction>(FETCH_EAP_OPTIONS),
     mapToRobotApiRequest(
       state$,
       a => a.payload.robotName,
diff --git a/app/src/redux/networking/epic/fetchWifiKeysEpic.ts b/app/src/redux/networking/epic/fetchWifiKeysEpic.ts
index e828918b83f..d0cdd41e08c 100644
--- a/app/src/redux/networking/epic/fetchWifiKeysEpic.ts
+++ b/app/src/redux/networking/epic/fetchWifiKeysEpic.ts
@@ -1,4 +1,3 @@
-// @flow
 import { ofType } from 'redux-observable'
 
 import { GET } from '../../robot-api/constants'
@@ -10,7 +9,7 @@ import type {
   ActionToRequestMapper,
   ResponseToActionMapper,
 } from '../../robot-api/operators'
-import type { Epic } from '../../types'
+import type { Action, Epic } from '../../types'
 import type { FetchWifiKeysAction } from '../types'
 
 const mapActionToRequest: ActionToRequestMapper<FetchWifiKeysAction> = action => ({
@@ -32,7 +31,7 @@ const mapResponseToAction: ResponseToActionMapper<FetchWifiKeysAction> = (
 
 export const fetchWifiKeysEpic: Epic = (action$, state$) => {
   return action$.pipe(
-    ofType(FETCH_WIFI_KEYS),
+    ofType<Action, FetchWifiKeysAction>(FETCH_WIFI_KEYS),
     mapToRobotApiRequest(
       state$,
       a => a.payload.robotName,
diff --git a/app/src/redux/networking/epic/index.ts b/app/src/redux/networking/epic/index.ts
index 2edf29ce8b3..7c568aeaab6 100644
--- a/app/src/redux/networking/epic/index.ts
+++ b/app/src/redux/networking/epic/index.ts
@@ -1,4 +1,3 @@
-// @flow
 import { combineEpics } from 'redux-observable'
 
 import { fetchEapOptionsEpic } from './fetchEapOptionsEpic'
@@ -11,7 +10,7 @@ import { disconnectEpic } from './disconnectEpic'
 
 import type { Epic } from '../../types'
 
-export const networkingEpic: Epic = combineEpics(
+export const networkingEpic: Epic = combineEpics<Epic>(
   fetchEapOptionsEpic,
   fetchWifiKeysEpic,
   postWifiKeysEpic,
diff --git a/app/src/redux/networking/epic/postWifiKeysEpic.ts b/app/src/redux/networking/epic/postWifiKeysEpic.ts
index eaaa2f21741..383a9c6bbf5 100644
--- a/app/src/redux/networking/epic/postWifiKeysEpic.ts
+++ b/app/src/redux/networking/epic/postWifiKeysEpic.ts
@@ -1,4 +1,3 @@
-// @flow
 import { ofType } from 'redux-observable'
 import omit from 'lodash/omit'
 
@@ -11,8 +10,8 @@ import type {
   ActionToRequestMapper,
   ResponseToActionMapper,
 } from '../../robot-api/operators'
-import type { Epic } from '../../types'
-import type { PostWifiKeysAction } from '../types'
+import type { Action, Epic } from '../../types'
+import type { PostWifiKeysAction, WifiKey } from '../types'
 
 const mapActionToRequest: ActionToRequestMapper<PostWifiKeysAction> = action => {
   const { keyFile } = action.payload
@@ -30,13 +29,13 @@ const mapResponseToAction: ResponseToActionMapper<PostWifiKeysAction> = (
   const meta = { ...originalAction.meta, response: responseMeta }
 
   return response.ok
-    ? postWifiKeysSuccess(host.name, omit(body, 'message'), meta)
+    ? postWifiKeysSuccess(host.name, omit(body, 'message') as WifiKey, meta)
     : postWifiKeysFailure(host.name, body, meta)
 }
 
 export const postWifiKeysEpic: Epic = (action$, state$) => {
   return action$.pipe(
-    ofType(POST_WIFI_KEYS),
+    ofType<Action, PostWifiKeysAction>(POST_WIFI_KEYS),
     mapToRobotApiRequest(
       state$,
       a => a.payload.robotName,
diff --git a/app/src/redux/networking/epic/statusEpic.ts b/app/src/redux/networking/epic/statusEpic.ts
index 40f437c3700..5779cfa6d97 100644
--- a/app/src/redux/networking/epic/statusEpic.ts
+++ b/app/src/redux/networking/epic/statusEpic.ts
@@ -1,4 +1,3 @@
-// @flow
 import { ofType } from 'redux-observable'
 
 import { GET } from '../../robot-api/constants'
@@ -10,7 +9,7 @@ import type {
   ActionToRequestMapper,
   ResponseToActionMapper,
 } from '../../robot-api/operators'
-import type { Epic } from '../../types'
+import type { Action, Epic } from '../../types'
 import type { FetchStatusAction } from '../types'
 
 const mapActionToRequest: ActionToRequestMapper<FetchStatusAction> = action => ({
@@ -32,7 +31,7 @@ const mapResponseToAction: ResponseToActionMapper<FetchStatusAction> = (
 
 export const statusEpic: Epic = (action$, state$) => {
   return action$.pipe(
-    ofType(Constants.FETCH_STATUS),
+    ofType<Action, FetchStatusAction>(Constants.FETCH_STATUS),
     mapToRobotApiRequest(
       state$,
       a => a.payload.robotName,
diff --git a/app/src/redux/networking/epic/wifiConfigureEpic.ts b/app/src/redux/networking/epic/wifiConfigureEpic.ts
index f4811e37d0c..84fb7bc04d0 100644
--- a/app/src/redux/networking/epic/wifiConfigureEpic.ts
+++ b/app/src/redux/networking/epic/wifiConfigureEpic.ts
@@ -1,4 +1,3 @@
-// @flow
 import { of } from 'rxjs'
 import { ofType, combineEpics } from 'redux-observable'
 import { switchMap } from 'rxjs/operators'
@@ -13,8 +12,11 @@ import type {
   ActionToRequestMapper,
   ResponseToActionMapper,
 } from '../../robot-api/operators'
-import type { Epic } from '../../types'
-import type { PostWifiConfigureAction } from '../types'
+import type { Action, Epic } from '../../types'
+import {
+  PostWifiConfigureAction,
+  PostWifiConfigureSuccessAction,
+} from '../types'
 
 const mapActionToRequest: ActionToRequestMapper<PostWifiConfigureAction> = action => ({
   method: POST,
@@ -36,7 +38,7 @@ const mapResponseToAction: ResponseToActionMapper<PostWifiConfigureAction> = (
 
 const postWifiConfigureEpic: Epic = (action$, state$) => {
   return action$.pipe(
-    ofType(Constants.POST_WIFI_CONFIGURE),
+    ofType<Action, PostWifiConfigureAction>(Constants.POST_WIFI_CONFIGURE),
     mapToRobotApiRequest(
       state$,
       a => a.payload.robotName,
@@ -48,14 +50,16 @@ const postWifiConfigureEpic: Epic = (action$, state$) => {
 
 const handleWifiConfigureSuccessEpic: Epic = action$ => {
   return action$.pipe(
-    ofType(Constants.POST_WIFI_CONFIGURE_SUCCESS),
+    ofType<Action, PostWifiConfigureSuccessAction>(
+      Constants.POST_WIFI_CONFIGURE_SUCCESS
+    ),
     switchMap(action =>
       of(Actions.fetchWifiList(action.payload.robotName), startDiscovery())
     )
   )
 }
 
-export const wifiConfigureEpic: Epic = combineEpics(
+export const wifiConfigureEpic: Epic = combineEpics<Epic>(
   postWifiConfigureEpic,
   handleWifiConfigureSuccessEpic
 )
diff --git a/app/src/redux/networking/epic/wifiListEpic.ts b/app/src/redux/networking/epic/wifiListEpic.ts
index 925b3a7695b..a3dac0408a6 100644
--- a/app/src/redux/networking/epic/wifiListEpic.ts
+++ b/app/src/redux/networking/epic/wifiListEpic.ts
@@ -1,4 +1,3 @@
-// @flow
 import { ofType } from 'redux-observable'
 
 import { GET } from '../../robot-api/constants'
@@ -10,7 +9,7 @@ import type {
   ActionToRequestMapper,
   ResponseToActionMapper,
 } from '../../robot-api/operators'
-import type { Epic } from '../../types'
+import type { Action, Epic } from '../../types'
 import type { FetchWifiListAction } from '../types'
 
 const mapActionToRequest: ActionToRequestMapper<FetchWifiListAction> = action => ({
@@ -32,7 +31,7 @@ const mapResponseToAction: ResponseToActionMapper<FetchWifiListAction> = (
 
 export const wifiListEpic: Epic = (action$, state$) => {
   return action$.pipe(
-    ofType(Constants.FETCH_WIFI_LIST),
+    ofType<Action, FetchWifiListAction>(Constants.FETCH_WIFI_LIST),
     mapToRobotApiRequest(
       state$,
       a => a.payload.robotName,
diff --git a/app/src/redux/networking/index.ts b/app/src/redux/networking/index.ts
index 375ed43fe48..497c8935180 100644
--- a/app/src/redux/networking/index.ts
+++ b/app/src/redux/networking/index.ts
@@ -1,5 +1,3 @@
-// @flow
-
 export * from './actions'
 export * from './constants'
 export * from './selectors'
diff --git a/app/src/redux/networking/reducer.ts b/app/src/redux/networking/reducer.ts
index d24c75f222f..e1449e864c8 100644
--- a/app/src/redux/networking/reducer.ts
+++ b/app/src/redux/networking/reducer.ts
@@ -1,4 +1,3 @@
-// @flow
 import intersection from 'lodash/intersection'
 import keyBy from 'lodash/keyBy'
 import union from 'lodash/union'
@@ -8,6 +7,7 @@ import * as Constants from './constants'
 
 import type { Action } from '../types'
 import type { NetworkingState, PerRobotNetworkingState } from './types'
+import { Reducer } from 'redux'
 
 const INITIAL_STATE: NetworkingState = {}
 const INITIAL_ROBOT_STATE: PerRobotNetworkingState = {}
@@ -17,10 +17,10 @@ const getRobotState = (
   robotName: string
 ): PerRobotNetworkingState => state[robotName] || INITIAL_ROBOT_STATE
 
-export function networkingReducer(
-  state: NetworkingState = INITIAL_STATE,
-  action: Action
-): NetworkingState {
+export const networkingReducer: Reducer<NetworkingState, Action> = (
+  state = INITIAL_STATE,
+  action
+) => {
   switch (action.type) {
     case Constants.FETCH_STATUS_SUCCESS: {
       const { robotName, internetStatus, interfaces } = action.payload
diff --git a/app/src/redux/networking/selectors.ts b/app/src/redux/networking/selectors.ts
index 30d7154f4bb..9b1391fc80e 100644
--- a/app/src/redux/networking/selectors.ts
+++ b/app/src/redux/networking/selectors.ts
@@ -1,4 +1,3 @@
-// @flow
 import { createSelector } from 'reselect'
 import find from 'lodash/find'
 import map from 'lodash/map'
@@ -14,6 +13,7 @@ import { INTERFACE_WIFI, INTERFACE_ETHERNET } from './constants'
 
 import type { State } from '../types'
 import * as Types from './types'
+import type { Dictionary } from 'lodash'
 
 export function getInternetStatus(
   state: State,
@@ -26,10 +26,10 @@ export const getNetworkInterfaces: (
   state: State,
   robotName: string
 ) => Types.InterfaceStatusByType = createSelector(
-  (state, robotName) => state.networking[robotName]?.interfaces,
+  (state: State, robotName: string) => state.networking[robotName]?.interfaces,
   interfaces => {
     const simpleIfaces = map(
-      interfaces,
+      interfaces as Dictionary<Types.InterfaceStatus>,
       (iface: Types.InterfaceStatus): Types.SimpleInterfaceStatus => {
         const { ipAddress: ipWithMask, macAddress, type } = iface
         let ipAddress: string | null = null
@@ -64,21 +64,22 @@ const LIST_ORDER = [
 export const getWifiList: (
   state: State,
   robotName: string
-) => Array<Types.WifiNetwork> = createSelector(
-  (state, robotName) => state.networking[robotName]?.wifiList,
+) => Types.WifiNetwork[] = createSelector(
+  (state: State, robotName: string) => state.networking[robotName]?.wifiList,
   (wifiList = []) => uniqBy(orderBy(wifiList, ...LIST_ORDER), 'ssid')
 )
 
 export const getWifiKeys: (
   state: State,
   robotName: string
-) => Array<Types.WifiKey> = createSelector(
-  (state, robotName) => state.networking[robotName]?.wifiKeyIds,
-  (state, robotName) => state.networking[robotName]?.wifiKeysById,
+) => Types.WifiKey[] = createSelector(
+  (state: State, robotName: string) => state.networking[robotName]?.wifiKeyIds,
+  (state: State, robotName: string) =>
+    state.networking[robotName]?.wifiKeysById,
   (
-    ids: Array<string> = [],
-    keysById: $Shape<{| [string]: Types.WifiKey |}> = {}
-  ) => ids.map(id => keysById[id])
+    ids: string[] = [],
+    keysById: Partial<{ [id: string]: Types.WifiKey }> = {}
+  ) => ids.map(id => keysById[id] as Types.WifiKey)
 )
 
 // NOTE: not memoized because used in several rendered components
@@ -96,7 +97,7 @@ export const getWifiKeyByRequestId = (
 export const getEapOptions = (
   state: State,
   robotName: string
-): Array<Types.EapOption> => {
+): Types.EapOption[] => {
   return state.networking[robotName]?.eapOptions ?? []
 }
 
@@ -112,7 +113,7 @@ export const getCanDisconnect: (
   (list, apiVersion, featureFlags) => {
     const active = list.some(nw => nw.active)
     const supportsDisconnect = Semver.valid(apiVersion)
-      ? Semver.gte(apiVersion, API_MIN_DISCONNECT_VERSION)
+      ? Semver.gte(apiVersion as string, API_MIN_DISCONNECT_VERSION)
       : false
 
     return Boolean(active && supportsDisconnect)
diff --git a/app/src/redux/networking/types.ts b/app/src/redux/networking/types.ts
index da8bc4d98f9..e1d9dbe3ae4 100644
--- a/app/src/redux/networking/types.ts
+++ b/app/src/redux/networking/types.ts
@@ -1,11 +1,9 @@
-// @flow
-
 import type {
   RobotApiRequestMeta,
   RobotApiErrorResponse,
 } from '../robot-api/types'
 
-import typeof {
+import {
   FETCH_STATUS,
   FETCH_STATUS_SUCCESS,
   FETCH_STATUS_FAILURE,
@@ -32,151 +30,151 @@ export * from './api-types'
 
 // fetch status
 
-export type FetchStatusAction = {|
-  type: FETCH_STATUS,
-  payload: {| robotName: string |},
-  meta: RobotApiRequestMeta,
-|}
-
-export type FetchStatusSuccessAction = {|
-  type: FETCH_STATUS_SUCCESS,
-  payload: {|
-    robotName: string,
-    internetStatus: ApiTypes.InternetStatus,
-    interfaces: ApiTypes.InterfaceStatusMap,
-  |},
-  meta: RobotApiRequestMeta,
-|}
-
-export type FetchStatusFailureAction = {|
-  type: FETCH_STATUS_FAILURE,
-  payload: {| robotName: string, error: { ... } |},
-  meta: RobotApiRequestMeta,
-|}
+export interface FetchStatusAction {
+  type: typeof FETCH_STATUS
+  payload: { robotName: string }
+  meta: RobotApiRequestMeta | {}
+}
+
+export interface FetchStatusSuccessAction {
+  type: typeof FETCH_STATUS_SUCCESS
+  payload: {
+    robotName: string
+    internetStatus: ApiTypes.InternetStatus
+    interfaces: ApiTypes.InterfaceStatusMap
+  }
+  meta: RobotApiRequestMeta
+}
+
+export interface FetchStatusFailureAction {
+  type: typeof FETCH_STATUS_FAILURE
+  payload: { robotName: string; error: {} }
+  meta: RobotApiRequestMeta
+}
 
 // fetch wifi list
 
-export type FetchWifiListAction = {|
-  type: FETCH_WIFI_LIST,
-  payload: {| robotName: string |},
-  meta: RobotApiRequestMeta,
-|}
+export interface FetchWifiListAction {
+  type: typeof FETCH_WIFI_LIST
+  payload: { robotName: string }
+  meta: RobotApiRequestMeta | {}
+}
 
-export type FetchWifiListSuccessAction = {|
-  type: FETCH_WIFI_LIST_SUCCESS,
-  payload: {| robotName: string, wifiList: Array<ApiTypes.WifiNetwork> |},
-  meta: RobotApiRequestMeta,
-|}
+export interface FetchWifiListSuccessAction {
+  type: typeof FETCH_WIFI_LIST_SUCCESS
+  payload: { robotName: string; wifiList: ApiTypes.WifiNetwork[] }
+  meta: RobotApiRequestMeta
+}
 
-export type FetchWifiListFailureAction = {|
-  type: FETCH_WIFI_LIST_FAILURE,
-  payload: {| robotName: string, error: RobotApiErrorResponse |},
-  meta: RobotApiRequestMeta,
-|}
+export interface FetchWifiListFailureAction {
+  type: typeof FETCH_WIFI_LIST_FAILURE
+  payload: { robotName: string; error: RobotApiErrorResponse }
+  meta: RobotApiRequestMeta
+}
 
 // connect to new network
 
-export type PostWifiConfigureAction = {|
-  type: POST_WIFI_CONFIGURE,
-  payload: {| robotName: string, options: ApiTypes.WifiConfigureRequest |},
-  meta: RobotApiRequestMeta,
-|}
+export interface PostWifiConfigureAction {
+  type: typeof POST_WIFI_CONFIGURE
+  payload: { robotName: string; options: ApiTypes.WifiConfigureRequest }
+  meta: RobotApiRequestMeta | {}
+}
 
-export type PostWifiConfigureSuccessAction = {|
-  type: POST_WIFI_CONFIGURE_SUCCESS,
-  payload: {| robotName: string, ssid: string |},
-  meta: RobotApiRequestMeta,
-|}
+export interface PostWifiConfigureSuccessAction {
+  type: typeof POST_WIFI_CONFIGURE_SUCCESS
+  payload: { robotName: string; ssid: string }
+  meta: RobotApiRequestMeta
+}
 
-export type PostWifiConfigureFailureAction = {|
-  type: POST_WIFI_CONFIGURE_FAILURE,
-  payload: {| robotName: string, error: RobotApiErrorResponse |},
-  meta: RobotApiRequestMeta,
-|}
+export interface PostWifiConfigureFailureAction {
+  type: typeof POST_WIFI_CONFIGURE_FAILURE
+  payload: { robotName: string; error: RobotApiErrorResponse }
+  meta: RobotApiRequestMeta
+}
 
 // fetch wifi keys
 
-export type FetchWifiKeysAction = {|
-  type: FETCH_WIFI_KEYS,
-  payload: {| robotName: string |},
-  meta: RobotApiRequestMeta,
-|}
+export interface FetchWifiKeysAction {
+  type: typeof FETCH_WIFI_KEYS
+  payload: { robotName: string }
+  meta: RobotApiRequestMeta | {}
+}
 
-export type FetchWifiKeysSuccessAction = {|
-  type: FETCH_WIFI_KEYS_SUCCESS,
-  payload: {| robotName: string, wifiKeys: Array<ApiTypes.ApiWifiKey> |},
-  meta: RobotApiRequestMeta,
-|}
+export interface FetchWifiKeysSuccessAction {
+  type: typeof FETCH_WIFI_KEYS_SUCCESS
+  payload: { robotName: string; wifiKeys: ApiTypes.ApiWifiKey[] }
+  meta: RobotApiRequestMeta
+}
 
-export type FetchWifiKeysFailureAction = {|
-  type: FETCH_WIFI_KEYS_FAILURE,
-  payload: {| robotName: string, error: RobotApiErrorResponse |},
-  meta: RobotApiRequestMeta,
-|}
+export interface FetchWifiKeysFailureAction {
+  type: typeof FETCH_WIFI_KEYS_FAILURE
+  payload: { robotName: string; error: RobotApiErrorResponse }
+  meta: RobotApiRequestMeta
+}
 
 // post wifi keys
 
-export type PostWifiKeysAction = {|
-  type: POST_WIFI_KEYS,
-  payload: {| robotName: string, keyFile: File |},
-  meta: RobotApiRequestMeta,
-|}
+export interface PostWifiKeysAction {
+  type: typeof POST_WIFI_KEYS
+  payload: { robotName: string; keyFile: File }
+  meta: RobotApiRequestMeta | {}
+}
 
-export type PostWifiKeysSuccessAction = {|
-  type: POST_WIFI_KEYS_SUCCESS,
-  payload: {| robotName: string, wifiKey: ApiTypes.ApiWifiKey |},
-  meta: RobotApiRequestMeta,
-|}
+export interface PostWifiKeysSuccessAction {
+  type: typeof POST_WIFI_KEYS_SUCCESS
+  payload: { robotName: string; wifiKey: ApiTypes.ApiWifiKey }
+  meta: RobotApiRequestMeta
+}
 
-export type PostWifiKeysFailureAction = {|
-  type: POST_WIFI_KEYS_FAILURE,
-  payload: {| robotName: string, error: RobotApiErrorResponse |},
-  meta: RobotApiRequestMeta,
-|}
+export interface PostWifiKeysFailureAction {
+  type: typeof POST_WIFI_KEYS_FAILURE
+  payload: { robotName: string; error: RobotApiErrorResponse }
+  meta: RobotApiRequestMeta
+}
 
 // fetch eap options
 
-export type FetchEapOptionsAction = {|
-  type: FETCH_EAP_OPTIONS,
-  payload: {| robotName: string |},
-  meta: RobotApiRequestMeta,
-|}
+export interface FetchEapOptionsAction {
+  type: typeof FETCH_EAP_OPTIONS
+  payload: { robotName: string }
+  meta: RobotApiRequestMeta | {}
+}
 
-export type FetchEapOptionsSuccessAction = {|
-  type: FETCH_EAP_OPTIONS_SUCCESS,
-  payload: {| robotName: string, eapOptions: Array<ApiTypes.EapOption> |},
-  meta: RobotApiRequestMeta,
-|}
+export interface FetchEapOptionsSuccessAction {
+  type: typeof FETCH_EAP_OPTIONS_SUCCESS
+  payload: { robotName: string; eapOptions: ApiTypes.EapOption[] }
+  meta: RobotApiRequestMeta
+}
 
-export type FetchEapOptionsFailureAction = {|
-  type: FETCH_EAP_OPTIONS_FAILURE,
-  payload: {| robotName: string, error: RobotApiErrorResponse |},
-  meta: RobotApiRequestMeta,
-|}
+export interface FetchEapOptionsFailureAction {
+  type: typeof FETCH_EAP_OPTIONS_FAILURE
+  payload: { robotName: string; error: RobotApiErrorResponse }
+  meta: RobotApiRequestMeta
+}
 
 // disconnect network
 
-export type PostWifiDisconnectAction = {|
-  type: 'networking:POST_WIFI_DISCONNECT',
-  payload: {| robotName: string, ssid: string |},
-  meta: RobotApiRequestMeta,
-|}
+export interface PostWifiDisconnectAction {
+  type: 'networking:POST_WIFI_DISCONNECT'
+  payload: { robotName: string; ssid: string }
+  meta: RobotApiRequestMeta | {}
+}
 
-export type PostWifiDisconnectSuccessAction = {|
-  type: 'networking:POST_WIFI_DISCONNECT_SUCCESS',
-  payload: {| robotName: string |},
-  meta: RobotApiRequestMeta,
-|}
+export interface PostWifiDisconnectSuccessAction {
+  type: 'networking:POST_WIFI_DISCONNECT_SUCCESS'
+  payload: { robotName: string }
+  meta: RobotApiRequestMeta
+}
 
-export type PostWifiDisconnectFailureAction = {|
-  type: 'networking:POST_WIFI_DISCONNECT_FAILURE',
-  payload: {| robotName: string, error: {} |},
-  meta: RobotApiRequestMeta,
-|}
+export interface PostWifiDisconnectFailureAction {
+  type: 'networking:POST_WIFI_DISCONNECT_FAILURE'
+  payload: { robotName: string; error: {} }
+  meta: RobotApiRequestMeta
+}
 
-export type NetworkingDisconnectResponse = {|
-  ssid: string,
-|}
+export interface NetworkingDisconnectResponse {
+  ssid: string
+}
 
 // action union
 
@@ -205,36 +203,35 @@ export type NetworkingAction =
 
 // state types
 
-export type WifiKey = {|
-  ...ApiTypes.ApiWifiKey,
+export interface WifiKey extends ApiTypes.ApiWifiKey {
   // if the api key was added by a specific request, add the ID in networking
   // state so the UI can track which key it added
-  requestId?: string,
-|}
-
-export type PerRobotNetworkingState = $Shape<{|
-  internetStatus?: ApiTypes.InternetStatus,
-  interfaces?: ApiTypes.InterfaceStatusMap,
-  wifiList?: Array<ApiTypes.WifiNetwork>,
-  wifiKeyIds?: Array<string>,
-  wifiKeysById?: $Shape<{| [id: string]: WifiKey |}>,
-  eapOptions?: Array<ApiTypes.EapOption>,
-|}>
-
-export type NetworkingState = $Shape<{|
-  [robotName: string]: void | PerRobotNetworkingState,
-|}>
+  requestId?: string
+}
+
+export type PerRobotNetworkingState = Partial<{
+  internetStatus?: ApiTypes.InternetStatus
+  interfaces?: ApiTypes.InterfaceStatusMap
+  wifiList?: ApiTypes.WifiNetwork[]
+  wifiKeyIds?: string[]
+  wifiKeysById?: Partial<{ [id: string]: WifiKey }>
+  eapOptions?: ApiTypes.EapOption[]
+}>
+
+export type NetworkingState = Partial<{
+  [robotName: string]: null | undefined | PerRobotNetworkingState
+}>
 
 // selector types
 
-export type SimpleInterfaceStatus = {|
-  ipAddress: string | null,
-  subnetMask: string | null,
-  macAddress: string,
-  type: ApiTypes.InterfaceType,
-|}
-
-export type InterfaceStatusByType = {|
-  wifi: SimpleInterfaceStatus | null,
-  ethernet: SimpleInterfaceStatus | null,
-|}
+export interface SimpleInterfaceStatus {
+  ipAddress: string | null
+  subnetMask: string | null
+  macAddress: string
+  type: ApiTypes.InterfaceType
+}
+
+export interface InterfaceStatusByType {
+  wifi: SimpleInterfaceStatus | null
+  ethernet: SimpleInterfaceStatus | null
+}
diff --git a/app/src/redux/pipettes/__fixtures__/index.ts b/app/src/redux/pipettes/__fixtures__/index.ts
index f91974ab969..d43c0b12561 100644
--- a/app/src/redux/pipettes/__fixtures__/index.ts
+++ b/app/src/redux/pipettes/__fixtures__/index.ts
@@ -1,7 +1,10 @@
-// @flow
 // mock HTTP responses for pipettes endpoints
 
 import type { PipetteSettings } from '../types'
+import type {
+  RobotApiResponse,
+  RobotApiResponseMeta,
+} from '../../robot-api/types'
 
 export const mockRobot = { name: 'robot', ip: '127.0.0.1', port: 31950 }
 
@@ -24,14 +27,14 @@ export const mockUnattachedPipette = {
   plunger_axis: 'b',
 }
 
-export const mockFetchPipettesSuccessMeta = {
+export const mockFetchPipettesSuccessMeta: RobotApiResponseMeta = {
   method: 'GET',
   path: '/pipettes',
   ok: true,
   status: 200,
 }
 
-export const mockFetchPipettesSuccess = {
+export const mockFetchPipettesSuccess: RobotApiResponse = {
   ...mockFetchPipettesSuccessMeta,
   host: mockRobot,
   body: {
@@ -40,14 +43,14 @@ export const mockFetchPipettesSuccess = {
   },
 }
 
-export const mockFetchPipettesFailureMeta = {
+export const mockFetchPipettesFailureMeta: RobotApiResponseMeta = {
   method: 'GET',
   path: '/pipettes',
   ok: false,
   status: 500,
 }
 
-export const mockFetchPipettesFailure = {
+export const mockFetchPipettesFailure: RobotApiResponse = {
   ...mockFetchPipettesFailureMeta,
   host: mockRobot,
   body: { message: 'AH' },
@@ -57,33 +60,32 @@ export const mockFetchPipettesFailure = {
 
 export const mockPipetteSettings: PipetteSettings = {
   info: { name: 'p300_single_gen2', model: 'p300_single_v2.0' },
-  fields: { [('fieldId': string)]: { value: 42, default: 42 } },
+  fields: { fieldId: { value: 42, default: 42 } },
 }
 
-export const mockFetchPipetteSettingsSuccessMeta = {
+export const mockFetchPipetteSettingsSuccessMeta: RobotApiResponseMeta = {
   method: 'GET',
   path: '/pipettes/settings',
   ok: true,
   status: 200,
 }
 
-export const mockFetchPipetteSettingsSuccess = {
+export const mockFetchPipetteSettingsSuccess: RobotApiResponse = {
   ...mockFetchPipetteSettingsSuccessMeta,
   host: mockRobot,
-  body: ({ abc: mockPipetteSettings }: {
-    [string]: PipetteSettings,
-    ...
-  }),
+  body: { abc: mockPipetteSettings } as {
+    [key: string]: PipetteSettings
+  },
 }
 
-export const mockFetchPipetteSettingsFailureMeta = {
+export const mockFetchPipetteSettingsFailureMeta: RobotApiResponseMeta = {
   method: 'GET',
   path: '/pipettes/settings',
   ok: false,
   status: 500,
 }
 
-export const mockFetchPipetteSettingsFailure = {
+export const mockFetchPipetteSettingsFailure: RobotApiResponse = {
   ...mockFetchPipetteSettingsFailureMeta,
   host: mockRobot,
   body: { message: 'AH' },
@@ -91,27 +93,27 @@ export const mockFetchPipetteSettingsFailure = {
 
 // update pipette settings fixtures
 
-export const mockUpdatePipetteSettingsSuccessMeta = {
+export const mockUpdatePipetteSettingsSuccessMeta: RobotApiResponseMeta = {
   method: 'PATCH',
   path: '/pipettes/settings/abc',
   ok: true,
   status: 200,
 }
 
-export const mockUpdatePipetteSettingsSuccess = {
+export const mockUpdatePipetteSettingsSuccess: RobotApiResponse = {
   ...mockUpdatePipetteSettingsSuccessMeta,
   host: mockRobot,
   body: { fields: mockPipetteSettings.fields },
 }
 
-export const mockUpdatePipetteSettingsFailureMeta = {
+export const mockUpdatePipetteSettingsFailureMeta: RobotApiResponseMeta = {
   method: 'PATCH',
   path: '/pipettes/settings/abc',
   ok: false,
   status: 500,
 }
 
-export const mockUpdatePipetteSettingsFailure = {
+export const mockUpdatePipetteSettingsFailure: RobotApiResponse = {
   ...mockUpdatePipetteSettingsFailureMeta,
   host: mockRobot,
   body: { message: 'AH' },
diff --git a/app/src/redux/pipettes/__tests__/actions.test.ts b/app/src/redux/pipettes/__tests__/actions.test.ts
index 4b68871dc2d..d37161a9e7c 100644
--- a/app/src/redux/pipettes/__tests__/actions.test.ts
+++ b/app/src/redux/pipettes/__tests__/actions.test.ts
@@ -1,19 +1,17 @@
-// @flow
-
 import * as Actions from '../actions'
 import * as Fixtures from '../__fixtures__'
 
 import type { PipettesAction } from '../types'
 
-type ActionSpec = {|
-  name: string,
-  creator: (...Array<any>) => mixed,
-  args: Array<mixed>,
-  expected: PipettesAction,
-|}
+interface ActionSpec {
+  name: string
+  creator: (...args: any[]) => unknown
+  args: unknown[]
+  expected: PipettesAction
+}
 
 describe('robot pipettes actions', () => {
-  const SPECS: Array<ActionSpec> = [
+  const SPECS: ActionSpec[] = [
     {
       name: 'pipettes:FETCH_PIPETTES without refresh',
       creator: Actions.fetchPipettes,
@@ -21,7 +19,7 @@ describe('robot pipettes actions', () => {
       expected: {
         type: 'pipettes:FETCH_PIPETTES',
         payload: { robotName: 'robot-name', refresh: false },
-        meta: {},
+        meta: {} as any,
       },
     },
     {
@@ -31,7 +29,7 @@ describe('robot pipettes actions', () => {
       expected: {
         type: 'pipettes:FETCH_PIPETTES',
         payload: { robotName: 'robot-name', refresh: true },
-        meta: {},
+        meta: {} as any,
       },
     },
     {
@@ -48,7 +46,7 @@ describe('robot pipettes actions', () => {
           robotName: 'robot-name',
           pipettes: Fixtures.mockFetchPipettesSuccess.body,
         },
-        meta: { requestId: 'abc' },
+        meta: { requestId: 'abc' } as any,
       },
     },
     {
@@ -61,7 +59,7 @@ describe('robot pipettes actions', () => {
           robotName: 'robot-name',
           error: { message: 'AH' },
         },
-        meta: { requestId: 'abc' },
+        meta: { requestId: 'abc' } as any,
       },
     },
     {
@@ -71,7 +69,7 @@ describe('robot pipettes actions', () => {
       expected: {
         type: 'pipettes:FETCH_PIPETTE_SETTINGS',
         payload: { robotName: 'robot-name' },
-        meta: {},
+        meta: {} as any,
       },
     },
     {
@@ -88,7 +86,7 @@ describe('robot pipettes actions', () => {
           robotName: 'robot-name',
           settings: { pipetteId: Fixtures.mockPipetteSettings },
         },
-        meta: { requestId: 'abc' },
+        meta: { requestId: 'abc' } as any,
       },
     },
     {
@@ -101,7 +99,7 @@ describe('robot pipettes actions', () => {
           robotName: 'robot-name',
           error: { message: 'AH' },
         },
-        meta: { requestId: 'abc' },
+        meta: { requestId: 'abc' } as any,
       },
     },
     {
@@ -115,7 +113,7 @@ describe('robot pipettes actions', () => {
           pipetteId: 'pipette-id',
           fields: { fieldA: 42, fieldB: null },
         },
-        meta: {},
+        meta: {} as any,
       },
     },
     {
@@ -134,7 +132,7 @@ describe('robot pipettes actions', () => {
           pipetteId: 'pipette-id',
           fields: Fixtures.mockUpdatePipetteSettingsSuccess.body.fields,
         },
-        meta: { requestId: 'abc' },
+        meta: { requestId: 'abc' } as any,
       },
     },
     {
@@ -153,7 +151,7 @@ describe('robot pipettes actions', () => {
           pipetteId: 'pipette-id',
           error: { message: 'AH' },
         },
-        meta: { requestId: 'abc' },
+        meta: { requestId: 'abc' } as any,
       },
     },
   ]
diff --git a/app/src/redux/pipettes/__tests__/protocol-pipette-selectors.test.ts b/app/src/redux/pipettes/__tests__/protocol-pipette-selectors.test.ts
index b8f3d9c1f90..42c7d6ce912 100644
--- a/app/src/redux/pipettes/__tests__/protocol-pipette-selectors.test.ts
+++ b/app/src/redux/pipettes/__tests__/protocol-pipette-selectors.test.ts
@@ -1,4 +1,3 @@
-// @flow
 import noop from 'lodash/noop'
 
 import * as SharedData from '@opentrons/shared-data'
@@ -12,35 +11,31 @@ jest.mock('@opentrons/shared-data')
 jest.mock('../../robot/selectors')
 jest.mock('../../calibration/pipette-offset/selectors')
 
-type SelectorSpec = {|
-  name: string,
-  state: $Shape<State>,
-  expected: mixed,
-  matching: boolean,
-  calibrated: boolean,
-  before?: () => mixed,
-  after?: () => mixed,
-|}
+interface SelectorSpec {
+  name: string
+  state: State
+  expected: unknown
+  matching: boolean
+  calibrated: boolean
+  before?: () => unknown
+  after?: () => unknown
+}
 
-const mockGetPipetteOffsetCalibrations: JestMockFn<
-  [State, string],
-  $Call<typeof POCSelectors.getPipetteOffsetCalibrations, State, string>
-> = POCSelectors.getPipetteOffsetCalibrations
+const mockGetPipetteOffsetCalibrations = POCSelectors.getPipetteOffsetCalibrations as jest.MockedFunction<
+  typeof POCSelectors.getPipetteOffsetCalibrations
+>
 
-const mockGetPipetteModelSpecs: JestMockFn<
-  [string],
-  $Call<typeof SharedData.getPipetteModelSpecs, string>
-> = SharedData.getPipetteModelSpecs
+const mockGetPipetteModelSpecs = SharedData.getPipetteModelSpecs as jest.MockedFunction<
+  typeof SharedData.getPipetteModelSpecs
+>
 
-const mockGetPipetteNameSpecs: JestMockFn<
-  [string],
-  $Call<typeof SharedData.getPipetteNameSpecs, string>
-> = SharedData.getPipetteNameSpecs
+const mockGetPipetteNameSpecs = SharedData.getPipetteNameSpecs as jest.MockedFunction<
+  typeof SharedData.getPipetteNameSpecs
+>
 
-const mockGetProtocolPipettes: JestMockFn<
-  [State],
-  $Call<typeof RobotSelectors.getPipettes, State>
-> = RobotSelectors.getPipettes
+const mockGetProtocolPipettes = RobotSelectors.getPipettes as jest.MockedFunction<
+  typeof RobotSelectors.getPipettes
+>
 
 const mockLeftPipette: any = {
   id: 'abc',
@@ -97,7 +92,7 @@ const mockRightPipetteCalibration: any = {
   lastModified: '2020-08-25T20:25',
 }
 
-const SPECS: Array<SelectorSpec> = [
+const SPECS: SelectorSpec[] = [
   {
     name: 'returns nulls by default',
     state: {
@@ -107,7 +102,7 @@ const SPECS: Array<SelectorSpec> = [
           settingsById: null,
         },
       },
-    },
+    } as any,
     expected: {
       left: {
         compatibility: 'match',
@@ -184,7 +179,7 @@ const SPECS: Array<SelectorSpec> = [
           settingsById: null,
         },
       },
-    },
+    } as any,
     before: () => {
       mockGetProtocolPipettes.mockReturnValue([
         mockLeftProtoPipette,
@@ -238,7 +233,7 @@ const SPECS: Array<SelectorSpec> = [
           settingsById: null,
         },
       },
-    },
+    } as any,
     before: () => {
       mockGetProtocolPipettes.mockReturnValue([
         { ...mockLeftProtoPipette, modelSpecs: mockLeftLegacySpecs },
@@ -285,7 +280,7 @@ const SPECS: Array<SelectorSpec> = [
           settingsById: null,
         },
       },
-    },
+    } as any,
     matching: true,
     calibrated: true,
     before: () => {
@@ -332,7 +327,7 @@ const SPECS: Array<SelectorSpec> = [
           settingsById: null,
         },
       },
-    },
+    } as any,
     expected: {
       left: {
         compatibility: 'inexact_match',
@@ -386,7 +381,7 @@ const SPECS: Array<SelectorSpec> = [
           settingsById: null,
         },
       },
-    },
+    } as any,
     expected: {
       left: {
         compatibility: 'inexact_match',
@@ -441,7 +436,7 @@ const SPECS: Array<SelectorSpec> = [
           settingsById: null,
         },
       },
-    },
+    } as any,
     expected: {
       left: {
         compatibility: 'match',
diff --git a/app/src/redux/pipettes/__tests__/reducer.test.ts b/app/src/redux/pipettes/__tests__/reducer.test.ts
index 49a172b0179..42abb4af91d 100644
--- a/app/src/redux/pipettes/__tests__/reducer.test.ts
+++ b/app/src/redux/pipettes/__tests__/reducer.test.ts
@@ -1,18 +1,17 @@
-// @flow
 import * as Fixtures from '../__fixtures__'
 import { pipettesReducer } from '../reducer'
 
 import type { Action } from '../../types'
 import type { PipettesState } from '../types'
 
-type ReducerSpec = {|
-  name: string,
-  state: PipettesState,
-  action: Action,
-  expected: PipettesState,
-|}
+interface ReducerSpec {
+  name: string
+  state: PipettesState
+  action: Action
+  expected: PipettesState
+}
 
-const SPECS: Array<ReducerSpec> = [
+const SPECS: ReducerSpec[] = [
   {
     name: 'handles pipettes:FETCH_PIPETTES_SUCCESS',
     action: {
@@ -24,7 +23,7 @@ const SPECS: Array<ReducerSpec> = [
           right: Fixtures.mockAttachedPipette,
         },
       },
-      meta: {},
+      meta: {} as any,
     },
     state: {
       robotName: {
@@ -50,7 +49,7 @@ const SPECS: Array<ReducerSpec> = [
         robotName: 'robotName',
         settings: { pipetteId: Fixtures.mockPipetteSettings },
       },
-      meta: {},
+      meta: {} as any,
     },
     state: {
       robotName: {
@@ -72,9 +71,9 @@ const SPECS: Array<ReducerSpec> = [
       payload: {
         robotName: 'robotName',
         pipetteId: 'pipetteId',
-        fields: { [('fieldId': string)]: { value: 42, default: 42 } },
+        fields: { fieldId: { value: 42, default: 42 } },
       },
-      meta: {},
+      meta: {} as any,
     },
     state: {
       robotName: {
@@ -82,7 +81,7 @@ const SPECS: Array<ReducerSpec> = [
         settingsById: {
           pipetteId: {
             info: { name: 'p300_single_gen2', model: 'p300_single_v2.0' },
-            fields: { [('fieldId': string)]: { value: 0, default: 42 } },
+            fields: { fieldId: { value: 0, default: 42 } },
           },
         },
       },
@@ -93,7 +92,7 @@ const SPECS: Array<ReducerSpec> = [
         settingsById: {
           pipetteId: {
             info: { name: 'p300_single_gen2', model: 'p300_single_v2.0' },
-            fields: { [('fieldId': string)]: { value: 42, default: 42 } },
+            fields: { fieldId: { value: 42, default: 42 } },
           },
         },
       },
diff --git a/app/src/redux/pipettes/__tests__/selectors.test.ts b/app/src/redux/pipettes/__tests__/selectors.test.ts
index 7d9e01e3986..b55c19c9e48 100644
--- a/app/src/redux/pipettes/__tests__/selectors.test.ts
+++ b/app/src/redux/pipettes/__tests__/selectors.test.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import { getPipetteModelSpecs } from '@opentrons/shared-data'
 import * as Fixtures from '../__fixtures__'
 import * as POCFixtures from '../../calibration/pipette-offset/__fixtures__'
@@ -7,19 +5,19 @@ import * as TLCFixtures from '../../calibration/tip-length/__fixtures__'
 import * as Selectors from '../selectors'
 import type { State } from '../../types'
 
-type SelectorSpec = {|
-  name: string,
-  selector: (State, ...Array<any>) => mixed,
-  state: $Shape<State>,
-  args?: Array<any>,
-  expected: mixed,
-|}
+interface SelectorSpec {
+  name: string
+  selector: (state: State, ...rest: any[]) => unknown
+  state: State
+  args?: any[]
+  expected: unknown
+}
 
-const SPECS: Array<SelectorSpec> = [
+const SPECS: SelectorSpec[] = [
   {
     name: 'getAttachedPipettes returns no attached pipettes by default',
     selector: Selectors.getAttachedPipettes,
-    state: { pipettes: {} },
+    state: { pipettes: {} } as any,
     args: ['robotName'],
     expected: { left: null, right: null },
   },
@@ -36,13 +34,15 @@ const SPECS: Array<SelectorSpec> = [
           settingsById: null,
         },
       },
-    },
+    } as any,
     args: ['robotName'],
     expected: {
       left: null,
       right: {
         ...Fixtures.mockAttachedPipette,
-        modelSpecs: getPipetteModelSpecs(Fixtures.mockAttachedPipette.model),
+        modelSpecs: getPipetteModelSpecs(
+          Fixtures.mockAttachedPipette.model as any
+        ),
       },
     },
   },
@@ -61,7 +61,7 @@ const SPECS: Array<SelectorSpec> = [
           },
         },
       },
-    },
+    } as any,
     args: ['robotName'],
     expected: { left: null, right: Fixtures.mockPipetteSettings.fields },
   },
@@ -76,7 +76,7 @@ describe('robot api selectors', () => {
 
 describe('getAttachedPipetteCalibrations', () => {
   it('should get calibrations for attached pipettes if they exist', () => {
-    const mockPipetteState: $Shape<State> = {
+    const mockPipetteState: State = {
       pipettes: {
         robotName: {
           attachedByMount: {
@@ -101,7 +101,7 @@ describe('getAttachedPipetteCalibrations', () => {
           tipLengthCalibrations: TLCFixtures.mockAllTipLengthCalibrations,
         },
       },
-    }
+    } as any
 
     expect(
       Selectors.getAttachedPipetteCalibrations(mockPipetteState, 'robotName')
@@ -117,7 +117,7 @@ describe('getAttachedPipetteCalibrations', () => {
     })
   })
   it('should return empty obj if a pipette is attached but there is no calibration', () => {
-    const mockPipetteState: $Shape<State> = {
+    const mockPipetteState: State = {
       pipettes: {
         robotName: {
           attachedByMount: {
@@ -135,7 +135,7 @@ describe('getAttachedPipetteCalibrations', () => {
           tipLengthCalibrations: null,
         },
       },
-    }
+    } as any
     expect(
       Selectors.getAttachedPipetteCalibrations(mockPipetteState, 'robotName')
     ).toEqual({
@@ -144,7 +144,7 @@ describe('getAttachedPipetteCalibrations', () => {
     })
   })
   it('should return empty obj if no pipette is attached', () => {
-    const mockPipetteState: $Shape<State> = {
+    const mockPipetteState: State = {
       pipettes: {
         robotName: {
           attachedByMount: {
@@ -163,7 +163,7 @@ describe('getAttachedPipetteCalibrations', () => {
           tipLengthCalibrations: TLCFixtures.mockAllTipLengthCalibrations,
         },
       },
-    }
+    } as any
     expect(
       Selectors.getAttachedPipetteCalibrations(mockPipetteState, 'robotName')
     ).toEqual({
diff --git a/app/src/redux/pipettes/actions.ts b/app/src/redux/pipettes/actions.ts
index 6acdb22d611..bd8247618ec 100644
--- a/app/src/redux/pipettes/actions.ts
+++ b/app/src/redux/pipettes/actions.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import * as Constants from './constants'
 import * as Types from './types'
 
diff --git a/app/src/redux/pipettes/constants.ts b/app/src/redux/pipettes/constants.ts
index e3f0146a3cf..6736b36c15e 100644
--- a/app/src/redux/pipettes/constants.ts
+++ b/app/src/redux/pipettes/constants.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import type { Mount } from './types'
 
 // action types
@@ -46,7 +44,7 @@ export const PIPETTE_SETTINGS_PATH: '/settings/pipettes' = '/settings/pipettes'
 
 export const LEFT: 'left' = 'left'
 export const RIGHT: 'right' = 'right'
-export const PIPETTE_MOUNTS: Array<Mount> = [LEFT, RIGHT]
+export const PIPETTE_MOUNTS: Mount[] = [LEFT, RIGHT]
 export const MATCH: 'match' = 'match'
 export const INCOMPATIBLE: 'incompatible' = 'incompatible'
 export const INEXACT_MATCH: 'inexact_match' = 'inexact_match'
diff --git a/app/src/redux/pipettes/epic/__tests__/fetchPipetteSettingsEpic.test.ts b/app/src/redux/pipettes/epic/__tests__/fetchPipetteSettingsEpic.test.ts
index b08411dcfd3..5b52c0ab445 100644
--- a/app/src/redux/pipettes/epic/__tests__/fetchPipetteSettingsEpic.test.ts
+++ b/app/src/redux/pipettes/epic/__tests__/fetchPipetteSettingsEpic.test.ts
@@ -1,4 +1,3 @@
-// @flow
 import { TestScheduler } from 'rxjs/testing'
 
 import * as RobotApiHttp from '../../../robot-api/http'
@@ -9,32 +8,28 @@ import * as Actions from '../../actions'
 import * as Types from '../../types'
 import { pipettesEpic } from '../../epic'
 
-import type { Observable } from 'rxjs'
-import type {
-  RobotHost,
-  RobotApiRequestOptions,
-  RobotApiResponse,
-} from '../../../robot-api/types'
+import type { Action, State } from '../../../types'
+import type { RobotApiRequestMeta } from '../../../robot-api/types'
 
 jest.mock('../../../robot-api/http')
 jest.mock('../../../discovery/selectors')
 
-const mockState = { state: true }
+const mockState: State = { state: true } as any
 const { mockRobot } = Fixtures
 
-const mockFetchRobotApi: JestMockFn<
-  [RobotHost, RobotApiRequestOptions],
-  Observable<RobotApiResponse>
-> = RobotApiHttp.fetchRobotApi
+const mockFetchRobotApi = RobotApiHttp.fetchRobotApi as jest.MockedFunction<
+  typeof RobotApiHttp.fetchRobotApi
+>
 
-const mockGetRobotByName: JestMockFn<[any, string], mixed> =
-  DiscoverySelectors.getRobotByName
+const mockGetRobotByName = DiscoverySelectors.getRobotByName as jest.MockedFunction<
+  typeof DiscoverySelectors.getRobotByName
+>
 
 describe('fetchPipetteSettingsEpic', () => {
-  let testScheduler
+  let testScheduler: TestScheduler
 
   beforeEach(() => {
-    mockGetRobotByName.mockReturnValue(mockRobot)
+    mockGetRobotByName.mockReturnValue(mockRobot as any)
 
     testScheduler = new TestScheduler((actual, expected) => {
       expect(actual).toEqual(expected)
@@ -46,7 +41,7 @@ describe('fetchPipetteSettingsEpic', () => {
   })
 
   describe('handles FETCH_PIPETTE_SETTINGS', () => {
-    const meta = { requestId: '1234' }
+    const meta: RobotApiRequestMeta = { requestId: '1234' } as any
     const action: Types.FetchPipetteSettingsAction = {
       ...Actions.fetchPipetteSettings(mockRobot.name),
       meta,
@@ -58,8 +53,8 @@ describe('fetchPipetteSettingsEpic', () => {
           cold('r', { r: Fixtures.mockFetchPipetteSettingsSuccess })
         )
 
-        const action$ = hot('--a', { a: action })
-        const state$ = hot('a-a', { a: mockState })
+        const action$ = hot<Action>('--a', { a: action })
+        const state$ = hot<State>('a-a', { a: mockState })
         const output$ = pipettesEpic(action$, state$)
 
         expectObservable(output$)
@@ -82,8 +77,8 @@ describe('fetchPipetteSettingsEpic', () => {
           cold('r', { r: Fixtures.mockFetchPipetteSettingsSuccess })
         )
 
-        const action$ = hot('--a', { a: action })
-        const state$ = hot('a-a', { a: {} })
+        const action$ = hot<Action>('--a', { a: action })
+        const state$ = hot<State>('a-a', { a: {} } as any)
         const output$ = pipettesEpic(action$, state$)
 
         expectObservable(output$).toBe('--a', {
@@ -102,8 +97,8 @@ describe('fetchPipetteSettingsEpic', () => {
           cold('r', { r: Fixtures.mockFetchPipetteSettingsFailure })
         )
 
-        const action$ = hot('--a', { a: action })
-        const state$ = hot('a-a', { a: {} })
+        const action$ = hot<Action>('--a', { a: action })
+        const state$ = hot<State>('a-a', { a: {} } as any)
         const output$ = pipettesEpic(action$, state$)
 
         expectObservable(output$).toBe('--a', {
diff --git a/app/src/redux/pipettes/epic/__tests__/fetchPipettesEpic.test.ts b/app/src/redux/pipettes/epic/__tests__/fetchPipettesEpic.test.ts
index 45ded2dc762..83aa5de61ff 100644
--- a/app/src/redux/pipettes/epic/__tests__/fetchPipettesEpic.test.ts
+++ b/app/src/redux/pipettes/epic/__tests__/fetchPipettesEpic.test.ts
@@ -1,4 +1,3 @@
-// @flow
 import { TestScheduler } from 'rxjs/testing'
 
 import * as RobotApiHttp from '../../../robot-api/http'
@@ -9,32 +8,28 @@ import * as Actions from '../../actions'
 import * as Types from '../../types'
 import { pipettesEpic } from '../../epic'
 
-import type { Observable } from 'rxjs'
-import type {
-  RobotHost,
-  RobotApiRequestOptions,
-  RobotApiResponse,
-} from '../../../robot-api/types'
+import type { Action, State } from '../../../types'
+import type { RobotApiResponse } from '../../../robot-api/types'
 
 jest.mock('../../../robot-api/http')
 jest.mock('../../../discovery/selectors')
 
-const mockState = { state: true }
+const mockState: State = { state: true } as any
 const { mockRobot } = Fixtures
 
-const mockFetchRobotApi: JestMockFn<
-  [RobotHost, RobotApiRequestOptions],
-  Observable<RobotApiResponse>
-> = RobotApiHttp.fetchRobotApi
+const mockFetchRobotApi = RobotApiHttp.fetchRobotApi as jest.MockedFunction<
+  typeof RobotApiHttp.fetchRobotApi
+>
 
-const mockGetRobotByName: JestMockFn<[any, string], mixed> =
-  DiscoverySelectors.getRobotByName
+const mockGetRobotByName = DiscoverySelectors.getRobotByName as jest.MockedFunction<
+  typeof DiscoverySelectors.getRobotByName
+>
 
 describe('fetchPipettesEpic', () => {
-  let testScheduler
+  let testScheduler: TestScheduler
 
   beforeEach(() => {
-    mockGetRobotByName.mockReturnValue(mockRobot)
+    mockGetRobotByName.mockReturnValue(mockRobot as any)
 
     testScheduler = new TestScheduler((actual, expected) => {
       expect(actual).toEqual(expected)
@@ -46,7 +41,7 @@ describe('fetchPipettesEpic', () => {
   })
 
   describe('handles FETCH_PIPETTES', () => {
-    const meta = { requestId: '1234' }
+    const meta = { requestId: '1234' } as any
     const action: Types.FetchPipettesAction = {
       ...Actions.fetchPipettes(mockRobot.name, true),
       meta,
@@ -55,11 +50,11 @@ describe('fetchPipettesEpic', () => {
     it('calls GET /pipettes', () => {
       testScheduler.run(({ hot, cold, expectObservable, flush }) => {
         mockFetchRobotApi.mockReturnValue(
-          cold('r', { r: Fixtures.mockFetchPipettesSuccess })
+          cold<RobotApiResponse>('r', { r: Fixtures.mockFetchPipettesSuccess })
         )
 
-        const action$ = hot('--a', { a: action })
-        const state$ = hot('a-a', { a: mockState })
+        const action$ = hot<Action>('--a', { a: action })
+        const state$ = hot<State>('a-a', { a: mockState })
         const output$ = pipettesEpic(action$, state$)
 
         expectObservable(output$)
@@ -83,8 +78,8 @@ describe('fetchPipettesEpic', () => {
           cold('r', { r: Fixtures.mockFetchPipettesSuccess })
         )
 
-        const action$ = hot('--a', { a: action })
-        const state$ = hot('a-a', { a: {} })
+        const action$ = hot<Action>('--a', { a: action })
+        const state$ = hot<State>('a-a', { a: {} } as any)
         const output$ = pipettesEpic(action$, state$)
 
         expectObservable(output$).toBe('--a', {
@@ -103,8 +98,8 @@ describe('fetchPipettesEpic', () => {
           cold('r', { r: Fixtures.mockFetchPipettesFailure })
         )
 
-        const action$ = hot('--a', { a: action })
-        const state$ = hot('a-a', { a: {} })
+        const action$ = hot<Action>('--a', { a: action })
+        const state$ = hot<State>('a-a', { a: {} } as any)
         const output$ = pipettesEpic(action$, state$)
 
         expectObservable(output$).toBe('--a', {
diff --git a/app/src/redux/pipettes/epic/__tests__/fetchPipettesOnConnectEpic.test.ts b/app/src/redux/pipettes/epic/__tests__/fetchPipettesOnConnectEpic.test.ts
index 8624ecaa14c..743177d7ee9 100644
--- a/app/src/redux/pipettes/epic/__tests__/fetchPipettesOnConnectEpic.test.ts
+++ b/app/src/redux/pipettes/epic/__tests__/fetchPipettesOnConnectEpic.test.ts
@@ -1,4 +1,3 @@
-// @flow
 import { TestScheduler } from 'rxjs/testing'
 
 import * as DiscoverySelectors from '../../../discovery/selectors'
@@ -8,23 +7,27 @@ import * as Fixtures from '../../__fixtures__'
 import * as Actions from '../../actions'
 import { pipettesEpic } from '../../epic'
 
+import type { Action, State } from '../../../types'
+
 jest.mock('../../../discovery/selectors')
 jest.mock('../../../robot/selectors')
 
-const mockState = { state: true }
+const mockState: State = { state: true } as any
 const { mockRobot } = Fixtures
 
-const mockGetRobotByName: JestMockFn<[any, string], mixed> =
-  DiscoverySelectors.getRobotByName
+const mockGetRobotByName = DiscoverySelectors.getRobotByName as jest.MockedFunction<
+  typeof DiscoverySelectors.getRobotByName
+>
 
-const mockGetConnectedRobotName: JestMockFn<[any], ?string> =
-  RobotSelectors.getConnectedRobotName
+const mockGetConnectedRobotName = RobotSelectors.getConnectedRobotName as jest.MockedFunction<
+  typeof RobotSelectors.getConnectedRobotName
+>
 
 describe('fetchPipettesOnConnectEpic', () => {
-  let testScheduler
+  let testScheduler: TestScheduler
 
   beforeEach(() => {
-    mockGetRobotByName.mockReturnValue(mockRobot)
+    mockGetRobotByName.mockReturnValue(mockRobot as any)
 
     testScheduler = new TestScheduler((actual, expected) => {
       expect(actual).toEqual(expected)
@@ -36,16 +39,16 @@ describe('fetchPipettesOnConnectEpic', () => {
   })
 
   it('dispatches nothing robot:CONNECT_RESPONSE failure', () => {
-    const action = {
+    const action: Action = {
       type: 'robot:CONNECT_RESPONSE',
       payload: { error: { message: 'AH' } },
-    }
+    } as any
 
     mockGetConnectedRobotName.mockReturnValue(null)
 
     testScheduler.run(({ hot, cold, expectObservable, flush }) => {
-      const action$ = hot('--a', { a: action })
-      const state$ = hot('a--', { a: mockState })
+      const action$ = hot<Action>('--a', { a: action })
+      const state$ = hot<State>('a--', { a: mockState })
       const output$ = pipettesEpic(action$, state$)
 
       expectObservable(output$).toBe('---')
@@ -53,16 +56,16 @@ describe('fetchPipettesOnConnectEpic', () => {
   })
 
   it('dispatches FETCH_PIPETTES and FETCH_PIPETTE_SETTINGS on robot:CONNECT_RESPONSE success', () => {
-    const action = {
+    const action: Action = {
       type: 'robot:CONNECT_RESPONSE',
       payload: {},
-    }
+    } as any
 
     mockGetConnectedRobotName.mockReturnValue(mockRobot.name)
 
     testScheduler.run(({ hot, cold, expectObservable, flush }) => {
-      const action$ = hot('--a', { a: action })
-      const state$ = hot('a--', { a: mockState })
+      const action$ = hot<Action>('--a', { a: action })
+      const state$ = hot<State>('a--', { a: mockState })
       const output$ = pipettesEpic(action$, state$)
 
       expectObservable(output$).toBe('--(ab)', {
diff --git a/app/src/redux/pipettes/epic/__tests__/updatePipetteSettingsEpic.test.ts b/app/src/redux/pipettes/epic/__tests__/updatePipetteSettingsEpic.test.ts
index dd7befcd918..ed55c7c3e78 100644
--- a/app/src/redux/pipettes/epic/__tests__/updatePipetteSettingsEpic.test.ts
+++ b/app/src/redux/pipettes/epic/__tests__/updatePipetteSettingsEpic.test.ts
@@ -1,4 +1,3 @@
-// @flow
 import { TestScheduler } from 'rxjs/testing'
 
 import * as RobotApiHttp from '../../../robot-api/http'
@@ -9,32 +8,28 @@ import * as Actions from '../../actions'
 import * as Types from '../../types'
 import { pipettesEpic } from '../../epic'
 
-import type { Observable } from 'rxjs'
-import type {
-  RobotHost,
-  RobotApiRequestOptions,
-  RobotApiResponse,
-} from '../../../robot-api/types'
+import type { Action, State } from '../../../types'
+import type { RobotApiRequestMeta } from '../../../robot-api/types'
 
 jest.mock('../../../robot-api/http')
 jest.mock('../../../discovery/selectors')
 
-const mockState = { state: true }
+const mockState: State = { state: true } as any
 const { mockRobot, mockAttachedPipette: mockPipette } = Fixtures
 
-const mockFetchRobotApi: JestMockFn<
-  [RobotHost, RobotApiRequestOptions],
-  Observable<RobotApiResponse>
-> = RobotApiHttp.fetchRobotApi
+const mockFetchRobotApi = RobotApiHttp.fetchRobotApi as jest.MockedFunction<
+  typeof RobotApiHttp.fetchRobotApi
+>
 
-const mockGetRobotByName: JestMockFn<[any, string], mixed> =
-  DiscoverySelectors.getRobotByName
+const mockGetRobotByName = DiscoverySelectors.getRobotByName as jest.MockedFunction<
+  typeof DiscoverySelectors.getRobotByName
+>
 
 describe('updatePipetteSettingsEpic', () => {
-  let testScheduler
+  let testScheduler: TestScheduler
 
   beforeEach(() => {
-    mockGetRobotByName.mockReturnValue(mockRobot)
+    mockGetRobotByName.mockReturnValue(mockRobot as any)
 
     testScheduler = new TestScheduler((actual, expected) => {
       expect(actual).toEqual(expected)
@@ -46,7 +41,7 @@ describe('updatePipetteSettingsEpic', () => {
   })
 
   describe('handles UPDATE_PIPETTE_SETTINGS', () => {
-    const meta = { requestId: '1234' }
+    const meta: RobotApiRequestMeta = { requestId: '1234' } as any
     const action: Types.UpdatePipetteSettingsAction = {
       ...Actions.updatePipetteSettings(mockRobot.name, mockPipette.id, {
         fieldA: 42,
@@ -61,8 +56,8 @@ describe('updatePipetteSettingsEpic', () => {
           cold('r', { r: Fixtures.mockFetchPipetteSettingsSuccess })
         )
 
-        const action$ = hot('--a', { a: action })
-        const state$ = hot('a-a', { a: mockState })
+        const action$ = hot<Action>('--a', { a: action })
+        const state$ = hot<State>('a-a', { a: mockState })
         const output$ = pipettesEpic(action$, state$)
 
         expectObservable(output$)
@@ -86,8 +81,8 @@ describe('updatePipetteSettingsEpic', () => {
           cold('r', { r: Fixtures.mockUpdatePipetteSettingsSuccess })
         )
 
-        const action$ = hot('--a', { a: action })
-        const state$ = hot('a-a', { a: {} })
+        const action$ = hot<Action>('--a', { a: action })
+        const state$ = hot<State>('a-a', { a: {} } as any)
         const output$ = pipettesEpic(action$, state$)
 
         expectObservable(output$).toBe('--a', {
@@ -107,8 +102,8 @@ describe('updatePipetteSettingsEpic', () => {
           cold('r', { r: Fixtures.mockUpdatePipetteSettingsFailure })
         )
 
-        const action$ = hot('--a', { a: action })
-        const state$ = hot('a-a', { a: {} })
+        const action$ = hot<Action>('--a', { a: action })
+        const state$ = hot<State>('a-a', { a: {} } as any)
         const output$ = pipettesEpic(action$, state$)
 
         expectObservable(output$).toBe('--a', {
diff --git a/app/src/redux/pipettes/epic/fetchPipetteSettingsEpic.ts b/app/src/redux/pipettes/epic/fetchPipetteSettingsEpic.ts
index bd20ac9925f..092931ee79a 100644
--- a/app/src/redux/pipettes/epic/fetchPipetteSettingsEpic.ts
+++ b/app/src/redux/pipettes/epic/fetchPipetteSettingsEpic.ts
@@ -1,4 +1,3 @@
-// @flow
 import { ofType } from 'redux-observable'
 
 import { GET } from '../../robot-api/constants'
@@ -7,7 +6,7 @@ import { mapToRobotApiRequest } from '../../robot-api/operators'
 import * as Actions from '../actions'
 import * as Constants from '../constants'
 
-import type { Epic } from '../../types'
+import type { Action, Epic } from '../../types'
 
 import type {
   ActionToRequestMapper,
@@ -35,7 +34,9 @@ const mapResponseToAction: ResponseToActionMapper<FetchPipetteSettingsAction> =
 
 export const fetchPipetteSettingsEpic: Epic = (action$, state$) => {
   return action$.pipe(
-    ofType(Constants.FETCH_PIPETTE_SETTINGS),
+    ofType<Action, FetchPipetteSettingsAction>(
+      Constants.FETCH_PIPETTE_SETTINGS
+    ),
     mapToRobotApiRequest(
       state$,
       a => a.payload.robotName,
diff --git a/app/src/redux/pipettes/epic/fetchPipettesEpic.ts b/app/src/redux/pipettes/epic/fetchPipettesEpic.ts
index 8457027dde4..09bf424bf35 100644
--- a/app/src/redux/pipettes/epic/fetchPipettesEpic.ts
+++ b/app/src/redux/pipettes/epic/fetchPipettesEpic.ts
@@ -1,4 +1,3 @@
-// @flow
 import { ofType } from 'redux-observable'
 
 import { GET } from '../../robot-api/constants'
@@ -7,7 +6,7 @@ import { mapToRobotApiRequest } from '../../robot-api/operators'
 import * as Actions from '../actions'
 import * as Constants from '../constants'
 
-import type { Epic } from '../../types'
+import type { Action, Epic } from '../../types'
 
 import type {
   ActionToRequestMapper,
@@ -36,7 +35,7 @@ const mapResponseToAction: ResponseToActionMapper<FetchPipettesAction> = (
 
 export const fetchPipettesEpic: Epic = (action$, state$) => {
   return action$.pipe(
-    ofType(Constants.FETCH_PIPETTES),
+    ofType<Action, FetchPipettesAction>(Constants.FETCH_PIPETTES),
     mapToRobotApiRequest(
       state$,
       a => a.payload.robotName,
diff --git a/app/src/redux/pipettes/epic/fetchPipettesOnConnectEpic.ts b/app/src/redux/pipettes/epic/fetchPipettesOnConnectEpic.ts
index 18adebb7a8a..c15f547528e 100644
--- a/app/src/redux/pipettes/epic/fetchPipettesOnConnectEpic.ts
+++ b/app/src/redux/pipettes/epic/fetchPipettesOnConnectEpic.ts
@@ -1,4 +1,3 @@
-// @flow
 import { of } from 'rxjs'
 import { filter, switchMap, withLatestFrom } from 'rxjs/operators'
 import { ofType } from 'redux-observable'
@@ -6,18 +5,29 @@ import { ofType } from 'redux-observable'
 import { getConnectedRobotName } from '../../robot/selectors'
 import * as Actions from '../actions'
 
-import type { Epic } from '../../types'
+import type { Observable } from 'rxjs'
+import type { Action, Epic } from '../../types'
+import type { ConnectResponseAction } from '../../robot/actions'
 
 export const fetchPipettesOnConnectEpic: Epic = (action$, state$) => {
   return action$.pipe(
-    ofType('robot:CONNECT_RESPONSE'),
-    withLatestFrom(state$, (a, s) => [a, getConnectedRobotName(s)]),
-    filter(([action, robotName]) => robotName != null),
-    switchMap(([action, robotName]) =>
-      of(
-        Actions.fetchPipettes(robotName),
-        Actions.fetchPipetteSettings(robotName)
-      )
+    ofType<Action, ConnectResponseAction>('robot:CONNECT_RESPONSE'),
+    withLatestFrom<
+      ConnectResponseAction,
+      [ConnectResponseAction, string | null]
+    >(state$, (a, s) => [a, getConnectedRobotName(s)]),
+    filter<
+      [ConnectResponseAction, string | null],
+      [ConnectResponseAction, string]
+    >((args): args is [ConnectResponseAction, string] => {
+      return args[1] != null
+    }),
+    switchMap<[ConnectResponseAction, string], Observable<any>>(
+      ([action, robotName]) =>
+        of(
+          Actions.fetchPipettes(robotName),
+          Actions.fetchPipetteSettings(robotName)
+        )
     )
   )
 }
diff --git a/app/src/redux/pipettes/epic/index.ts b/app/src/redux/pipettes/epic/index.ts
index 37204f0eae8..b3d23e1b43b 100644
--- a/app/src/redux/pipettes/epic/index.ts
+++ b/app/src/redux/pipettes/epic/index.ts
@@ -1,4 +1,3 @@
-// @flow
 import { combineEpics } from 'redux-observable'
 import { fetchPipettesEpic } from './fetchPipettesEpic'
 import { fetchPipettesOnConnectEpic } from './fetchPipettesOnConnectEpic'
@@ -6,7 +5,7 @@ import { fetchPipetteSettingsEpic } from './fetchPipetteSettingsEpic'
 import { updatePipetteSettingsEpic } from './updatePipetteSettingsEpic'
 import type { Epic } from '../../types'
 
-export const pipettesEpic: Epic = combineEpics(
+export const pipettesEpic: Epic = combineEpics<Epic>(
   fetchPipettesEpic,
   fetchPipettesOnConnectEpic,
   fetchPipetteSettingsEpic,
diff --git a/app/src/redux/pipettes/epic/updatePipetteSettingsEpic.ts b/app/src/redux/pipettes/epic/updatePipetteSettingsEpic.ts
index 7650b1cfd28..71b767fb955 100644
--- a/app/src/redux/pipettes/epic/updatePipetteSettingsEpic.ts
+++ b/app/src/redux/pipettes/epic/updatePipetteSettingsEpic.ts
@@ -1,4 +1,3 @@
-// @flow
 import { ofType } from 'redux-observable'
 import mapValues from 'lodash/mapValues'
 
@@ -8,7 +7,7 @@ import { mapToRobotApiRequest } from '../../robot-api/operators'
 import * as Actions from '../actions'
 import * as Constants from '../constants'
 
-import type { Epic } from '../../types'
+import type { Action, Epic } from '../../types'
 
 import type {
   ActionToRequestMapper,
@@ -47,7 +46,9 @@ const mapResponseToAction: ResponseToActionMapper<UpdatePipetteSettingsAction> =
 
 export const updatePipetteSettingsEpic: Epic = (action$, state$) => {
   return action$.pipe(
-    ofType(Constants.UPDATE_PIPETTE_SETTINGS),
+    ofType<Action, UpdatePipetteSettingsAction>(
+      Constants.UPDATE_PIPETTE_SETTINGS
+    ),
     mapToRobotApiRequest(
       state$,
       a => a.payload.robotName,
diff --git a/app/src/redux/pipettes/index.ts b/app/src/redux/pipettes/index.ts
index ddd4ba0241d..023a057dba3 100644
--- a/app/src/redux/pipettes/index.ts
+++ b/app/src/redux/pipettes/index.ts
@@ -1,4 +1,3 @@
-// @flow
 // pipettes constants, actions, and selectors
 export * from './actions'
 export * from './constants'
diff --git a/app/src/redux/pipettes/reducer.ts b/app/src/redux/pipettes/reducer.ts
index 20afe4b9b76..2d3e7b0665f 100644
--- a/app/src/redux/pipettes/reducer.ts
+++ b/app/src/redux/pipettes/reducer.ts
@@ -1,9 +1,8 @@
-// @flow
-
 import * as Constants from './constants'
 
 import type { Action } from '../types'
 import type { PipettesState, PerRobotPipettesState } from './types'
+import type { Reducer } from 'redux'
 
 const INITIAL_STATE: PipettesState = {}
 
@@ -12,10 +11,10 @@ const INITIAL_PIPETTES_STATE: PerRobotPipettesState = {
   settingsById: null,
 }
 
-export function pipettesReducer(
-  state: PipettesState = INITIAL_STATE,
-  action: Action
-): PipettesState {
+export const pipettesReducer: Reducer<PipettesState, Action> = (
+  state = INITIAL_STATE,
+  action
+) => {
   switch (action.type) {
     case Constants.FETCH_PIPETTES_SUCCESS: {
       const { robotName, pipettes } = action.payload
diff --git a/app/src/redux/pipettes/selectors.ts b/app/src/redux/pipettes/selectors.ts
index 3e587228ffe..c164f61c7c9 100644
--- a/app/src/redux/pipettes/selectors.ts
+++ b/app/src/redux/pipettes/selectors.ts
@@ -1,4 +1,3 @@
-// @flow
 import { createSelector } from 'reselect'
 import every from 'lodash/every'
 import some from 'lodash/some'
@@ -26,7 +25,11 @@ import type { PipetteOffsetCalibration } from '../calibration/types'
 import * as Constants from './constants'
 import * as Types from './types'
 
-import type { PipetteModelSpecs } from '@opentrons/shared-data'
+import type {
+  PipetteModelSpecs,
+  PipetteName,
+  PipetteModel,
+} from '@opentrons/shared-data'
 import type { State } from '../types'
 import type { TipracksByMountMap } from '../robot/types'
 
@@ -36,7 +39,7 @@ export const getAttachedPipettes: (
   state: State,
   robotName: string | null
 ) => Types.AttachedPipettesByMount = createSelector(
-  (state, robotName) =>
+  (state: State, robotName: string | null) =>
     robotName ? state.pipettes[robotName]?.attachedByMount : null,
   attachedByMount => {
     return Constants.PIPETTE_MOUNTS.reduce<Types.AttachedPipettesByMount>(
@@ -44,7 +47,7 @@ export const getAttachedPipettes: (
         const attached = attachedByMount?.[mount] || null
         const modelSpecs =
           attached && attached.model
-            ? getPipetteModelSpecs(attached.model)
+            ? getPipetteModelSpecs(attached.model as PipetteModel)
             : null
 
         if (attached && attached.model && modelSpecs) {
@@ -126,34 +129,29 @@ const EMPTY_INFO = {
 
 const pipettesAreInexactMatch = (
   protocolInstrName: string | null,
-  actualModelSpecs: ?PipetteModelSpecs
-) => {
+  actualModelSpecs: PipetteModelSpecs | null | undefined
+): boolean => {
   const { backCompatNames } = actualModelSpecs || {}
-  return backCompatNames && backCompatNames.includes(protocolInstrName)
+  // @ts-expect-error TODO: protect against protocolInstrName === null case
+  return Boolean(backCompatNames && backCompatNames.includes(protocolInstrName))
 }
 
 // TODO(mc, 2019-12-10): possibly use getConnectedRobot selector rather than robotName
 export const getProtocolPipettesInfo: (
   state: State,
   robotName: string | null
-) => Types.ProtocolPipetteInfoByMount = createSelector<
-  State,
-  string | null,
-  Types.ProtocolPipetteInfoByMount,
-  _,
-  _,
-  _,
-  _
->(
+) => Types.ProtocolPipetteInfoByMount = createSelector(
   getAttachedPipettes,
   getProtocolPipettes,
   getPipetteOffsetCalibrations,
   (attachedByMount, protocolPipettes, pipetteOffsetCalibrations) => {
     const pipetteHasOffset = (
-      calibrations: Array<PipetteOffsetCalibration>,
+      calibrations: PipetteOffsetCalibration[],
       serial: string
-    ) => Boolean(head(calibrations.filter(cal => cal.pipette === serial)))
-    return Constants.PIPETTE_MOUNTS.reduce(
+    ): boolean => {
+      return Boolean(head(calibrations.filter(cal => cal.pipette === serial)))
+    }
+    return Constants.PIPETTE_MOUNTS.reduce<Types.ProtocolPipetteInfoByMount>(
       (result, mount) => {
         const protocolPipette = protocolPipettes.find(i => i.mount === mount)
         const actualPipette = attachedByMount[mount]
@@ -161,7 +159,7 @@ export const getProtocolPipettesInfo: (
 
         const actualModelSpecs = actualPipette?.modelSpecs
         const requestedDisplayName = requestedAs
-          ? getPipetteNameSpecs(requestedAs)?.displayName
+          ? getPipetteNameSpecs(requestedAs as PipetteName)?.displayName
           : protocolPipette?.modelSpecs?.displayName
 
         const protocolPipetteName =
@@ -213,42 +211,33 @@ export const getProtocolPipettesInfo: (
 export const getProtocolPipettesMatching: (
   state: State,
   robotName: string
-) => boolean = createSelector<State, string, boolean, _>(
-  getProtocolPipettesInfo,
-  infoByMount => {
-    return every(
-      infoByMount,
-      (info: Types.ProtocolPipetteInfo) =>
-        info.compatibility !== Constants.INCOMPATIBLE
-    )
-  }
-)
+) => boolean = createSelector(getProtocolPipettesInfo, infoByMount => {
+  return every(
+    infoByMount,
+    (info: Types.ProtocolPipetteInfo) =>
+      info.compatibility !== Constants.INCOMPATIBLE
+  )
+})
 
 export const getProtocolPipettesCalibrated: (
   state: State,
   robotName: string
-) => boolean = createSelector<State, string, boolean, _>(
-  getProtocolPipettesInfo,
-  infoByMount => {
-    return every(
-      infoByMount,
-      (info: Types.ProtocolPipetteInfo) => !info.needsOffsetCalibration
-    )
-  }
-)
+) => boolean = createSelector(getProtocolPipettesInfo, infoByMount => {
+  return every(
+    infoByMount,
+    (info: Types.ProtocolPipetteInfo) => !info.needsOffsetCalibration
+  )
+})
 
 export const getSomeProtocolPipettesInexact: (
   state: State,
   robotName: string
-) => boolean = createSelector<State, string, boolean, _>(
-  getProtocolPipettesInfo,
-  infoByMount => {
-    return some(
-      infoByMount,
-      info => info.compatibility === Constants.INEXACT_MATCH
-    )
-  }
-)
+) => boolean = createSelector(getProtocolPipettesInfo, infoByMount => {
+  return some(
+    infoByMount,
+    info => info.compatibility === Constants.INEXACT_MATCH
+  )
+})
 
 export const getUncalibratedTipracksByMount: (
   state: State,
diff --git a/app/src/redux/pipettes/types.ts b/app/src/redux/pipettes/types.ts
index cab1fc1d50b..586a3aecd59 100644
--- a/app/src/redux/pipettes/types.ts
+++ b/app/src/redux/pipettes/types.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import type { PipetteModelSpecs } from '@opentrons/shared-data'
 import type { Pipette as ProtocolPipette } from '../robot/types'
 import type { RobotApiRequestMeta } from '../robot-api/types'
@@ -12,99 +10,102 @@ import type {
 
 export type Mount = 'left' | 'right'
 
-export type AttachedPipette = {|
-  id: string,
-  name: string,
-  model: string,
-  tip_length: number,
-  mount_axis: string,
-  plunger_axis: string,
-  modelSpecs: PipetteModelSpecs,
-|}
-
-export type AttachedPipettesByMount = {|
-  left: null | AttachedPipette,
-  right: null | AttachedPipette,
-|}
-
-export type PipetteSettingsField = {|
-  value: ?number,
-  default: number,
-  min?: number,
-  max?: number,
-  units?: string,
-  type?: string,
-|}
-
-export type PipetteQuirksField = {
-  [quirkId: string]: boolean,
-}
-
-export type PipetteSettingsFieldsMap = {|
-  [fieldId: string]: PipetteSettingsField,
-  quirks?: PipetteQuirksField,
-|}
-
-export type PipetteSettings = {|
-  info: {| name: ?string, model: ?string |},
-  fields: PipetteSettingsFieldsMap,
-|}
-
-export type PipetteSettingsFieldsUpdate = $Shape<{|
-  [fieldId: string]: number | null,
-|}>
-
-export type PipetteSettingsById = $Shape<{| [id: string]: PipetteSettings |}>
-
-export type PipetteSettingsByMount = {|
-  left: PipetteSettingsFieldsMap | null,
-  right: PipetteSettingsFieldsMap | null,
-|}
+export interface AttachedPipette {
+  id: string
+  name: string
+  model: string
+  tip_length: number
+  mount_axis: string
+  plunger_axis: string
+  modelSpecs: PipetteModelSpecs
+}
+
+export type AttachedPipettesByMount = {
+  [mount in Mount]: null | AttachedPipette
+}
+
+export interface PipetteSettingsField {
+  value: number | null | undefined
+  default: number
+  min?: number
+  max?: number
+  units?: string
+  type?: string
+}
+
+export interface PipetteQuirksField {
+  [quirkId: string]: boolean
+}
+
+interface QuirksField {
+  quirks?: PipetteQuirksField
+}
+export type PipetteSettingsFieldsMap = QuirksField & {
+  [fieldId: string]: PipetteSettingsField
+}
+
+export interface PipetteSettings {
+  info: { name: string | null | undefined; model: string | null | undefined }
+  fields: PipetteSettingsFieldsMap
+}
+
+export type PipetteSettingsFieldsUpdate = Partial<{
+  [fieldId: string]: number | null
+}>
+
+export type PipetteSettingsById = Partial<{ [id: string]: PipetteSettings }>
+
+export interface PipetteSettingsByMount {
+  left: PipetteSettingsFieldsMap | null
+  right: PipetteSettingsFieldsMap | null
+}
 
 export type PipetteCompatibility = 'match' | 'inexact_match' | 'incompatible'
 
-export type ProtocolPipetteInfo = {|
-  actual: null | {|
-    ...AttachedPipette,
-    displayName: string,
-    modelSpecs: ?PipetteModelSpecs,
-  |},
-  protocol: null | {|
-    ...$Shape<$Exact<ProtocolPipette>>,
-    displayName: string,
-  |},
-  compatibility: PipetteCompatibility,
-  needsOffsetCalibration: boolean,
-|}
-
-export type ProtocolPipetteInfoByMount = {|
-  left: ProtocolPipetteInfo,
-  right: ProtocolPipetteInfo,
-|}
+export interface ProtocolPipetteInfo {
+  actual:
+    | null
+    | (AttachedPipette & {
+        displayName: string
+        modelSpecs: PipetteModelSpecs | null | undefined
+      })
+  protocol:
+    | null
+    | (Partial<ProtocolPipette> & {
+        displayName: string
+      })
+  compatibility: PipetteCompatibility
+  needsOffsetCalibration: boolean
+}
+
+export interface ProtocolPipetteInfoByMount {
+  left: ProtocolPipetteInfo
+  right: ProtocolPipetteInfo
+}
 
 // API response types
 
 export type FetchPipettesResponsePipette =
-  | {|
-      id: string,
-      name: string,
-      model: string,
-      tip_length: number,
-      mount_axis: string,
-      plunger_axis: string,
-    |}
-  | {|
-      id: null,
-      name: null,
-      model: null,
-      mount_axis: string,
-      plunger_axis: string,
-    |}
-
-export type FetchPipettesResponseBody = {|
-  left: FetchPipettesResponsePipette,
-  right: FetchPipettesResponsePipette,
-|}
+  | {
+      id: string
+      name: string
+      model: string
+      tip_length: number
+      mount_axis: string
+      plunger_axis: string
+    }
+  | {
+      id: null
+      name: null
+      model: null
+      mount_axis: string
+      plunger_axis: string
+    }
+
+export interface FetchPipettesResponseBody {
+  left: FetchPipettesResponsePipette
+  right: FetchPipettesResponsePipette
+}
 
 export type FetchPipetteSettingsResponseBody = PipetteSettingsById
 
@@ -112,71 +113,71 @@ export type FetchPipetteSettingsResponseBody = PipetteSettingsById
 
 // fetch pipettes
 
-export type FetchPipettesAction = {|
-  type: 'pipettes:FETCH_PIPETTES',
-  payload: {| robotName: string, refresh: boolean |},
-  meta: RobotApiRequestMeta,
-|}
+export interface FetchPipettesAction {
+  type: 'pipettes:FETCH_PIPETTES'
+  payload: { robotName: string; refresh: boolean }
+  meta: RobotApiRequestMeta | {}
+}
 
-export type FetchPipettesSuccessAction = {|
-  type: 'pipettes:FETCH_PIPETTES_SUCCESS',
-  payload: {| robotName: string, pipettes: FetchPipettesResponseBody |},
-  meta: RobotApiRequestMeta,
-|}
+export interface FetchPipettesSuccessAction {
+  type: 'pipettes:FETCH_PIPETTES_SUCCESS'
+  payload: { robotName: string; pipettes: FetchPipettesResponseBody }
+  meta: RobotApiRequestMeta
+}
 
-export type FetchPipettesFailureAction = {|
-  type: 'pipettes:FETCH_PIPETTES_FAILURE',
-  payload: {| robotName: string, error: {} |},
-  meta: RobotApiRequestMeta,
-|}
+export interface FetchPipettesFailureAction {
+  type: 'pipettes:FETCH_PIPETTES_FAILURE'
+  payload: { robotName: string; error: {} }
+  meta: RobotApiRequestMeta
+}
 
 // fetch pipette settings
 
-export type FetchPipetteSettingsAction = {|
-  type: 'pipettes:FETCH_PIPETTE_SETTINGS',
-  payload: {| robotName: string |},
-  meta: RobotApiRequestMeta,
-|}
+export interface FetchPipetteSettingsAction {
+  type: 'pipettes:FETCH_PIPETTE_SETTINGS'
+  payload: { robotName: string }
+  meta: RobotApiRequestMeta | {}
+}
 
-export type FetchPipetteSettingsSuccessAction = {|
-  type: 'pipettes:FETCH_PIPETTE_SETTINGS_SUCCESS',
-  payload: {| robotName: string, settings: FetchPipetteSettingsResponseBody |},
-  meta: RobotApiRequestMeta,
-|}
+export interface FetchPipetteSettingsSuccessAction {
+  type: 'pipettes:FETCH_PIPETTE_SETTINGS_SUCCESS'
+  payload: { robotName: string; settings: FetchPipetteSettingsResponseBody }
+  meta: RobotApiRequestMeta
+}
 
-export type FetchPipetteSettingsFailureAction = {|
-  type: 'pipettes:FETCH_PIPETTE_SETTINGS_FAILURE',
-  payload: {| robotName: string, error: {} |},
-  meta: RobotApiRequestMeta,
-|}
+export interface FetchPipetteSettingsFailureAction {
+  type: 'pipettes:FETCH_PIPETTE_SETTINGS_FAILURE'
+  payload: { robotName: string; error: {} }
+  meta: RobotApiRequestMeta
+}
 
 // update pipette settings
 
-export type UpdatePipetteSettingsAction = {|
-  type: 'pipettes:UPDATE_PIPETTE_SETTINGS',
-  payload: {|
-    robotName: string,
-    pipetteId: string,
-    fields: PipetteSettingsFieldsUpdate,
-  |},
-  meta: RobotApiRequestMeta,
-|}
-
-export type UpdatePipetteSettingsSuccessAction = {|
-  type: 'pipettes:UPDATE_PIPETTE_SETTINGS_SUCCESS',
-  payload: {|
-    robotName: string,
-    pipetteId: string,
-    fields: PipetteSettingsFieldsMap,
-  |},
-  meta: RobotApiRequestMeta,
-|}
-
-export type UpdatePipetteSettingsFailureAction = {|
-  type: 'pipettes:UPDATE_PIPETTE_SETTINGS_FAILURE',
-  payload: {| robotName: string, pipetteId: string, error: {} |},
-  meta: RobotApiRequestMeta,
-|}
+export interface UpdatePipetteSettingsAction {
+  type: 'pipettes:UPDATE_PIPETTE_SETTINGS'
+  payload: {
+    robotName: string
+    pipetteId: string
+    fields: PipetteSettingsFieldsUpdate
+  }
+  meta: RobotApiRequestMeta | {}
+}
+
+export interface UpdatePipetteSettingsSuccessAction {
+  type: 'pipettes:UPDATE_PIPETTE_SETTINGS_SUCCESS'
+  payload: {
+    robotName: string
+    pipetteId: string
+    fields: PipetteSettingsFieldsMap
+  }
+  meta: RobotApiRequestMeta
+}
+
+export interface UpdatePipetteSettingsFailureAction {
+  type: 'pipettes:UPDATE_PIPETTE_SETTINGS_FAILURE'
+  payload: { robotName: string; pipetteId: string; error: {} }
+  meta: RobotApiRequestMeta
+}
 
 // pipette actions unions
 
@@ -193,23 +194,21 @@ export type PipettesAction =
 
 // state types
 
-export type PerRobotPipettesState = $ReadOnly<{|
-  attachedByMount: FetchPipettesResponseBody | null,
-  settingsById: FetchPipetteSettingsResponseBody | null,
-|}>
-
-export type PipettesState = $Shape<
-  $ReadOnly<{|
-    [robotName: string]: void | PerRobotPipettesState,
-  |}>
->
-
-export type PipetteCalibrations = {|
-  offset: PipetteOffsetCalibration | null,
-  tipLength: TipLengthCalibration | null,
-|}
-
-export type PipetteCalibrationsByMount = {|
-  left: PipetteCalibrations,
-  right: PipetteCalibrations,
-|}
+export interface PerRobotPipettesState {
+  readonly attachedByMount: FetchPipettesResponseBody | null
+  readonly settingsById: FetchPipetteSettingsResponseBody | null
+}
+
+export type PipettesState = Partial<{
+  readonly [robotName: string]: null | undefined | PerRobotPipettesState
+}>
+
+export interface PipetteCalibrations {
+  offset: PipetteOffsetCalibration | null
+  tipLength: TipLengthCalibration | null
+}
+
+export interface PipetteCalibrationsByMount {
+  left: PipetteCalibrations
+  right: PipetteCalibrations
+}
diff --git a/app/src/redux/protocol/__tests__/actions.test.ts b/app/src/redux/protocol/__tests__/actions.test.ts
index 532e45d722f..da7cf401567 100644
--- a/app/src/redux/protocol/__tests__/actions.test.ts
+++ b/app/src/redux/protocol/__tests__/actions.test.ts
@@ -9,10 +9,14 @@ const mockStore = configureMockStore(middlewares)
 
 jest.mock('../../config/selectors')
 
+const getFeatureFlags = ConfigSelectors.getFeatureFlags as jest.MockedFunction<
+  typeof ConfigSelectors.getFeatureFlags
+>
+
 describe('protocol actions', () => {
-  let store
-  let _FileReader
-  let mockReader
+  let store: any
+  let _FileReader: any
+  let mockReader: any
 
   beforeEach(() => {
     _FileReader = global.FileReader
@@ -20,7 +24,7 @@ describe('protocol actions', () => {
 
     store = mockStore({})
     global.FileReader = jest.fn(() => mockReader)
-    ConfigSelectors.getFeatureFlags.mockReturnValue({
+    getFeatureFlags.mockReturnValue({
       enableBundleUpload: false,
     })
   })
@@ -35,19 +39,19 @@ describe('protocol actions', () => {
       name: 'foobar.py',
       type: 'python',
       lastModified: 123,
-    }
+    } as any
 
     const bundleFile = {
       name: 'foobar.zip',
       type: 'zip',
       lastModified: 111,
-    }
+    } as any
 
     const jsonFile = {
       name: 'foobar.json',
       type: 'json',
       lastModified: 456,
-    }
+    } as any
 
     it('dispatches a protocol:OPEN', () => {
       const result = store.dispatch(openProtocol(pythonFile))
@@ -99,7 +103,7 @@ describe('protocol actions', () => {
 
     describe('bundle upload', () => {
       it('dispatches a protocol:OPEN', () => {
-        ConfigSelectors.getFeatureFlags.mockReturnValue({
+        getFeatureFlags.mockReturnValue({
           enableBundleUpload: true,
         })
         const result = store.dispatch(openProtocol(bundleFile))
diff --git a/app/src/redux/protocol/__tests__/reducer.test.ts b/app/src/redux/protocol/__tests__/reducer.test.ts
index a3799989383..0de6ce42918 100644
--- a/app/src/redux/protocol/__tests__/reducer.test.ts
+++ b/app/src/redux/protocol/__tests__/reducer.test.ts
@@ -1,41 +1,60 @@
 // protocol state reducer tests
 
 import { protocolReducer } from '../reducer'
+import type { Action } from '../../types'
+import type { ProtocolState } from '../types'
 
 describe('protocolReducer', () => {
   it('initial state', () => {
-    expect(protocolReducer(undefined, {})).toEqual({
+    expect(protocolReducer(undefined, {} as any)).toEqual({
       file: null,
       contents: null,
       data: null,
     })
   })
 
-  const SPECS = [
+  const SPECS: Array<{
+    name: string
+    action: Action
+    initialState: ProtocolState
+    expectedState: ProtocolState
+  }> = [
     {
       name: 'handles protocol:OPEN',
       action: {
         type: 'protocol:OPEN',
-        payload: { file: { name: 'proto.py' } },
+        payload: { file: { name: 'proto.py' } as any },
       },
-      initialState: { file: {}, contents: 'foobar', data: {} },
-      expectedState: { file: { name: 'proto.py' }, contents: null, data: null },
+      initialState: { file: {}, contents: 'foobar', data: {} } as any,
+      expectedState: {
+        file: { name: 'proto.py' },
+        contents: null,
+        data: null,
+      } as any,
     },
     {
       name: 'handles protocol:UPLOAD',
       action: {
         type: 'protocol:UPLOAD',
         payload: { contents: 'foo', data: {} },
-      },
-      initialState: { file: { name: 'proto.py' }, contents: null, data: null },
-      expectedState: { file: { name: 'proto.py' }, contents: 'foo', data: {} },
+      } as any,
+      initialState: {
+        file: { name: 'proto.py' },
+        contents: null,
+        data: null,
+      } as any,
+      expectedState: {
+        file: { name: 'proto.py' },
+        contents: 'foo',
+        data: {},
+      } as any,
     },
     {
       name: 'handles robot:SESSION_RESPONSE with non-JSON protocol',
       action: {
         type: 'robot:SESSION_RESPONSE',
         payload: { name: 'foo', protocolText: 'bar' },
-      },
+      } as any,
       initialState: { file: null, contents: null, data: null },
       expectedState: {
         file: { name: 'foo', type: null, lastModified: null },
diff --git a/app/src/redux/protocol/__tests__/selectors.test.ts b/app/src/redux/protocol/__tests__/selectors.test.ts
index 13c85db3157..a491244e880 100644
--- a/app/src/redux/protocol/__tests__/selectors.test.ts
+++ b/app/src/redux/protocol/__tests__/selectors.test.ts
@@ -1,18 +1,26 @@
 // protocol state selector tests
 
 import * as protocol from '..'
+import type { State } from '../../types'
 
-const SPECS = [
+const SPECS: Array<{
+  name: string
+  selector: (state: State) => unknown
+  state: State
+  expected: unknown
+}> = [
   {
     name: 'getProtocolFile',
     selector: protocol.getProtocolFile,
-    state: { protocol: { file: { name: 'proto.json' } } },
+    state: { protocol: { file: { name: 'proto.json' } } } as any,
     expected: { name: 'proto.json' },
   },
   {
     name: 'getProtocolContents',
     selector: protocol.getProtocolContents,
-    state: { protocol: { file: { name: 'proto.json' }, contents: 'fizzbuzz' } },
+    state: {
+      protocol: { file: { name: 'proto.json' }, contents: 'fizzbuzz' },
+    } as any,
     expected: 'fizzbuzz',
   },
   {
@@ -24,32 +32,36 @@ const SPECS = [
         contents: 'fizzbuzz',
         data: { metadata: {} },
       },
-    },
+    } as any,
     expected: { metadata: {} },
   },
   {
     name: 'getProtocolFilename with no file',
     selector: protocol.getProtocolFilename,
-    state: { protocol: { file: null } },
+    state: { protocol: { file: null } } as any,
     expected: null,
   },
   {
     name: 'getProtocolFilename',
     selector: protocol.getProtocolFilename,
-    state: { protocol: { file: { name: 'proto.json' } } },
+    state: { protocol: { file: { name: 'proto.json' } } } as any,
     expected: 'proto.json',
   },
   {
     name: 'getProtocolName with nothing loaded',
     selector: protocol.getProtocolName,
-    state: { protocol: { file: null, contents: null, data: null } },
+    state: { protocol: { file: null, contents: null, data: null } } as any,
     expected: null,
   },
   {
     name: 'getProtocolName from filename if no data',
     selector: protocol.getProtocolName,
     state: {
-      protocol: { file: { name: 'proto.json' }, contents: null, data: null },
+      protocol: {
+        file: { name: 'proto.json' },
+        contents: null,
+        data: null,
+      } as any,
     },
     expected: 'proto',
   },
@@ -62,7 +74,7 @@ const SPECS = [
         contents: 'fizzbuzz',
         data: { metadata: {} },
       },
-    },
+    } as any,
     expected: 'proto',
   },
   {
@@ -74,7 +86,7 @@ const SPECS = [
         contents: 'fizzbuzz',
         data: { metadata: { 'protocol-name': 'A Protocol' } },
       },
-    },
+    } as any,
     expected: 'A Protocol',
   },
   {
@@ -86,7 +98,7 @@ const SPECS = [
         contents: 'fizzbuzz',
         data: {},
       },
-    },
+    } as any,
     expected: 'proto',
   },
   {
@@ -98,49 +110,49 @@ const SPECS = [
         contents: 'fizzbuzz',
         data: { metadata: { protocolName: 'A Protocol' } },
       },
-    },
+    } as any,
     expected: 'A Protocol',
   },
   {
     name: 'getProtocolAuthor if no data',
     selector: protocol.getProtocolAuthor,
-    state: { protocol: { data: null } },
+    state: { protocol: { data: null } } as any,
     expected: null,
   },
   {
     name: 'getProtocolAuthor if no metadata',
     selector: protocol.getProtocolAuthor,
-    state: { protocol: { data: {} } },
+    state: { protocol: { data: {} } } as any,
     expected: null,
   },
   {
     name: 'getProtocolAuthor if author not in metadata',
     selector: protocol.getProtocolAuthor,
-    state: { protocol: { data: { metadata: {} } } },
+    state: { protocol: { data: { metadata: {} } } } as any,
     expected: null,
   },
   {
     name: 'getProtocolAuthor if author in metadata',
     selector: protocol.getProtocolAuthor,
-    state: { protocol: { data: { metadata: { author: 'Fizz Buzz' } } } },
+    state: { protocol: { data: { metadata: { author: 'Fizz Buzz' } } } } as any,
     expected: 'Fizz Buzz',
   },
   {
     name: 'getProtocolDescription if no data',
     selector: protocol.getProtocolDescription,
-    state: { protocol: { data: null } },
+    state: { protocol: { data: null } } as any,
     expected: null,
   },
   {
     name: 'getProtocolDescription if no metaddata',
     selector: protocol.getProtocolDescription,
-    state: { protocol: { data: {} } },
+    state: { protocol: { data: {} } } as any,
     expected: null,
   },
   {
     name: 'getProtocolDescription if description not in metadata',
     selector: protocol.getProtocolDescription,
-    state: { protocol: { data: { metadata: {} } } },
+    state: { protocol: { data: { metadata: {} } } } as any,
     expected: null,
   },
   {
@@ -148,13 +160,13 @@ const SPECS = [
     selector: protocol.getProtocolDescription,
     state: {
       protocol: { data: { metadata: { description: 'Fizzes buzzes' } } },
-    },
+    } as any,
     expected: 'Fizzes buzzes',
   },
   {
     name: 'getProtocolDescription if description not in metadata',
     selector: protocol.getProtocolDescription,
-    state: { protocol: { data: { metadata: {} } } },
+    state: { protocol: { data: { metadata: {} } } } as any,
     expected: null,
   },
   {
@@ -162,19 +174,19 @@ const SPECS = [
     selector: protocol.getProtocolDescription,
     state: {
       protocol: { data: { metadata: { description: 'Fizzes buzzes' } } },
-    },
+    } as any,
     expected: 'Fizzes buzzes',
   },
   {
     name: 'getProtocolLastUpdated if nothing loaded',
     selector: protocol.getProtocolLastUpdated,
-    state: { protocol: { file: null, contents: null, data: null } },
+    state: { protocol: { file: null, contents: null, data: null } } as any,
     expected: null,
   },
   {
     name: 'getProtocolLastUpdated from file.lastModified',
     selector: protocol.getProtocolLastUpdated,
-    state: { protocol: { file: { lastModified: 1 } } },
+    state: { protocol: { file: { lastModified: 1 } } } as any,
     expected: 1,
   },
   {
@@ -185,7 +197,7 @@ const SPECS = [
         file: { lastModified: 1 },
         data: {},
       },
-    },
+    } as any,
     expected: 1,
   },
   {
@@ -196,7 +208,7 @@ const SPECS = [
         file: { lastModified: 1 },
         data: { metadata: { created: 2 } },
       },
-    },
+    } as any,
     expected: 2,
   },
   {
@@ -207,7 +219,7 @@ const SPECS = [
         file: { lastModified: 1 },
         data: { metadata: { created: 2, 'last-modified': 3 } },
       },
-    },
+    } as any,
     expected: 3,
   },
   {
@@ -218,7 +230,7 @@ const SPECS = [
         file: { lastModified: 1 },
         data: { metadata: { created: 2, lastModified: 4 } },
       },
-    },
+    } as any,
     expected: 4,
   },
   {
@@ -226,7 +238,7 @@ const SPECS = [
     selector: protocol.getProtocolApiVersion,
     state: {
       robot: { session: { apiLevel: null } },
-    },
+    } as any,
     expected: null,
   },
   {
@@ -234,7 +246,7 @@ const SPECS = [
     selector: protocol.getProtocolApiVersion,
     state: {
       robot: { session: { apiLevel: [2, 4] } },
-    },
+    } as any,
     expected: '2.4',
   },
   {
@@ -243,7 +255,7 @@ const SPECS = [
     state: {
       robot: { session: { apiLevel: [1, 0] } },
       protocol: { file: null, contents: null, data: null },
-    },
+    } as any,
     expected: null,
   },
   {
@@ -252,7 +264,7 @@ const SPECS = [
     state: {
       robot: { session: { apiLevel: [1, 0] } },
       protocol: { file: { name: 'proto.py' }, contents: null, data: null },
-    },
+    } as any,
     expected: null,
   },
   {
@@ -265,7 +277,7 @@ const SPECS = [
         contents: 'fizzbuzz',
         data: null,
       },
-    },
+    } as any,
     expected: 'Python Protocol API v1.0',
   },
   {
@@ -278,7 +290,7 @@ const SPECS = [
         contents: 'fizzbuzz',
         data: null,
       },
-    },
+    } as any,
     expected: 'Unknown Application',
   },
   {
@@ -291,7 +303,7 @@ const SPECS = [
         contents: 'fizzbuzz',
         data: { metadata: {} },
       },
-    },
+    } as any,
     expected: 'Unknown Application',
   },
   {
@@ -309,7 +321,7 @@ const SPECS = [
           },
         },
       },
-    },
+    } as any,
     expected: 'Protocol Designer',
   },
   {
@@ -328,7 +340,7 @@ const SPECS = [
           },
         },
       },
-    },
+    } as any,
     expected: 'Protocol Designer v1.2.3',
   },
   {
@@ -348,7 +360,7 @@ const SPECS = [
           },
         },
       },
-    },
+    } as any,
     expected: 'Protocol Designer v4.5.6',
   },
   {
@@ -361,7 +373,7 @@ const SPECS = [
         contents: 'fizzbuzz',
         data: null,
       },
-    },
+    } as any,
     expected: {},
   },
   {
@@ -374,7 +386,7 @@ const SPECS = [
         contents: 'fizzbuzz',
         data: { labwareDefinitions: {} },
       },
-    },
+    } as any,
     expected: {},
   },
   {
@@ -397,7 +409,7 @@ const SPECS = [
           },
         },
       },
-    },
+    } as any,
     expected: {
       1: { mockDefinition1: true },
       2: { mockDefinition2: true },
@@ -429,7 +441,7 @@ const SPECS = [
           },
         },
       },
-    },
+    } as any,
     expected: {
       1: { mockDefinition1: true },
       2: { mockDefinition2: true },
@@ -461,7 +473,7 @@ const SPECS = [
           },
         },
       },
-    },
+    } as any,
     expected: {
       1: { mockDefinition1: true },
       7: { mockDefinition2: true },
diff --git a/app/src/redux/protocol/constants.ts b/app/src/redux/protocol/constants.ts
index afa4f697456..3b813f3193b 100644
--- a/app/src/redux/protocol/constants.ts
+++ b/app/src/redux/protocol/constants.ts
@@ -1,5 +1,3 @@
-// @flow
-
 // protocol types
 export const TYPE_JSON: 'json' = 'json'
 export const TYPE_PYTHON: 'python' = 'python'
diff --git a/app/src/redux/protocol/index.ts b/app/src/redux/protocol/index.ts
index 2fea36fed61..d95ec9ab591 100644
--- a/app/src/redux/protocol/index.ts
+++ b/app/src/redux/protocol/index.ts
@@ -1,4 +1,3 @@
-// @flow
 // protocol state and loading actions
 import { getFeatureFlags } from '../config/selectors'
 import {
diff --git a/app/src/redux/protocol/protocol-data.ts b/app/src/redux/protocol/protocol-data.ts
index c5d68f771e5..76d14a104c9 100644
--- a/app/src/redux/protocol/protocol-data.ts
+++ b/app/src/redux/protocol/protocol-data.ts
@@ -1,4 +1,3 @@
-// @flow
 // functions for parsing protocol files
 import { createLogger } from '../../logger'
 import { TYPE_JSON, TYPE_PYTHON, TYPE_ZIP } from './constants'
@@ -30,7 +29,7 @@ export function parseProtocolData(
   file: ProtocolFile,
   contents: string,
   // optional Python protocol metadata
-  metadata: ?$PropertyType<ProtocolData, 'metadata'>
+  metadata?: ProtocolData['metadata'] | null
 ): ProtocolData | null {
   if (fileIsJson(file)) {
     try {
@@ -39,9 +38,9 @@ export function parseProtocolData(
       // TODO(mc, 2018-09-05): surface parse error to user prior to upload
       log.warn('Failed to parse JSON', { contents, message: e.message })
     }
-  } else if (metadata) {
+  } else if (metadata != null) {
     // grab Python protocol metadata, if any
-    // $FlowFixMe: (ka, 2019-06-10): cant differentiate which file schema file is needed
+    // @ts-expect-error(sa, 2021-05-12): cant differentiate which file schema file is needed
     return { metadata }
   }
 
diff --git a/app/src/redux/protocol/reducer.ts b/app/src/redux/protocol/reducer.ts
index 56aafb0adfe..4716ee1a9fc 100644
--- a/app/src/redux/protocol/reducer.ts
+++ b/app/src/redux/protocol/reducer.ts
@@ -1,15 +1,15 @@
-// @flow
 import { filenameToType, parseProtocolData } from './protocol-data'
 
+import type { Reducer } from 'redux'
 import type { Action } from '../types'
 import type { ProtocolState } from './types'
 
 const INITIAL_STATE: ProtocolState = { file: null, contents: null, data: null }
 
-export function protocolReducer(
-  state: ProtocolState = INITIAL_STATE,
-  action: Action
-): ProtocolState {
+export const protocolReducer: Reducer<ProtocolState, Action> = (
+  state = INITIAL_STATE,
+  action
+) => {
   switch (action.type) {
     case 'protocol:INVALID_FILE':
       return { ...INITIAL_STATE, file: action.payload.file }
diff --git a/app/src/redux/protocol/selectors.ts b/app/src/redux/protocol/selectors.ts
index b6ce020cd74..4fa37b54dbe 100644
--- a/app/src/redux/protocol/selectors.ts
+++ b/app/src/redux/protocol/selectors.ts
@@ -1,4 +1,3 @@
-// @flow
 import path from 'path'
 import startCase from 'lodash/startCase'
 
@@ -11,15 +10,18 @@ import type { LabwareDefinition2 } from '@opentrons/shared-data'
 import type { State } from '../types'
 import type { ProtocolData, ProtocolType, ProtocolFile } from './types'
 
-type ProtocolInfoSelector = State => {|
-  protocolName: string | null,
-  lastModified: number | null,
-  appName: string | null,
-  appVersion: string | null,
-|}
+type ProtocolInfoSelector = (
+  state: State
+) => {
+  protocolName: string | null
+  lastModified: number | null
+  appName: string | null
+  appVersion: string | null
+}
 
 const log = createLogger(__filename)
-const stripDirAndExtension = f => path.basename(f, path.extname(f))
+const stripDirAndExtension = (f: string): string =>
+  path.basename(f, path.extname(f))
 
 export const getProtocolFile = (state: State): ProtocolFile | null =>
   state.protocol.file
@@ -32,10 +34,9 @@ export const getProtocolContents = (state: State): string | null =>
 export const getProtocolData = (state: State): ProtocolData | null =>
   state.protocol.data
 
-export const getProtocolFilename: State => string | null = createSelector(
-  getProtocolFile,
-  file => file?.name ?? null
-)
+export const getProtocolFilename: (
+  state: State
+) => string | null = createSelector(getProtocolFile, file => file?.name ?? null)
 
 // TODO: (ka 2019-06-11): Investigate removing this unused? selector
 // export const getProtocolLastModified: NumberSelector = createSelector(
@@ -43,46 +44,46 @@ export const getProtocolFilename: State => string | null = createSelector(
 //   file => file && file.lastModified
 // )
 
-type LabwareDefinitionBySlotMap = {
-  [slot: string]: LabwareDefinition2 | void,
-  ...
+interface LabwareDefinitionBySlotMap {
+  [slot: string]: LabwareDefinition2 | null | undefined
 }
 
-export const getLabwareDefBySlot: State => LabwareDefinitionBySlotMap = createSelector(
-  getProtocolData,
-  data => {
-    if (data?.labwareDefinitions && data.labware) {
-      const labwareById = data.labware
-      const labwareDefinitions = data.labwareDefinitions
-
-      return Object.keys(labwareById).reduce(
-        (defsBySlot: LabwareDefinitionBySlotMap, labwareId: string) => {
-          const labware = labwareById[labwareId]
-          let slot: string =
-            data.modules && labware.slot in data.modules
-              ? data.modules[labware.slot].slot
-              : labware.slot
-
-          // TODO(mc, 2020-08-04): this is for thermocycler support, and its
-          // ugliness is due to deficiences in RPC-based labware state
-          // revisit as part of Protocol Sessions project
-          if (slot === 'span7_8_10_11') slot = '7'
-
-          if (slot in defsBySlot) {
-            log.warn(
-              `expected 1 labware per slot, slot ${slot} contains multiple labware`
-            )
-          }
-
-          defsBySlot[slot] = labwareDefinitions[labware.definitionId]
-          return defsBySlot
-        },
-        {}
-      )
-    }
-    return {}
+export const getLabwareDefBySlot: (
+  state: State
+) => LabwareDefinitionBySlotMap = createSelector(getProtocolData, data => {
+  if (data && 'labwareDefinitions' in data && 'labware' in data) {
+    const labwareById = data.labware
+    const labwareDefinitions = data.labwareDefinitions
+
+    return Object.keys(labwareById).reduce(
+      (defsBySlot: LabwareDefinitionBySlotMap, labwareId: string) => {
+        const labware = labwareById[labwareId]
+        let slot: string =
+          // @ts-expect-error(sa, 2021-05-12): data has been type narrowed to be Readonly<ProtocolFileV3<{}>>, which does not have modules
+          data.modules && labware.slot in data.modules
+            ? // @ts-expect-error(sa, 2021-05-12): data has been type narrowed to be Readonly<ProtocolFileV3<{}>>, which does not have modules
+              data.modules[labware.slot].slot
+            : labware.slot
+
+        // TODO(mc, 2020-08-04): this is for thermocycler support, and its
+        // ugliness is due to deficiences in RPC-based labware state
+        // revisit as part of Protocol Sessions project
+        if (slot === 'span7_8_10_11') slot = '7'
+
+        if (slot in defsBySlot) {
+          log.warn(
+            `expected 1 labware per slot, slot ${slot} contains multiple labware`
+          )
+        }
+
+        defsBySlot[slot] = labwareDefinitions[labware.definitionId]
+        return defsBySlot
+      },
+      {}
+    )
   }
-)
+  return {}
+})
 
 export const getProtocolDisplayData: ProtocolInfoSelector = createSelector(
   getProtocolData,
@@ -102,7 +103,7 @@ export const getProtocolDisplayData: ProtocolInfoSelector = createSelector(
     // TODO(mc, 2020-08-04): this typing doesn't behave; put data access behind
     // a unit tested utility that migrates all data patterns up to latest schema
     const data: any = _data
-    const metadata: any | void = _data.metadata
+    const metadata: any | null | undefined = _data.metadata
 
     const protocolName =
       metadata?.protocolName ?? metadata?.['protocol-name'] ?? basename
@@ -132,45 +133,56 @@ export const getProtocolDisplayData: ProtocolInfoSelector = createSelector(
   }
 )
 
-export const getProtocolName: State => string | null = createSelector(
+export const getProtocolName: (state: State) => string | null = createSelector(
   getProtocolDisplayData,
   displayData => displayData.protocolName
 )
 
-export const getProtocolAuthor: State => string | null = createSelector(
+export const getProtocolAuthor: (
+  state: State
+) => string | null = createSelector(
   getProtocolData,
-  data => data?.metadata?.author ?? null
+  data => (data?.metadata?.author as string) ?? null
 )
 
-export const getProtocolDescription: State => string | null = createSelector(
+export const getProtocolDescription: (
+  state: State
+) => string | null = createSelector(
   getProtocolData,
-  data => data?.metadata?.description ?? null
+  data => (data?.metadata?.description as string) ?? null
 )
 
-export const getProtocolSource: State => string | null = createSelector(
-  getProtocolData,
-  data => {
-    return typeof data?.metadata?.source === 'string'
-      ? data.metadata.source
-      : null
-  }
-)
+export const getProtocolSource: (
+  state: State
+) => string | null = createSelector(getProtocolData, data => {
+  // @ts-expect-error TODO: use in operator to protect against non existent source
+  return typeof data?.metadata?.source === 'string'
+    ? // @ts-expect-error TODO: use in operator to protect against non existent source
+      data.metadata.source
+    : null
+})
 
-export const getProtocolLastUpdated: State => number | null = createSelector(
+export const getProtocolLastUpdated: (
+  state: State
+) => number | null = createSelector(
   getProtocolFile,
   getProtocolDisplayData,
   (file, displayData) => displayData.lastModified ?? file?.lastModified ?? null
 )
 
-export const getProtocolType: State => ProtocolType | null = createSelector(
+export const getProtocolType: (
+  state: State
+) => ProtocolType | null = createSelector(
   getProtocolFile,
   file => file?.type || null
 )
 
-export const getProtocolCreatorApp: State => {|
-  name: string | null,
-  version: string | null,
-|} = createSelector(getProtocolDisplayData, displayData => {
+export const getProtocolCreatorApp: (
+  state: State
+) => {
+  name: string | null
+  version: string | null
+} = createSelector(getProtocolDisplayData, displayData => {
   return {
     name: displayData.appName,
     version: displayData.appVersion,
@@ -188,7 +200,9 @@ export const getProtocolApiVersion = (state: State): string | null => {
 const METHOD_OT_API = 'Python Protocol API'
 const METHOD_UNKNOWN = 'Unknown Application'
 
-export const getProtocolMethod: State => string | null = createSelector(
+export const getProtocolMethod: (
+  state: State
+) => string | null = createSelector(
   getProtocolFile,
   getProtocolContents,
   getProtocolData,
diff --git a/app/src/redux/protocol/types.ts b/app/src/redux/protocol/types.ts
index 727e5361e23..8071241a549 100644
--- a/app/src/redux/protocol/types.ts
+++ b/app/src/redux/protocol/types.ts
@@ -1,47 +1,53 @@
-// @flow
 // protocol type defs
-import type { JsonProtocolFile, ProtocolFileV1 } from '@opentrons/shared-data'
-
-import typeof { TYPE_JSON, TYPE_PYTHON, TYPE_ZIP } from './constants'
-
-export type PythonProtocolMetadata = {
-  ...$Exact<$PropertyType<ProtocolFileV1<{ ... }>, 'metadata'>>,
-  source?: string,
-  ...
+import type {
+  JsonProtocolFile,
+  ProtocolFileV1,
+} from '@opentrons/shared-data/protocol'
+
+import { TYPE_JSON, TYPE_PYTHON, TYPE_ZIP } from './constants'
+
+export type PythonProtocolMetadata = ProtocolFileV1<{
+  [key: string]: unknown
+}> & {
+  source?: string
+  [key: string]: unknown
 }
 
 // data may be a full JSON protocol or just a metadata dict from Python
 // NOTE: add union of additional versions after schema is bumped
 export type ProtocolData =
   | JsonProtocolFile
-  | {| metadata: PythonProtocolMetadata |}
-
-export type ProtocolType = TYPE_JSON | TYPE_PYTHON | TYPE_ZIP
-
-export type ProtocolFile = {
-  name: string,
-  type: ?ProtocolType,
-  lastModified: ?number,
-  ...
+  | { metadata: PythonProtocolMetadata }
+
+export type ProtocolType =
+  | typeof TYPE_JSON
+  | typeof TYPE_PYTHON
+  | typeof TYPE_ZIP
+
+export interface ProtocolFile {
+  name: string
+  type: ProtocolType | null | undefined
+  lastModified: number | null | undefined
+  [key: string]: unknown
 }
 
 // action types
 
-export type OpenProtocolAction = {|
-  type: 'protocol:OPEN',
-  payload: {| file: ProtocolFile |},
-|}
+export interface OpenProtocolAction {
+  type: 'protocol:OPEN'
+  payload: { file: ProtocolFile }
+}
 
-export type UploadProtocolAction = {|
-  type: 'protocol:UPLOAD',
-  payload: {| contents: string, data: ProtocolData | null |},
-  meta: {| robot: true |},
-|}
+export interface UploadProtocolAction {
+  type: 'protocol:UPLOAD'
+  payload: { contents: string; data: ProtocolData | null }
+  meta: { robot: true }
+}
 
-export type InvalidProtocolFileAction = {|
-  type: 'protocol:INVALID_FILE',
-  payload: {| file: ProtocolFile, message: string |},
-|}
+export interface InvalidProtocolFileAction {
+  type: 'protocol:INVALID_FILE'
+  payload: { file: ProtocolFile; message: string }
+}
 
 export type ProtocolAction =
   | OpenProtocolAction
@@ -50,8 +56,8 @@ export type ProtocolAction =
 
 // state types
 
-export type ProtocolState = $ReadOnly<{|
-  file: ProtocolFile | null,
-  contents: string | null,
-  data: ProtocolData | null,
-|}>
+export interface ProtocolState {
+  readonly file: ProtocolFile | null
+  readonly contents: string | null
+  readonly data: ProtocolData | null
+}
diff --git a/app/src/redux/reducer.ts b/app/src/redux/reducer.ts
index 3fd3be8112f..5521f5e5fd3 100644
--- a/app/src/redux/reducer.ts
+++ b/app/src/redux/reducer.ts
@@ -1,4 +1,3 @@
-// @flow
 import createHistory from 'history/createHashHistory'
 import { combineReducers } from 'redux'
 import { connectRouter } from 'connected-react-router'
@@ -58,12 +57,14 @@ import { sessionReducer } from './sessions/reducer'
 import { calibrationReducer } from './calibration/reducer'
 
 import type { Reducer } from 'redux'
-import type { HashHistory } from 'history/createHashHistory'
 import type { State, Action } from './types'
 
-export const history: HashHistory = createHistory()
+export const history = createHistory<any>()
 
-export const rootReducer: Reducer<State, Action> = combineReducers<_, Action>({
+export const rootReducer: Reducer<State, Action> = combineReducers<
+  State,
+  Action
+>({
   robot: robotReducer,
   robotApi: robotApiReducer,
   robotAdmin: robotAdminReducer,
@@ -82,5 +83,8 @@ export const rootReducer: Reducer<State, Action> = combineReducers<_, Action>({
   alerts: alertsReducer,
   sessions: sessionReducer,
   calibration: calibrationReducer,
-  router: connectRouter<_, Action>(history),
+  router: connectRouter<State['router']>(history) as Reducer<
+    State['router'],
+    Action
+  >,
 })
diff --git a/app/src/redux/robot-admin/__fixtures__/index.ts b/app/src/redux/robot-admin/__fixtures__/index.ts
index fc99c4744f4..5ee7b1ef37c 100644
--- a/app/src/redux/robot-admin/__fixtures__/index.ts
+++ b/app/src/redux/robot-admin/__fixtures__/index.ts
@@ -1,12 +1,12 @@
-// @flow
 // mock HTTP responses for pipettes endpoints
 import { mockRobot } from '../../robot-api/__fixtures__'
+import type { Method } from '../../robot-api/types'
 
 export * from './system-time'
 
 export const mockRestartSuccess = {
   host: mockRobot,
-  method: 'POST',
+  method: 'POST' as Method,
   path: '/server/restart',
   ok: true,
   status: 200,
@@ -14,7 +14,7 @@ export const mockRestartSuccess = {
 }
 
 export const mockRestartSuccessMeta = {
-  method: 'POST',
+  method: 'POST' as Method,
   path: '/server/restart',
   ok: true,
   status: 200,
@@ -22,7 +22,7 @@ export const mockRestartSuccessMeta = {
 
 export const mockRestartFailure = {
   host: mockRobot,
-  method: 'POST',
+  method: 'POST' as Method,
   path: '/server/restart',
   ok: false,
   status: 500,
@@ -30,7 +30,7 @@ export const mockRestartFailure = {
 }
 
 export const mockRestartFailureMeta = {
-  method: 'POST',
+  method: 'POST' as Method,
   path: '/server/restart',
   ok: false,
   status: 500,
@@ -43,7 +43,7 @@ export const mockResetOptions = [
 
 export const mockFetchResetOptionsSuccess = {
   host: mockRobot,
-  method: 'GET',
+  method: 'GET' as Method,
   path: '/settings/reset/options',
   ok: true,
   status: 200,
@@ -51,7 +51,7 @@ export const mockFetchResetOptionsSuccess = {
 }
 
 export const mockFetchResetOptionsSuccessMeta = {
-  method: 'GET',
+  method: 'GET' as Method,
   path: '/settings/reset/options',
   ok: true,
   status: 200,
@@ -59,7 +59,7 @@ export const mockFetchResetOptionsSuccessMeta = {
 
 export const mockFetchResetOptionsFailure = {
   host: mockRobot,
-  method: 'GET',
+  method: 'GET' as Method,
   path: '/settings/reset/options',
   ok: false,
   status: 500,
@@ -67,7 +67,7 @@ export const mockFetchResetOptionsFailure = {
 }
 
 export const mockFetchResetOptionsFailureMeta = {
-  method: 'GET',
+  method: 'GET' as Method,
   path: '/settings/reset/options',
   ok: false,
   status: 500,
@@ -75,15 +75,15 @@ export const mockFetchResetOptionsFailureMeta = {
 
 export const mockResetConfigSuccess = {
   host: mockRobot,
-  method: 'POST',
+  method: 'POST' as Method,
   path: '/settings/reset',
   ok: true,
   status: 200,
-  body: ({}: { ... }),
+  body: {},
 }
 
 export const mockResetConfigSuccessMeta = {
-  method: 'POST',
+  method: 'POST' as Method,
   path: '/settings/reset',
   ok: true,
   status: 200,
@@ -91,7 +91,7 @@ export const mockResetConfigSuccessMeta = {
 
 export const mockResetConfigFailure = {
   host: mockRobot,
-  method: 'POST',
+  method: 'POST' as Method,
   path: '/settings/reset',
   ok: false,
   status: 500,
@@ -99,7 +99,7 @@ export const mockResetConfigFailure = {
 }
 
 export const mockResetConfigFailureMeta = {
-  method: 'POST',
+  method: 'POST' as Method,
   path: '/settings/reset',
   ok: false,
   status: 500,
diff --git a/app/src/redux/robot-admin/__fixtures__/system-time.ts b/app/src/redux/robot-admin/__fixtures__/system-time.ts
index 48a6b91db12..530eeceec94 100644
--- a/app/src/redux/robot-admin/__fixtures__/system-time.ts
+++ b/app/src/redux/robot-admin/__fixtures__/system-time.ts
@@ -1,4 +1,3 @@
-// @flow
 import { GET } from '../../robot-api'
 import { SYSTEM_TIME_PATH } from '../constants'
 import {
@@ -16,17 +15,16 @@ export const {
   failureMeta: mockFetchSystemTimeFailureMeta,
   success: mockFetchSystemTimeSuccess,
   failure: mockFetchSystemTimeFailure,
-}: ResponseFixtures<
-  SystemTimeData,
-  {| message: string |}
-> = makeResponseFixtures({
-  method: GET,
-  path: SYSTEM_TIME_PATH,
-  successStatus: 200,
-  successBody: {
-    id: 'time',
-    systemTime: mockSystemTime,
-  },
-  failureStatus: 500,
-  failureBody: mockFailureBody,
-})
+}: ResponseFixtures<SystemTimeData, { message: string }> = makeResponseFixtures(
+  {
+    method: GET,
+    path: SYSTEM_TIME_PATH,
+    successStatus: 200,
+    successBody: {
+      id: 'time',
+      systemTime: mockSystemTime,
+    },
+    failureStatus: 500,
+    failureBody: mockFailureBody,
+  }
+)
diff --git a/app/src/redux/robot-admin/__tests__/actions.test.ts b/app/src/redux/robot-admin/__tests__/actions.test.ts
index 54fd76f55f5..1a082ca500b 100644
--- a/app/src/redux/robot-admin/__tests__/actions.test.ts
+++ b/app/src/redux/robot-admin/__tests__/actions.test.ts
@@ -1,16 +1,15 @@
-// @flow
 import * as Actions from '../actions'
 import type { RobotAdminAction } from '../types'
 
-type ActionSpec = {|
-  name: string,
-  creator: (...Array<any>) => mixed,
-  args: Array<mixed>,
-  expected: RobotAdminAction,
-|}
+interface ActionSpec {
+  name: string
+  creator: (...args: any[]) => unknown
+  args: unknown[]
+  expected: RobotAdminAction
+}
 
 describe('robot admin actions', () => {
-  const SPECS: Array<ActionSpec> = [
+  const SPECS: ActionSpec[] = [
     {
       name: 'robotAdmin:RESTART',
       creator: Actions.restartRobot,
@@ -28,7 +27,7 @@ describe('robot admin actions', () => {
       expected: {
         type: 'robotAdmin:RESTART_SUCCESS',
         payload: { robotName: 'robotName' },
-        meta: { requestId: 'foo' },
+        meta: { requestId: 'foo' } as any,
       },
     },
     {
@@ -38,7 +37,7 @@ describe('robot admin actions', () => {
       expected: {
         type: 'robotAdmin:RESTART_FAILURE',
         payload: { robotName: 'robotName', error: { message: 'AH' } },
-        meta: { requestId: 'foo' },
+        meta: { requestId: 'foo' } as any,
       },
     },
     {
@@ -48,7 +47,7 @@ describe('robot admin actions', () => {
       expected: {
         type: 'robotAdmin:FETCH_RESET_CONFIG_OPTIONS',
         payload: { robotName: 'robotName' },
-        meta: {},
+        meta: {} as any,
       },
     },
     {
@@ -71,7 +70,7 @@ describe('robot admin actions', () => {
             { id: 'bar', name: 'Bar', description: 'bazqux' },
           ],
         },
-        meta: { requestId: 'foo' },
+        meta: { requestId: 'foo' } as any,
       },
     },
     {
@@ -81,7 +80,7 @@ describe('robot admin actions', () => {
       expected: {
         type: 'robotAdmin:FETCH_RESET_CONFIG_OPTIONS_FAILURE',
         payload: { robotName: 'robotName', error: { message: 'AH' } },
-        meta: { requestId: 'foo' },
+        meta: { requestId: 'foo' } as any,
       },
     },
     {
@@ -91,7 +90,7 @@ describe('robot admin actions', () => {
       expected: {
         type: 'robotAdmin:RESET_CONFIG',
         payload: { robotName: 'robotName', resets: { foo: true, bar: false } },
-        meta: {},
+        meta: {} as any,
       },
     },
     {
@@ -101,7 +100,7 @@ describe('robot admin actions', () => {
       expected: {
         type: 'robotAdmin:RESET_CONFIG_SUCCESS',
         payload: { robotName: 'robotName' },
-        meta: { requestId: 'foo' },
+        meta: { requestId: 'foo' } as any,
       },
     },
     {
@@ -111,7 +110,7 @@ describe('robot admin actions', () => {
       expected: {
         type: 'robotAdmin:RESET_CONFIG_FAILURE',
         payload: { robotName: 'robotName', error: { message: 'AH' } },
-        meta: { requestId: 'foo' },
+        meta: { requestId: 'foo' } as any,
       },
     },
   ]
diff --git a/app/src/redux/robot-admin/__tests__/reducer.test.ts b/app/src/redux/robot-admin/__tests__/reducer.test.ts
index 894fc723cc9..01bd8e76d0d 100644
--- a/app/src/redux/robot-admin/__tests__/reducer.test.ts
+++ b/app/src/redux/robot-admin/__tests__/reducer.test.ts
@@ -1,20 +1,20 @@
-// @flow
-
 import { robotAdminReducer } from '../reducer'
 
 import type { PerRobotAdminState } from '../types'
+import type { RobotApiRequestMeta } from '../../robot-api/types'
+import type { Action } from '../../types'
 
-type PartialState = $Shape<{|
-  [robotName: string]: void | $Shape<PerRobotAdminState>,
-|}>
+type PartialState = Partial<{
+  [robotName: string]: undefined | Partial<PerRobotAdminState>
+}>
 
 describe('robotAdminReducer', () => {
   it('should handle robotAdmin:RESTART_FAILURE', () => {
     const state: PartialState = {}
-    const action = {
+    const action: Action = {
       type: 'robotAdmin:RESTART_FAILURE',
       payload: { robotName: 'robotName', error: { message: 'AH' } },
-      meta: {},
+      meta: {} as RobotApiRequestMeta,
     }
 
     const result = robotAdminReducer(state, action)
@@ -28,7 +28,7 @@ describe('robotAdminReducer', () => {
 
   it('should handle robotAdmin:RESTART_STATUS_CHANGED with boot ID', () => {
     const state: PartialState = {}
-    const action = {
+    const action: Action = {
       type: 'robotAdmin:RESTART_STATUS_CHANGED',
       payload: {
         robotName: 'robotName',
@@ -61,7 +61,7 @@ describe('robotAdminReducer', () => {
         },
       },
     }
-    const action = {
+    const action: Action = {
       type: 'robotAdmin:RESTART_STATUS_CHANGED',
       payload: {
         robotName: 'robotName',
@@ -90,7 +90,7 @@ describe('robotAdminReducer', () => {
         resetConfigOptions: [],
       },
     }
-    const action = {
+    const action: Action = {
       type: 'robotAdmin:FETCH_RESET_CONFIG_OPTIONS_SUCCESS',
       payload: {
         robotName: 'robotName',
@@ -99,7 +99,7 @@ describe('robotAdminReducer', () => {
           { id: 'baz', name: 'Baz', description: 'bazqux' },
         ],
       },
-      meta: {},
+      meta: {} as RobotApiRequestMeta,
     }
 
     const result = robotAdminReducer(state, action)
diff --git a/app/src/redux/robot-admin/__tests__/selectors.test.ts b/app/src/redux/robot-admin/__tests__/selectors.test.ts
index 5a10e164121..392a618c94c 100644
--- a/app/src/redux/robot-admin/__tests__/selectors.test.ts
+++ b/app/src/redux/robot-admin/__tests__/selectors.test.ts
@@ -1,4 +1,3 @@
-// @flow
 import { add } from 'date-fns'
 import { CONNECTABLE, REACHABLE } from '../../discovery'
 import {
@@ -7,8 +6,7 @@ import {
   getResetConfigOptions,
 } from '../selectors'
 import type { State } from '../../types'
-
-type PartialState = $Shape<State>
+import { ConnectivityStatus } from '../../discovery/types'
 
 const START_TIME = new Date('2000-01-01')
 
@@ -20,7 +18,7 @@ const RESTART_BASE = {
 describe('robot admin selectors', () => {
   describe('get reset config options', () => {
     it('should return empty array by default', () => {
-      const state: PartialState = { robotAdmin: {} }
+      const state: State = { robotAdmin: {} } as any
 
       const result = getResetConfigOptions(state, 'robotName')
 
@@ -28,7 +26,7 @@ describe('robot admin selectors', () => {
     })
 
     it('should return options from state', () => {
-      const state: PartialState = {
+      const state: State = {
         robotAdmin: {
           robotName: {
             resetConfigOptions: [
@@ -37,7 +35,7 @@ describe('robot admin selectors', () => {
             ],
           },
         },
-      }
+      } as any
 
       const result = getResetConfigOptions(state, 'robotName')
 
@@ -50,7 +48,7 @@ describe('robot admin selectors', () => {
 
   describe('get robot restarting', () => {
     it('should return true if restart status is pending or in progress', () => {
-      const state: PartialState = {
+      const state: State = {
         robotAdmin: {
           succeeded: {
             restart: { ...RESTART_BASE, status: 'restart-succeeded' },
@@ -64,7 +62,7 @@ describe('robot admin selectors', () => {
             restart: { ...RESTART_BASE, status: 'restart-in-progress' },
           },
         },
-      }
+      } as any
 
       expect(getRobotRestarting(state, 'succeeded')).toBe(false)
       expect(getRobotRestarting(state, 'failed')).toBe(false)
@@ -75,7 +73,7 @@ describe('robot admin selectors', () => {
 
   describe('get next robot restarting status', () => {
     it('should return null if robot is not restarting', () => {
-      const state: PartialState = {
+      const state: State = {
         robotAdmin: {
           succeeded: {
             restart: { ...RESTART_BASE, status: 'restart-succeeded' },
@@ -85,9 +83,13 @@ describe('robot admin selectors', () => {
             restart: { ...RESTART_BASE, status: 'restart-timed-out' },
           },
         },
-      }
+      } as any
 
-      const baseArgs = [CONNECTABLE, 'boot-id', new Date()]
+      const baseArgs: [ConnectivityStatus, string | null, Date] = [
+        CONNECTABLE,
+        'boot-id',
+        new Date(),
+      ]
 
       expect(getNextRestartStatus(state, 'nonExistent', ...baseArgs)).toBe(null)
       expect(getNextRestartStatus(state, 'succeeded', ...baseArgs)).toBe(null)
@@ -96,13 +98,13 @@ describe('robot admin selectors', () => {
     })
 
     it('should return restart success if connectable robot has new boot ID', () => {
-      const state: PartialState = {
+      const state: State = {
         robotAdmin: {
           robotName: {
             restart: { ...RESTART_BASE, status: 'restart-pending' },
           },
         },
-      }
+      } as any
 
       const result = getNextRestartStatus(
         state,
@@ -116,13 +118,13 @@ describe('robot admin selectors', () => {
     })
 
     it('should return restart success if was restarting and is now connectable', () => {
-      const state: PartialState = {
+      const state: State = {
         robotAdmin: {
           robotName: {
             restart: { ...RESTART_BASE, status: 'restart-in-progress' },
           },
         },
-      }
+      } as any
 
       const result = getNextRestartStatus(
         state,
@@ -136,13 +138,13 @@ describe('robot admin selectors', () => {
     })
 
     it('should return null if no new boot ID and restart still pending', () => {
-      const state: PartialState = {
+      const state: State = {
         robotAdmin: {
           robotName: {
             restart: { ...RESTART_BASE, status: 'restart-pending' },
           },
         },
-      }
+      } as any
 
       const result = getNextRestartStatus(
         state,
@@ -156,13 +158,13 @@ describe('robot admin selectors', () => {
     })
 
     it('should return null if new boot ID but robot not yet connectable', () => {
-      const state: PartialState = {
+      const state: State = {
         robotAdmin: {
           robotName: {
             restart: { ...RESTART_BASE, status: 'restart-in-progress' },
           },
         },
-      }
+      } as any
 
       const result = getNextRestartStatus(
         state,
@@ -176,13 +178,13 @@ describe('robot admin selectors', () => {
     })
 
     it('should return restarting if restart was pending and went down', () => {
-      const state: PartialState = {
+      const state: State = {
         robotAdmin: {
           robotName: {
             restart: { ...RESTART_BASE, status: 'restart-pending' },
           },
         },
-      }
+      } as any
 
       const result = getNextRestartStatus(
         state,
@@ -200,7 +202,7 @@ describe('robot admin selectors', () => {
       const notLongEnough = add(startTime, { seconds: 299 })
       const tooLong = add(startTime, { seconds: 301 })
 
-      const state: PartialState = {
+      const state: State = {
         robotAdmin: {
           robotName: {
             restart: {
@@ -210,7 +212,7 @@ describe('robot admin selectors', () => {
             },
           },
         },
-      }
+      } as any
 
       const before = getNextRestartStatus(
         state,
diff --git a/app/src/redux/robot-admin/actions.ts b/app/src/redux/robot-admin/actions.ts
index 4caa5cbd539..0414536f2cc 100644
--- a/app/src/redux/robot-admin/actions.ts
+++ b/app/src/redux/robot-admin/actions.ts
@@ -1,4 +1,3 @@
-// @flow
 import * as Constants from './constants'
 import * as Types from './types'
 
@@ -12,7 +11,7 @@ export const restartRobot = (robotName: string): Types.RestartRobotAction => ({
 
 export const restartRobotSuccess = (
   robotName: string,
-  meta: RobotApiRequestMeta
+  meta: RobotApiRequestMeta | {}
 ): Types.RestartRobotSuccessAction => ({
   type: Constants.RESTART_SUCCESS,
   payload: { robotName },
@@ -39,7 +38,7 @@ export const fetchResetConfigOptions = (
 
 export const fetchResetConfigOptionsSuccess = (
   robotName: string,
-  options: Array<Types.ResetConfigOption>,
+  options: Types.ResetConfigOption[],
   meta: RobotApiRequestMeta
 ): Types.FetchResetConfigOptionsSuccessAction => ({
   type: Constants.FETCH_RESET_CONFIG_OPTIONS_SUCCESS,
diff --git a/app/src/redux/robot-admin/api-types.ts b/app/src/redux/robot-admin/api-types.ts
index d5fee79d9ee..d361f6546e8 100644
--- a/app/src/redux/robot-admin/api-types.ts
+++ b/app/src/redux/robot-admin/api-types.ts
@@ -1,7 +1,5 @@
-// @flow
-
-export type SystemTimeData = {
-  id: 'time',
-  systemTime: string,
-  ...
+export interface SystemTimeData {
+  id: 'time'
+  systemTime: string
+  [key: string]: unknown
 }
diff --git a/app/src/redux/robot-admin/constants.ts b/app/src/redux/robot-admin/constants.ts
index e2e0898656e..42403d5dea3 100644
--- a/app/src/redux/robot-admin/constants.ts
+++ b/app/src/redux/robot-admin/constants.ts
@@ -1,5 +1,3 @@
-// @flow
-
 // general constants
 
 // 5 minute restart timeout
diff --git a/app/src/redux/robot-admin/epic/__tests__/fetchResetOptionsEpic.test.ts b/app/src/redux/robot-admin/epic/__tests__/fetchResetOptionsEpic.test.ts
index bb3fe818e56..76b087dfd16 100644
--- a/app/src/redux/robot-admin/epic/__tests__/fetchResetOptionsEpic.test.ts
+++ b/app/src/redux/robot-admin/epic/__tests__/fetchResetOptionsEpic.test.ts
@@ -1,9 +1,10 @@
-// @flow
 import { setupEpicTestMocks, runEpicTest } from '../../../robot-api/__utils__'
 import * as Fixtures from '../../__fixtures__'
 import * as Actions from '../../actions'
 import { fetchResetOptionsEpic } from '../fetchResetOptionsEpic'
 
+import type { Action } from '../../../types'
+
 describe('robotAdminEpic handles fetching "factory reset" options', () => {
   afterEach(() => {
     jest.resetAllMocks()
@@ -15,7 +16,7 @@ describe('robotAdminEpic handles fetching "factory reset" options', () => {
       Fixtures.mockFetchResetOptionsSuccess
     )
 
-    runEpicTest(mocks, ({ hot, expectObservable, flush }) => {
+    runEpicTest<Action>(mocks, ({ hot, expectObservable, flush }) => {
       const action$ = hot('--a', { a: mocks.action })
       const state$ = hot('s-s', { s: mocks.state })
       const output$ = fetchResetOptionsEpic(action$, state$)
@@ -36,7 +37,7 @@ describe('robotAdminEpic handles fetching "factory reset" options', () => {
       Fixtures.mockFetchResetOptionsSuccess
     )
 
-    runEpicTest(mocks, ({ hot, expectObservable }) => {
+    runEpicTest<Action>(mocks, ({ hot, expectObservable }) => {
       const action$ = hot('--a', { a: mocks.action })
       const state$ = hot('s-s', { s: mocks.state })
       const output$ = fetchResetOptionsEpic(action$, state$)
@@ -57,7 +58,7 @@ describe('robotAdminEpic handles fetching "factory reset" options', () => {
       Fixtures.mockFetchResetOptionsFailure
     )
 
-    runEpicTest(mocks, ({ hot, expectObservable }) => {
+    runEpicTest<Action>(mocks, ({ hot, expectObservable }) => {
       const action$ = hot('--a', { a: mocks.action })
       const state$ = hot('s-s', { s: mocks.state })
       const output$ = fetchResetOptionsEpic(action$, state$)
diff --git a/app/src/redux/robot-admin/epic/__tests__/resetConfigEpic.test.ts b/app/src/redux/robot-admin/epic/__tests__/resetConfigEpic.test.ts
index 7ee6912cab8..619df83abd5 100644
--- a/app/src/redux/robot-admin/epic/__tests__/resetConfigEpic.test.ts
+++ b/app/src/redux/robot-admin/epic/__tests__/resetConfigEpic.test.ts
@@ -1,10 +1,11 @@
-// @flow
 import { setupEpicTestMocks, runEpicTest } from '../../../robot-api/__utils__'
 import * as Fixtures from '../../__fixtures__'
 import * as Actions from '../../actions'
 import { resetConfigEpic } from '../resetConfigEpic'
 
-const makeResetConfigAction = robotName =>
+import type { Action } from '../../../types'
+
+const makeResetConfigAction = (robotName: string) =>
   Actions.resetConfig(robotName, {
     foo: true,
     bar: false,
@@ -16,12 +17,12 @@ describe('robotAdminEpic handles performing a "factory reset"', () => {
   })
 
   it('calls POST /settings/reset on RESET_CONFIG', () => {
-    const mocks = setupEpicTestMocks(
+    const mocks = setupEpicTestMocks<Action>(
       makeResetConfigAction,
       Fixtures.mockResetConfigSuccess
     )
 
-    runEpicTest(mocks, ({ hot, expectObservable, flush }) => {
+    runEpicTest<Action>(mocks, ({ hot, expectObservable, flush }) => {
       const action$ = hot('--a', { a: mocks.action })
       const state$ = hot('s-s', { s: mocks.state })
       const output$ = resetConfigEpic(action$, state$)
@@ -38,12 +39,12 @@ describe('robotAdminEpic handles performing a "factory reset"', () => {
   })
 
   it('maps successful response to RESET_CONFIG_SUCCESS', () => {
-    const mocks = setupEpicTestMocks(
+    const mocks = setupEpicTestMocks<Action>(
       makeResetConfigAction,
       Fixtures.mockResetConfigSuccess
     )
 
-    runEpicTest(mocks, ({ hot, expectObservable }) => {
+    runEpicTest<Action>(mocks, ({ hot, expectObservable }) => {
       const action$ = hot('--a', { a: mocks.action })
       const state$ = hot('s-s', { s: mocks.state })
       const output$ = resetConfigEpic(action$, state$)
@@ -58,12 +59,12 @@ describe('robotAdminEpic handles performing a "factory reset"', () => {
   })
 
   it('maps failed response to RESET_CONFIG_FAILURE', () => {
-    const mocks = setupEpicTestMocks(
+    const mocks = setupEpicTestMocks<Action>(
       makeResetConfigAction,
       Fixtures.mockResetConfigFailure
     )
 
-    runEpicTest(mocks, ({ hot, expectObservable }) => {
+    runEpicTest<Action>(mocks, ({ hot, expectObservable }) => {
       const action$ = hot('--a', { a: mocks.action })
       const state$ = hot('s-s', { s: mocks.state })
       const output$ = resetConfigEpic(action$, state$)
diff --git a/app/src/redux/robot-admin/epic/__tests__/restartEpic.test.ts b/app/src/redux/robot-admin/epic/__tests__/restartEpic.test.ts
index 8f833f2bebc..b83c7db22af 100644
--- a/app/src/redux/robot-admin/epic/__tests__/restartEpic.test.ts
+++ b/app/src/redux/robot-admin/epic/__tests__/restartEpic.test.ts
@@ -1,4 +1,3 @@
-// @flow
 import { setupEpicTestMocks, runEpicTest } from '../../../robot-api/__utils__'
 
 import * as SettingsSelectors from '../../../robot-settings/selectors'
@@ -7,12 +6,13 @@ import * as Fixtures from '../../__fixtures__'
 import * as Actions from '../../actions'
 import { restartEpic, startDiscoveryOnRestartEpic } from '../restartEpic'
 
-import type { State } from '../../../types'
+import type { Action } from '../../../types'
 
 jest.mock('../../../robot-settings/selectors')
 
-const mockGetRestartPath: JestMockFn<[State, string], string | null> =
-  SettingsSelectors.getRobotRestartPath
+const mockGetRestartPath = SettingsSelectors.getRobotRestartPath as jest.MockedFunction<
+  typeof SettingsSelectors.getRobotRestartPath
+>
 
 describe('robotAdminEpic handles restarting', () => {
   afterEach(() => {
@@ -25,7 +25,7 @@ describe('robotAdminEpic handles restarting', () => {
       Fixtures.mockRestartSuccess
     )
 
-    runEpicTest(mocks, ({ hot, expectObservable, flush }) => {
+    runEpicTest<Action>(mocks, ({ hot, expectObservable, flush }) => {
       const action$ = hot('--a', { a: mocks.action })
       const state$ = hot('s-s', { s: mocks.state })
       const output$ = restartEpic(action$, state$)
@@ -48,7 +48,7 @@ describe('robotAdminEpic handles restarting', () => {
 
     mockGetRestartPath.mockReturnValue('/restart')
 
-    runEpicTest(mocks, ({ hot, expectObservable, flush }) => {
+    runEpicTest<Action>(mocks, ({ hot, expectObservable, flush }) => {
       const action$ = hot('--a', { a: mocks.action })
       const state$ = hot('s-s', { s: mocks.state })
       const output$ = restartEpic(action$, state$)
@@ -73,7 +73,7 @@ describe('robotAdminEpic handles restarting', () => {
       Fixtures.mockRestartSuccess
     )
 
-    runEpicTest(mocks, ({ hot, expectObservable }) => {
+    runEpicTest<Action>(mocks, ({ hot, expectObservable }) => {
       const action$ = hot('--a', { a: mocks.action })
       const state$ = hot('s-s', { s: mocks.state })
       const output$ = restartEpic(action$, state$)
@@ -93,7 +93,7 @@ describe('robotAdminEpic handles restarting', () => {
       Fixtures.mockRestartFailure
     )
 
-    runEpicTest(mocks, ({ hot, expectObservable }) => {
+    runEpicTest<Action>(mocks, ({ hot, expectObservable }) => {
       const action$ = hot('--a', { a: mocks.action })
       const state$ = hot('s-s', { s: mocks.state })
       const output$ = restartEpic(action$, state$)
@@ -110,10 +110,10 @@ describe('robotAdminEpic handles restarting', () => {
 
   it('starts discovery on RESTART_SUCCESS', () => {
     const mocks = setupEpicTestMocks(robotName =>
-      Actions.restartRobotSuccess(robotName, {})
+      Actions.restartRobotSuccess(robotName, {} as any)
     )
 
-    runEpicTest(mocks, ({ hot, expectObservable }) => {
+    runEpicTest<Action>(mocks, ({ hot, expectObservable }) => {
       const action$ = hot('-a', { a: mocks.action })
       const state$ = hot('a-', { a: mocks.state })
       const output$ = startDiscoveryOnRestartEpic(action$, state$)
diff --git a/app/src/redux/robot-admin/epic/__tests__/syncTimeOnConnectEpic.test.ts b/app/src/redux/robot-admin/epic/__tests__/syncTimeOnConnectEpic.test.ts
index 3a5025c7d9a..6bec25d60e3 100644
--- a/app/src/redux/robot-admin/epic/__tests__/syncTimeOnConnectEpic.test.ts
+++ b/app/src/redux/robot-admin/epic/__tests__/syncTimeOnConnectEpic.test.ts
@@ -1,4 +1,3 @@
-// @flow
 import { cloneDeep, set, get } from 'lodash'
 import { subSeconds, differenceInSeconds, parseISO } from 'date-fns'
 
@@ -11,15 +10,23 @@ import {
 } from '../../__fixtures__'
 import { syncTimeOnConnectEpic } from '../syncTimeOnConnectEpic'
 
-const createConnectAction = robotName => (RobotActions.connect(robotName): any)
+import type { Action } from '../../../types'
 
-const createTimeSuccessResponse = (time: Date) => {
+const createConnectAction = (robotName: string): Action =>
+  RobotActions.connect(robotName) as any
+
+const createTimeSuccessResponse = (
+  time: Date
+): typeof mockFetchSystemTimeSuccess => {
   const response = cloneDeep(mockFetchSystemTimeSuccess)
   set(response, 'body.data.systemTime', time.toISOString())
   return response
 }
 
-const createEpicOutput = (mocks, createHotObservable) => {
+const createEpicOutput = (
+  mocks: any,
+  createHotObservable: any
+): ReturnType<typeof syncTimeOnConnectEpic> => {
   const action$ = createHotObservable('--a', { a: mocks.action })
   const state$ = createHotObservable('s-s', { s: mocks.state })
   const output$ = syncTimeOnConnectEpic(action$, state$)
diff --git a/app/src/redux/robot-admin/epic/__tests__/trackRestartsEpic.test.ts b/app/src/redux/robot-admin/epic/__tests__/trackRestartsEpic.test.ts
index cc95b9cc249..6cf000a7da4 100644
--- a/app/src/redux/robot-admin/epic/__tests__/trackRestartsEpic.test.ts
+++ b/app/src/redux/robot-admin/epic/__tests__/trackRestartsEpic.test.ts
@@ -1,21 +1,30 @@
-// @flow
 import { when } from 'jest-when'
 
 import { setupEpicTestMocks, runEpicTest } from '../../../robot-api/__utils__'
-import { getDiscoveredRobots } from '../../../discovery'
 import * as Actions from '../../actions'
-import { getNextRestartStatus } from '../../selectors'
+import * as robotAdminSelectors from '../../selectors'
+import * as discoverySelectors from '../../../discovery/selectors'
 
 import { trackRestartsEpic } from '../trackRestartsEpic'
 
+import type {
+  ConnectivityStatus,
+  DiscoveredRobot,
+} from '../../../discovery/types'
+import type { Action } from '../../../types'
+
 jest.mock('../../../discovery/selectors')
 jest.mock('../../selectors')
 
+const getNextRestartStatus = robotAdminSelectors.getNextRestartStatus as jest.MockedFunction<
+  typeof robotAdminSelectors.getNextRestartStatus
+>
+const getDiscoveredRobots = discoverySelectors.getDiscoveredRobots as jest.MockedFunction<
+  typeof discoverySelectors.getDiscoveredRobots
+>
 describe('robotAdminEpic tracks restarting state', () => {
   beforeEach(() => {
-    // $FlowFixMe(mc, 2021-04-05): don't feel like typing this in Flow
     getNextRestartStatus.mockReturnValue(null)
-    // $FlowFixMe(mc, 2021-04-05): don't feel like typing this in Flow
     getDiscoveredRobots.mockReturnValue([])
   })
 
@@ -24,15 +33,15 @@ describe('robotAdminEpic tracks restarting state', () => {
   })
 
   it('dispatches a RESTART_STATUS_CHANGED action on restart success', () => {
-    const mocks = setupEpicTestMocks((robotName: string) =>
-      Actions.restartRobotSuccess(robotName, {})
+    const mocks = setupEpicTestMocks<Action>((robotName: string) =>
+      Actions.restartRobotSuccess(robotName, {} as any)
     )
 
     when(mocks.getRobotByName)
       .calledWith(mocks.state, mocks.robot.name)
-      .mockReturnValue(mocks.robot)
+      .mockReturnValue(mocks.robot as any)
 
-    runEpicTest(mocks, ({ hot, expectObservable }) => {
+    runEpicTest<Action>(mocks, ({ hot, expectObservable }) => {
       const action$ = hot('--a', { a: mocks.action })
       const state$ = hot('s--', { s: mocks.state })
       const output$ = trackRestartsEpic(action$, state$)
@@ -42,15 +51,15 @@ describe('robotAdminEpic tracks restarting state', () => {
           mocks.robot.name,
           'restart-pending',
           null,
-          (expect.any(Date): any)
+          expect.any(Date)
         ),
       })
     })
   })
 
   it('dispatches a RESTART_STATUS_CHANGED action with boot ID if present', () => {
-    const mocks = setupEpicTestMocks((robotName: string) =>
-      Actions.restartRobotSuccess(robotName, {})
+    const mocks = setupEpicTestMocks<Action>((robotName: string) =>
+      Actions.restartRobotSuccess(robotName, {} as any)
     )
 
     when(mocks.getRobotByName)
@@ -58,9 +67,9 @@ describe('robotAdminEpic tracks restarting state', () => {
       .mockReturnValue({
         ...mocks.robot,
         serverHealth: { bootId: 'previous-boot-id' },
-      })
+      } as any)
 
-    runEpicTest(mocks, ({ hot, expectObservable }) => {
+    runEpicTest<Action>(mocks, ({ hot, expectObservable }) => {
       const action$ = hot('--a', { a: mocks.action })
       const state$ = hot('s--', { s: mocks.state })
       const output$ = trackRestartsEpic(action$, state$)
@@ -70,39 +79,43 @@ describe('robotAdminEpic tracks restarting state', () => {
           mocks.robot.name,
           'restart-pending',
           'previous-boot-id',
-          (expect.any(Date): any)
+          expect.any(Date)
         ),
       })
     })
   })
 
   it('dispatches any necessary status changes', () => {
-    const mocks = setupEpicTestMocks()
+    const mocks = setupEpicTestMocks<Action>()
 
     const robot1 = {
       ...mocks.robot,
       name: 'robot1',
-      status: 'connectable',
+      status: 'connectable' as ConnectivityStatus,
       serverHealth: { bootId: 'robot-1-boot' },
     }
 
     const robot2 = {
       ...mocks.robot,
       name: 'robot2',
-      status: 'reachable',
+      status: 'reachable' as ConnectivityStatus,
       serverHealth: { bootId: 'robot-2-boot' },
     }
 
     const robot3 = {
       ...mocks.robot,
       name: 'robot3',
-      status: 'unreachable',
+      status: 'unreachable' as ConnectivityStatus,
       serverHealth: { bootId: 'robot-3-boot' },
     }
 
     when(getDiscoveredRobots)
       .calledWith(mocks.state)
-      .mockReturnValue([robot1, robot2, robot3])
+      .mockReturnValue([
+        robot1 as DiscoveredRobot,
+        robot2 as DiscoveredRobot,
+        robot3 as DiscoveredRobot,
+      ])
 
     when(getNextRestartStatus)
       .calledWith(
@@ -134,7 +147,7 @@ describe('robotAdminEpic tracks restarting state', () => {
       )
       .mockReturnValue('restart-timed-out')
 
-    runEpicTest(mocks, ({ hot, expectObservable }) => {
+    runEpicTest<Action>(mocks, ({ hot, expectObservable }) => {
       const action$ = hot('--')
       const state$ = hot('-s', { s: mocks.state })
       const output$ = trackRestartsEpic(action$, state$)
diff --git a/app/src/redux/robot-admin/epic/fetchResetOptionsEpic.ts b/app/src/redux/robot-admin/epic/fetchResetOptionsEpic.ts
index 2d773eb7534..f7efa31777e 100644
--- a/app/src/redux/robot-admin/epic/fetchResetOptionsEpic.ts
+++ b/app/src/redux/robot-admin/epic/fetchResetOptionsEpic.ts
@@ -1,4 +1,3 @@
-// @flow
 import { ofType } from 'redux-observable'
 
 import { GET } from '../../robot-api/constants'
@@ -6,7 +5,7 @@ import { mapToRobotApiRequest } from '../../robot-api/operators'
 import * as Constants from '../constants'
 import * as Actions from '../actions'
 
-import type { Epic } from '../../types'
+import type { Action, Epic } from '../../types'
 import type {
   ActionToRequestMapper,
   ResponseToActionMapper,
@@ -23,7 +22,7 @@ const mapResponseToAction: ResponseToActionMapper<FetchResetConfigOptionsAction>
   originalAction
 ) => {
   const { host, body, ...responseMeta } = response
-  const options: Array<ResetConfigOption> = body.options
+  const options: ResetConfigOption[] = body.options
   const meta = { ...originalAction.meta, response: responseMeta }
 
   return response.ok
@@ -33,7 +32,9 @@ const mapResponseToAction: ResponseToActionMapper<FetchResetConfigOptionsAction>
 
 export const fetchResetOptionsEpic: Epic = (action$, state$) => {
   return action$.pipe(
-    ofType(Constants.FETCH_RESET_CONFIG_OPTIONS),
+    ofType<Action, FetchResetConfigOptionsAction>(
+      Constants.FETCH_RESET_CONFIG_OPTIONS
+    ),
     mapToRobotApiRequest(
       state$,
       a => a.payload.robotName,
diff --git a/app/src/redux/robot-admin/epic/index.ts b/app/src/redux/robot-admin/epic/index.ts
index f2531458525..3f44b36f946 100644
--- a/app/src/redux/robot-admin/epic/index.ts
+++ b/app/src/redux/robot-admin/epic/index.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import { combineEpics } from 'redux-observable'
 
 import { restartEpic, startDiscoveryOnRestartEpic } from './restartEpic'
@@ -10,7 +8,7 @@ import { trackRestartsEpic } from './trackRestartsEpic'
 
 import type { Epic } from '../../types'
 
-export const robotAdminEpic: Epic = combineEpics(
+export const robotAdminEpic = combineEpics<Epic>(
   restartEpic,
   startDiscoveryOnRestartEpic,
   fetchResetOptionsEpic,
diff --git a/app/src/redux/robot-admin/epic/resetConfigEpic.ts b/app/src/redux/robot-admin/epic/resetConfigEpic.ts
index 8b590940dcc..4d093f5ee25 100644
--- a/app/src/redux/robot-admin/epic/resetConfigEpic.ts
+++ b/app/src/redux/robot-admin/epic/resetConfigEpic.ts
@@ -1,4 +1,3 @@
-// @flow
 import { ofType } from 'redux-observable'
 import { map } from 'rxjs/operators'
 
@@ -7,12 +6,16 @@ import { mapToRobotApiRequest } from '../../robot-api/operators'
 import * as Constants from '../constants'
 import * as Actions from '../actions'
 
-import type { Epic } from '../../types'
+import type { Epic, Action } from '../../types'
 import type {
   ActionToRequestMapper,
   ResponseToActionMapper,
 } from '../../robot-api/operators'
-import type { ResetConfigAction } from '../types'
+import {
+  ResetConfigAction,
+  ResetConfigSuccessAction,
+  RestartRobotAction,
+} from '../types'
 
 const mapActionToRequest: ActionToRequestMapper<ResetConfigAction> = action => ({
   method: POST,
@@ -34,7 +37,7 @@ const mapResponseToAction: ResponseToActionMapper<ResetConfigAction> = (
 
 export const resetConfigEpic: Epic = (action$, state$) => {
   return action$.pipe(
-    ofType(Constants.RESET_CONFIG),
+    ofType<Action, ResetConfigAction>(Constants.RESET_CONFIG),
     mapToRobotApiRequest(
       state$,
       a => a.payload.robotName,
@@ -46,8 +49,8 @@ export const resetConfigEpic: Epic = (action$, state$) => {
 
 export const restartOnResetConfigEpic: Epic = action$ => {
   return action$.pipe(
-    ofType(Constants.RESET_CONFIG_SUCCESS),
-    map<ResetConfigAction, _>(a => {
+    ofType<Action, ResetConfigSuccessAction>(Constants.RESET_CONFIG_SUCCESS),
+    map<ResetConfigSuccessAction, RestartRobotAction>(a => {
       return Actions.restartRobot(a.payload.robotName)
     })
   )
diff --git a/app/src/redux/robot-admin/epic/restartEpic.ts b/app/src/redux/robot-admin/epic/restartEpic.ts
index d9487f0c88f..3b5e4b8b96f 100644
--- a/app/src/redux/robot-admin/epic/restartEpic.ts
+++ b/app/src/redux/robot-admin/epic/restartEpic.ts
@@ -1,4 +1,3 @@
-// @flow
 import { ofType } from 'redux-observable'
 import { mapTo } from 'rxjs/operators'
 
@@ -9,7 +8,7 @@ import { startDiscovery } from '../../discovery'
 import * as Constants from '../constants'
 import * as Actions from '../actions'
 
-import type { Epic } from '../../types'
+import type { Epic, Action } from '../../types'
 import type {
   ActionToRequestMapper,
   ResponseToActionMapper,
@@ -44,7 +43,7 @@ const mapResponseToAction: ResponseToActionMapper<RestartRobotAction> = (
 
 export const restartEpic: Epic = (action$, state$) => {
   return action$.pipe(
-    ofType(Constants.RESTART),
+    ofType<Action, RestartRobotAction>(Constants.RESTART),
     mapToRobotApiRequest(
       state$,
       a => a.payload.robotName,
diff --git a/app/src/redux/robot-admin/epic/syncTimeOnConnectEpic.ts b/app/src/redux/robot-admin/epic/syncTimeOnConnectEpic.ts
index c1c4f5257a5..1cfc51dc558 100644
--- a/app/src/redux/robot-admin/epic/syncTimeOnConnectEpic.ts
+++ b/app/src/redux/robot-admin/epic/syncTimeOnConnectEpic.ts
@@ -1,4 +1,3 @@
-// @flow
 import { ofType } from 'redux-observable'
 import { filter, map, switchMap, ignoreElements } from 'rxjs/operators'
 import { parseISO, differenceInSeconds } from 'date-fns'
@@ -7,7 +6,7 @@ import { GET, PUT, fetchRobotApi } from '../../robot-api'
 import { withRobotHost } from '../../robot-api/operators'
 import * as Constants from '../constants'
 
-import type { Epic } from '../../types'
+import type { Action, Epic } from '../../types'
 import type { RobotApiRequestOptions } from '../../robot-api/types'
 import type { ConnectAction } from '../../robot/actions'
 
@@ -33,7 +32,7 @@ const createUpdateRequest = (date: Date): RobotApiRequestOptions => {
 
 export const syncTimeOnConnectEpic: Epic = (action$, state$) => {
   return action$.pipe(
-    ofType('robot:CONNECT'),
+    ofType<Action, ConnectAction>('robot:CONNECT'),
     withRobotHost(state$, action => action.payload.name),
     // TODO(mc, 2020-09-08): only fetch if health.links.systemTime exists,
     // see TODO in robot-server/robot_server/service/legacy/models/health.py
diff --git a/app/src/redux/robot-admin/epic/trackRestartsEpic.ts b/app/src/redux/robot-admin/epic/trackRestartsEpic.ts
index d780a57a202..862ba8f7d48 100644
--- a/app/src/redux/robot-admin/epic/trackRestartsEpic.ts
+++ b/app/src/redux/robot-admin/epic/trackRestartsEpic.ts
@@ -1,4 +1,3 @@
-// @flow
 import { ofType, combineEpics } from 'redux-observable'
 import { of } from 'rxjs'
 import { map, filter, withLatestFrom, switchMap } from 'rxjs/operators'
@@ -8,14 +7,18 @@ import { getNextRestartStatus } from '../selectors'
 import { restartStatusChanged } from '../actions'
 import * as Constants from '../constants'
 
-import type { Epic } from '../../types'
+import type { Action, Epic } from '../../types'
+import type { RestartRobotSuccessAction } from '../types'
+import type { Robot, ReachableRobot } from '../../discovery/types'
 
 // mark robot as restart-pending if HTTP restart request succeeds
 const trackRestartBeginEpic: Epic = (action$, state$) => {
   return action$.pipe(
-    ofType(Constants.RESTART_SUCCESS),
+    ofType<Action, RestartRobotSuccessAction>(Constants.RESTART_SUCCESS),
     withLatestFrom(state$, (a, s) => getRobotByName(s, a.payload.robotName)),
-    filter(maybeRobot => maybeRobot != null),
+    filter(
+      (maybeRobot): maybeRobot is Robot | ReachableRobot => maybeRobot != null
+    ),
     map(robot => {
       const startTime = new Date()
       return restartStatusChanged(
@@ -54,7 +57,7 @@ const trackRestartProgressEpic: Epic = (action$, state$) => {
   )
 }
 
-export const trackRestartsEpic: Epic = combineEpics(
+export const trackRestartsEpic = combineEpics<Epic>(
   trackRestartBeginEpic,
   trackRestartProgressEpic
 )
diff --git a/app/src/redux/robot-admin/index.ts b/app/src/redux/robot-admin/index.ts
index f0538522f5b..497c8935180 100644
--- a/app/src/redux/robot-admin/index.ts
+++ b/app/src/redux/robot-admin/index.ts
@@ -1,4 +1,3 @@
-// @flow
 export * from './actions'
 export * from './constants'
 export * from './selectors'
diff --git a/app/src/redux/robot-admin/reducer.ts b/app/src/redux/robot-admin/reducer.ts
index 0b67de0af07..0b11acc0f28 100644
--- a/app/src/redux/robot-admin/reducer.ts
+++ b/app/src/redux/robot-admin/reducer.ts
@@ -1,18 +1,19 @@
-// @flow
 import * as Constants from './constants'
 
+import type { Reducer } from 'redux'
 import type { Action } from '../types'
 import type { RobotAdminState } from './types'
 
 const INITIAL_STATE: RobotAdminState = {}
 
-export function robotAdminReducer(
-  state: RobotAdminState = INITIAL_STATE,
-  action: Action
-): RobotAdminState {
+export const robotAdminReducer: Reducer<RobotAdminState, Action> = (
+  state = INITIAL_STATE,
+  action
+) => {
   switch (action.type) {
     case Constants.RESTART_STATUS_CHANGED:
     case Constants.RESTART_FAILURE: {
+      // @ts-expect-error TODO: guard type better here, don't do default destructing
       const { robotName, bootId = null, startTime = null } = action.payload
       const restartStatus =
         action.type === Constants.RESTART_FAILURE
diff --git a/app/src/redux/robot-admin/selectors.ts b/app/src/redux/robot-admin/selectors.ts
index 96f152de705..20d117a8c18 100644
--- a/app/src/redux/robot-admin/selectors.ts
+++ b/app/src/redux/robot-admin/selectors.ts
@@ -1,4 +1,3 @@
-// @flow
 import { add, isWithinInterval } from 'date-fns'
 import { CONNECTABLE } from '../discovery'
 import {
@@ -11,9 +10,16 @@ import {
 
 import type { ConnectivityStatus } from '../discovery/types'
 import type { State } from '../types'
-import type { ResetConfigOption, RobotRestartStatus } from './types'
+import type {
+  PerRobotAdminState,
+  ResetConfigOption,
+  RobotRestartStatus,
+} from './types'
 
-const robotState = (state: State, name: string) => state.robotAdmin[name]
+const robotState = (
+  state: State,
+  name: string
+): PerRobotAdminState | null | undefined => state.robotAdmin[name]
 
 export function getRobotRestarting(state: State, robotName: string): boolean {
   const status = robotState(state, robotName)?.restart?.status
@@ -93,6 +99,6 @@ function getRestartIsComplete(
 export function getResetConfigOptions(
   state: State,
   robotName: string
-): Array<ResetConfigOption> {
+): ResetConfigOption[] {
   return robotState(state, robotName)?.resetConfigOptions || []
 }
diff --git a/app/src/redux/robot-admin/types.ts b/app/src/redux/robot-admin/types.ts
index 0100dbc04e4..62c980553f8 100644
--- a/app/src/redux/robot-admin/types.ts
+++ b/app/src/redux/robot-admin/types.ts
@@ -1,4 +1,3 @@
-// @flow
 import type { RobotApiRequestMeta } from '../robot-api/types'
 
 // common types
@@ -17,81 +16,81 @@ export type RobotAdminStatus =
   | 'restarting'
   | 'restart-failed'
 
-export type ResetConfigOption = {|
-  id: string,
-  name: string,
-  description: string,
-|}
+export interface ResetConfigOption {
+  id: string
+  name: string
+  description: string
+}
 
-export type ResetConfigRequest = $Shape<{|
-  [optionId: string]: boolean,
-|}>
+export type ResetConfigRequest = Partial<{
+  [optionId: string]: boolean
+}>
 
 // action types
 
-export type RestartRobotAction = {|
-  type: 'robotAdmin:RESTART',
-  payload: {| robotName: string |},
-  meta: $Shape<{| ...RobotApiRequestMeta, robot: true |}>,
-|}
-
-export type RestartStatusChangedAction = {|
-  type: 'robotAdmin:RESTART_STATUS_CHANGED',
-  payload: {|
-    robotName: string,
-    restartStatus: RobotRestartStatus,
-    bootId: string | null,
-    startTime: Date | null,
-  |},
-|}
-
-export type RestartRobotSuccessAction = {|
-  type: 'robotAdmin:RESTART_SUCCESS',
-  payload: {| robotName: string |},
-  meta: RobotApiRequestMeta,
-|}
-
-export type RestartRobotFailureAction = {|
-  type: 'robotAdmin:RESTART_FAILURE',
-  payload: {| robotName: string, error: {} |},
-  meta: RobotApiRequestMeta,
-|}
-
-export type FetchResetConfigOptionsAction = {|
-  type: 'robotAdmin:FETCH_RESET_CONFIG_OPTIONS',
-  payload: {| robotName: string |},
-  meta: RobotApiRequestMeta,
-|}
-
-export type FetchResetConfigOptionsSuccessAction = {|
-  type: 'robotAdmin:FETCH_RESET_CONFIG_OPTIONS_SUCCESS',
-  payload: {| robotName: string, options: Array<ResetConfigOption> |},
-  meta: RobotApiRequestMeta,
-|}
-
-export type FetchResetConfigOptionsFailureAction = {|
-  type: 'robotAdmin:FETCH_RESET_CONFIG_OPTIONS_FAILURE',
-  payload: {| robotName: string, error: {} |},
-  meta: RobotApiRequestMeta,
-|}
-
-export type ResetConfigAction = {|
-  type: 'robotAdmin:RESET_CONFIG',
-  payload: {| robotName: string, resets: ResetConfigRequest |},
-  meta: RobotApiRequestMeta,
-|}
-
-export type ResetConfigSuccessAction = {|
-  type: 'robotAdmin:RESET_CONFIG_SUCCESS',
-  payload: {| robotName: string |},
-  meta: RobotApiRequestMeta,
-|}
-
-export type ResetConfigFailureAction = {|
-  type: 'robotAdmin:RESET_CONFIG_FAILURE',
-  payload: {| robotName: string, error: {} |},
-  meta: RobotApiRequestMeta,
-|}
+export interface RestartRobotAction {
+  type: 'robotAdmin:RESTART'
+  payload: { robotName: string }
+  meta: Partial<RobotApiRequestMeta & { robot: true }>
+}
+
+export interface RestartStatusChangedAction {
+  type: 'robotAdmin:RESTART_STATUS_CHANGED'
+  payload: {
+    robotName: string
+    restartStatus: RobotRestartStatus
+    bootId: string | null
+    startTime: Date | null
+  }
+}
+
+export interface RestartRobotSuccessAction {
+  type: 'robotAdmin:RESTART_SUCCESS'
+  payload: { robotName: string }
+  meta: RobotApiRequestMeta | {}
+}
+
+export interface RestartRobotFailureAction {
+  type: 'robotAdmin:RESTART_FAILURE'
+  payload: { robotName: string; error: {} }
+  meta: RobotApiRequestMeta
+}
+
+export interface FetchResetConfigOptionsAction {
+  type: 'robotAdmin:FETCH_RESET_CONFIG_OPTIONS'
+  payload: { robotName: string }
+  meta: RobotApiRequestMeta | {}
+}
+
+export interface FetchResetConfigOptionsSuccessAction {
+  type: 'robotAdmin:FETCH_RESET_CONFIG_OPTIONS_SUCCESS'
+  payload: { robotName: string; options: ResetConfigOption[] }
+  meta: RobotApiRequestMeta
+}
+
+export interface FetchResetConfigOptionsFailureAction {
+  type: 'robotAdmin:FETCH_RESET_CONFIG_OPTIONS_FAILURE'
+  payload: { robotName: string; error: {} }
+  meta: RobotApiRequestMeta
+}
+
+export interface ResetConfigAction {
+  type: 'robotAdmin:RESET_CONFIG'
+  payload: { robotName: string; resets: ResetConfigRequest }
+  meta: RobotApiRequestMeta | {}
+}
+
+export interface ResetConfigSuccessAction {
+  type: 'robotAdmin:RESET_CONFIG_SUCCESS'
+  payload: { robotName: string }
+  meta: RobotApiRequestMeta
+}
+
+export interface ResetConfigFailureAction {
+  type: 'robotAdmin:RESET_CONFIG_FAILURE'
+  payload: { robotName: string; error: {} }
+  meta: RobotApiRequestMeta
+}
 
 export type RobotAdminAction =
   | RestartRobotAction
@@ -107,18 +106,18 @@ export type RobotAdminAction =
 
 // state types
 
-export type RestartState = {|
-  bootId: string | null,
-  startTime: Date | null,
-  status: RobotRestartStatus,
-|}
-
-export type PerRobotAdminState = $Shape<{|
-  status: RobotAdminStatus,
-  restart: RestartState,
-  resetConfigOptions: Array<ResetConfigOption>,
-|}>
-
-export type RobotAdminState = $Shape<{|
-  [robotName: string]: void | PerRobotAdminState,
-|}>
+export interface RestartState {
+  bootId: string | null
+  startTime: Date | null
+  status: RobotRestartStatus
+}
+
+export type PerRobotAdminState = Partial<{
+  status: RobotAdminStatus
+  restart: RestartState
+  resetConfigOptions: ResetConfigOption[]
+}>
+
+export type RobotAdminState = Partial<{
+  [robotName: string]: null | undefined | PerRobotAdminState
+}>
diff --git a/app/src/redux/robot-api/__fixtures__/index.ts b/app/src/redux/robot-api/__fixtures__/index.ts
index 4822b2da042..599562d9107 100644
--- a/app/src/redux/robot-api/__fixtures__/index.ts
+++ b/app/src/redux/robot-api/__fixtures__/index.ts
@@ -1,4 +1,3 @@
-// @flow
 // generic, robot HTTP API fixtures
 
 import type {
@@ -10,35 +9,35 @@ import type {
   RobotApiV2ErrorResponseBody,
 } from '../types'
 
-export type ResponseFixturesOptions<SuccessBody, FailureBody> = {|
-  method: Method,
-  path: string,
-  successStatus: number,
-  successBody: SuccessBody,
-  failureStatus: number,
-  failureBody: FailureBody,
-|}
+export interface ResponseFixturesOptions<SuccessBody, FailureBody> {
+  method: Method
+  path: string
+  successStatus: number
+  successBody: SuccessBody
+  failureStatus: number
+  failureBody: FailureBody
+}
 
-export type ResponseFixtures<SuccessBody, FailureBody> = {|
-  successMeta: {| method: Method, path: string, status: number, ok: boolean |},
-  failureMeta: {| method: Method, path: string, status: number, ok: boolean |},
-  success: {|
-    method: Method,
-    path: string,
-    status: number,
-    ok: boolean,
-    host: RobotHost,
-    body: SuccessBody,
-  |},
-  failure: {|
-    method: Method,
-    path: string,
-    status: number,
-    ok: boolean,
-    host: RobotHost,
-    body: FailureBody,
-  |},
-|}
+export interface ResponseFixtures<SuccessBody, FailureBody> {
+  successMeta: { method: Method; path: string; status: number; ok: boolean }
+  failureMeta: { method: Method; path: string; status: number; ok: boolean }
+  success: {
+    method: Method
+    path: string
+    status: number
+    ok: boolean
+    host: RobotHost
+    body: SuccessBody
+  }
+  failure: {
+    method: Method
+    path: string
+    status: number
+    ok: boolean
+    host: RobotHost
+    body: FailureBody
+  }
+}
 
 export const mockRobot: RobotHost = {
   name: 'robot',
@@ -46,15 +45,15 @@ export const mockRobot: RobotHost = {
   port: 31950,
 }
 
-export const mockRequestMeta: RobotApiRequestMeta = { requestId: 'abc' }
+export const mockRequestMeta = { requestId: 'abc' } as RobotApiRequestMeta
 
 export const mockFailureBody = { message: 'AH' }
 
-export const mockFailedRequestState: {|
-  status: 'failure',
-  response: RobotApiResponseMeta,
-  error: {| message?: string |},
-|} = {
+export const mockFailedRequestState: {
+  status: 'failure'
+  response: RobotApiResponseMeta
+  error: { message?: string }
+} = {
   response: {
     path: '/modules/abc123/update',
     method: 'POST',
diff --git a/app/src/redux/robot-api/__tests__/actions.test.ts b/app/src/redux/robot-api/__tests__/actions.test.ts
index fbdbaf82d88..060e4abdf16 100644
--- a/app/src/redux/robot-api/__tests__/actions.test.ts
+++ b/app/src/redux/robot-api/__tests__/actions.test.ts
@@ -1,16 +1,15 @@
-// @flow
 import * as Actions from '../actions'
 import type { RobotApiAction } from '../types'
 
-type ActionSpec = {|
-  name: string,
-  creator: (...Array<any>) => mixed,
-  args: Array<mixed>,
-  expected: RobotApiAction,
-|}
+interface ActionSpec {
+  name: string
+  creator: (...args: any[]) => unknown
+  args: unknown[]
+  expected: RobotApiAction
+}
 
 describe('robot admin actions', () => {
-  const SPECS: Array<ActionSpec> = [
+  const SPECS: ActionSpec[] = [
     {
       name: 'robotApi:DISMISS_REQUEST',
       creator: Actions.dismissRequest,
diff --git a/app/src/redux/robot-api/__tests__/hooks.test.tsx b/app/src/redux/robot-api/__tests__/hooks.test.tsx
index ca07c7dc1b8..32db9a14998 100644
--- a/app/src/redux/robot-api/__tests__/hooks.test.tsx
+++ b/app/src/redux/robot-api/__tests__/hooks.test.tsx
@@ -1,4 +1,3 @@
-// @flow
 import * as React from 'react'
 import uniqueId from 'lodash/uniqueId'
 import { mountWithStore } from '@opentrons/components/__utils__'
@@ -7,10 +6,10 @@ import { useDispatchApiRequest, useDispatchApiRequests } from '../hooks'
 
 jest.mock('lodash/uniqueId')
 
-const mockUniqueId: JestMockFn<[string | void], string> = uniqueId
+const mockUniqueId = uniqueId as jest.MockedFunction<typeof uniqueId>
 
 describe('useDispatchApiRequest', () => {
-  let render
+  let render: () => ReturnType<typeof mountWithStore>
 
   const TestUseDispatchApiRequest = () => {
     const mockAction: any = { type: 'mockAction', meta: {} }
@@ -38,18 +37,18 @@ describe('useDispatchApiRequest', () => {
     const { wrapper, store } = render()
     expect(store.dispatch).toHaveBeenCalledTimes(0)
 
-    wrapper.find('button').invoke('onClick')()
+    wrapper.find('button').invoke('onClick')?.({} as React.MouseEvent)
     wrapper.update()
 
     expect(store.dispatch).toHaveBeenCalledWith({
       type: 'mockAction',
-      meta: { requestId: 'mockId_0' },
+      meta: { requestId: 'mockId_0' } as any,
     })
   })
 
   it('adds requestId to requestIds list', () => {
     const { wrapper } = render()
-    wrapper.find('button').invoke('onClick')()
+    wrapper.find('button').invoke('onClick')?.({} as React.MouseEvent)
     wrapper.update()
 
     expect(wrapper.text()).toEqual('mockId_0')
@@ -57,9 +56,9 @@ describe('useDispatchApiRequest', () => {
 
   it('can dispatch multiple requests', () => {
     const { wrapper, store } = render()
-    wrapper.find('button').invoke('onClick')()
+    wrapper.find('button').invoke('onClick')?.({} as React.MouseEvent)
     wrapper.update()
-    wrapper.find('button').invoke('onClick')()
+    wrapper.find('button').invoke('onClick')?.({} as React.MouseEvent)
     wrapper.update()
 
     expect(store.dispatch).toHaveBeenCalledTimes(2)
@@ -68,9 +67,9 @@ describe('useDispatchApiRequest', () => {
 })
 
 describe('useDispatchApiRequests', () => {
-  let render
+  let render: () => ReturnType<typeof mountWithStore>
 
-  const TestUseDispatchApiRequests = props => {
+  const TestUseDispatchApiRequests = (): JSX.Element => {
     const mockAction: any = { type: 'mockAction', meta: {} }
     const mockOtherAction: any = { type: 'mockOtherAction', meta: {} }
     const [dispatchRequests] = useDispatchApiRequests()
@@ -91,7 +90,7 @@ describe('useDispatchApiRequests', () => {
         initialState: {
           robotApi: {},
         },
-      })
+      } as any)
   })
 
   afterEach(() => {
@@ -107,13 +106,13 @@ describe('useDispatchApiRequests', () => {
         },
       },
     })
-    wrapper.find('button').invoke('onClick')()
+    wrapper.find('button').invoke('onClick')?.({} as React.MouseEvent)
     wrapper.update()
 
     expect(store.dispatch).toHaveBeenCalledTimes(1)
     expect(store.dispatch).toHaveBeenCalledWith({
       type: 'mockAction',
-      meta: { requestId: 'mockId_0' },
+      meta: { requestId: 'mockId_0' } as any,
     })
   })
 
@@ -127,17 +126,17 @@ describe('useDispatchApiRequests', () => {
         },
       },
     })
-    wrapper.find('button').invoke('onClick')()
+    wrapper.find('button').invoke('onClick')?.({} as React.MouseEvent)
     wrapper.update()
 
     expect(store.dispatch).toHaveBeenCalledTimes(2)
     expect(store.dispatch).toHaveBeenCalledWith({
       type: 'mockAction',
-      meta: { requestId: 'mockId_0' },
+      meta: { requestId: 'mockId_0' } as any,
     })
     expect(store.dispatch).toHaveBeenCalledWith({
       type: 'mockOtherAction',
-      meta: { requestId: 'mockId_1' },
+      meta: { requestId: 'mockId_1' } as any,
     })
   })
 
@@ -152,17 +151,17 @@ describe('useDispatchApiRequests', () => {
         mockId_1: { status: PENDING },
       },
     })
-    wrapper.find('button').invoke('onClick')()
+    wrapper.find('button').invoke('onClick')?.({} as React.MouseEvent)
     wrapper.update()
 
     expect(store.dispatch).toHaveBeenCalledTimes(2)
     expect(store.dispatch).toHaveBeenCalledWith({
       type: 'mockAction',
-      meta: { requestId: 'mockId_0' },
+      meta: { requestId: 'mockId_0' } as any,
     })
     expect(store.dispatch).toHaveBeenCalledWith({
       type: 'mockOtherAction',
-      meta: { requestId: 'mockId_1' },
+      meta: { requestId: 'mockId_1' } as any,
     })
   })
 })
diff --git a/app/src/redux/robot-api/__tests__/http.test.ts b/app/src/redux/robot-api/__tests__/http.test.ts
index 6b185233f73..72da5f60463 100644
--- a/app/src/redux/robot-api/__tests__/http.test.ts
+++ b/app/src/redux/robot-api/__tests__/http.test.ts
@@ -1,4 +1,3 @@
-// @flow
 // tests for the robot-api fetch wrapper
 
 import { promisify } from 'util'
@@ -11,27 +10,27 @@ import FormData from 'form-data'
 import { robotApiUrl, fetchRobotApi } from '../http'
 import { HTTP_API_VERSION, GET, POST, PATCH, DELETE } from '../constants'
 
-import type { $Application } from 'express'
+import type { Application } from 'express'
 import type { RobotHost } from '../types'
 
 jest.unmock('node-fetch')
 
 describe('robot-api http client', () => {
-  let testApp: $Application<>
-  let testServer: http$Server
+  let testApp: Application
+  let testServer: any
   let testPort: number
   let robot: RobotHost
 
   beforeAll(() => {
     global.fetch = fetch
     testApp = express()
-    testApp.use((express: any).json())
+    testApp.use((express as any).json())
 
     return portfinder.getPortPromise({ port: 31950 }).then(port => {
       testPort = port
       robot = { name: 'robot-name', ip: '127.0.0.1', port }
 
-      return new Promise((resolve, reject) => {
+      return new Promise<void>((resolve, reject) => {
         const server = testApp.listen(port)
 
         if (server) {
@@ -201,10 +200,10 @@ describe('robot-api http client', () => {
       '/file',
       multer({ storage: multer.memoryStorage() }).any(),
       (req, res) => {
-        const files = (req: any).files ?? []
+        const files = (req as any).files ?? []
 
         res.status(201).send({
-          files: files.map(f => ({
+          files: files.map((f: any) => ({
             key: f.fieldname,
             filename: f.originalname,
             contents: f.buffer.toString('utf-8'),
@@ -213,9 +212,9 @@ describe('robot-api http client', () => {
       }
     )
 
-    const form = new FormData()
-    form.append('file1', Buffer.from('lorem ipsum'), '1.txt')
-    form.append('file2', Buffer.from('dolor sit amet'), '2.txt')
+    const form = new FormData() as any
+    form.append('file1', Buffer.from('lorem ipsum') as any, '1.txt')
+    form.append('file2', Buffer.from('dolor sit amet') as any, '2.txt')
 
     const result = fetchRobotApi(robot, {
       method: POST,
diff --git a/app/src/redux/robot-api/__tests__/reducer.test.ts b/app/src/redux/robot-api/__tests__/reducer.test.ts
index 92d127c5a8f..3c76392c26f 100644
--- a/app/src/redux/robot-api/__tests__/reducer.test.ts
+++ b/app/src/redux/robot-api/__tests__/reducer.test.ts
@@ -1,23 +1,22 @@
-// @flow
 import { robotApiReducer } from '../reducer'
 
 import type { RobotApiState } from '../types'
 import { mockFailedRequestState } from '../__fixtures__'
 
-type ReducerSpec = {|
-  name: string,
-  state: RobotApiState,
-  action: any,
-  expected: RobotApiState,
-|}
+interface ReducerSpec {
+  name: string
+  state: RobotApiState
+  action: any
+  expected: RobotApiState
+}
 
-const SPECS: Array<ReducerSpec> = [
+const SPECS: ReducerSpec[] = [
   {
     name: 'handles an action with meta.requestId and no response',
     state: { def: { status: 'pending' } },
     action: {
       type: 'someScope:FETCH_THING',
-      meta: { requestId: 'abc' },
+      meta: { requestId: 'abc' } as any,
     },
     expected: { abc: { status: 'pending' }, def: { status: 'pending' } },
   },
@@ -30,7 +29,7 @@ const SPECS: Array<ReducerSpec> = [
       meta: { requestId: 'abc', response: { ok: true } },
     },
     expected: {
-      abc: { status: 'success', response: ({ ok: true }: any) },
+      abc: { status: 'success', response: { ok: true } as any },
       def: { status: 'pending' },
     },
   },
@@ -45,7 +44,7 @@ const SPECS: Array<ReducerSpec> = [
     expected: {
       abc: {
         status: 'failure',
-        response: ({ ok: false }: any),
+        response: { ok: false } as any,
         error: { message: 'AH' },
       },
       def: { status: 'pending' },
diff --git a/app/src/redux/robot-api/__tests__/selectors.test.ts b/app/src/redux/robot-api/__tests__/selectors.test.ts
index 6ce23edbf82..a255e508063 100644
--- a/app/src/redux/robot-api/__tests__/selectors.test.ts
+++ b/app/src/redux/robot-api/__tests__/selectors.test.ts
@@ -1,35 +1,33 @@
-// @flow
-
 import * as Selectors from '../selectors'
 import type { State } from '../../types'
 
-type SelectorSpec = {|
-  name: string,
-  selector: (State, ...Array<any>) => mixed,
-  state: $Shape<State>,
-  args?: Array<any>,
-  expected: mixed,
-|}
+interface SelectorSpec {
+  name: string
+  selector: (state: State, ...args: any[]) => unknown
+  state: State
+  args?: any[]
+  expected: unknown
+}
 
-const SPECS: Array<SelectorSpec> = [
+const SPECS: SelectorSpec[] = [
   {
     name: 'getRequestById returns null by default',
     selector: Selectors.getRequestById,
-    state: { robotApi: {} },
+    state: { robotApi: {} } as any,
     args: ['abc'],
     expected: null,
   },
   {
     name: 'getRequestById returns state if it exists',
     selector: Selectors.getRequestById,
-    state: { robotApi: { abc: { status: 'pending' } } },
+    state: { robotApi: { abc: { status: 'pending' } } } as any,
     args: ['abc'],
     expected: { status: 'pending' },
   },
   {
     name: 'getRequests returns zip-able array of request states',
     selector: Selectors.getRequests,
-    state: { robotApi: { abc: { status: 'pending' } } },
+    state: { robotApi: { abc: { status: 'pending' } } } as any,
     args: [['abc', 'def']],
     expected: [{ status: 'pending' }, null],
   },
diff --git a/app/src/redux/robot-api/__utils__/epic-test-mocks.ts b/app/src/redux/robot-api/__utils__/epic-test-mocks.ts
index c536ead0f0e..c0573e0f61a 100644
--- a/app/src/redux/robot-api/__utils__/epic-test-mocks.ts
+++ b/app/src/redux/robot-api/__utils__/epic-test-mocks.ts
@@ -1,4 +1,3 @@
-// @flow
 import { TestScheduler } from 'rxjs/testing'
 
 import * as RobotApiHttp from '../http'
@@ -6,61 +5,55 @@ import * as DiscoverySelectors from '../../discovery/selectors'
 import { mockRobot, mockRequestMeta } from '../__fixtures__'
 
 import type { State } from '../../types'
-import type {
-  RobotHost,
-  RobotApiRequestOptions,
-  RobotApiResponse,
-} from '../types'
+import type { RobotHost, RobotApiResponse } from '../types'
 
 jest.mock('../http')
 jest.mock('../../discovery/selectors')
 
-const mockFetchRobotApi: JestMockFn<
-  [RobotHost, RobotApiRequestOptions],
-  $Call<typeof RobotApiHttp.fetchRobotApi, RobotHost, RobotApiRequestOptions>
-> = RobotApiHttp.fetchRobotApi
-
-const mockGetRobotByName: JestMockFn<
-  [State, string],
-  RobotHost
-> = (DiscoverySelectors.getRobotByName: any)
-
-export type EpicTestMocks<A, R> = {|
-  state: State,
-  action: A,
-  response: R | void,
-  robot: RobotHost,
-  meta: typeof mockRequestMeta,
-  getRobotByName: typeof mockGetRobotByName,
-  fetchRobotApi: typeof mockFetchRobotApi,
-  testScheduler: any,
-|}
+const mockFetchRobotApi = RobotApiHttp.fetchRobotApi as jest.MockedFunction<
+  typeof RobotApiHttp.fetchRobotApi
+>
+const mockGetRobotByName = DiscoverySelectors.getRobotByName as jest.MockedFunction<
+  typeof DiscoverySelectors.getRobotByName
+>
+
+export interface EpicTestMocks<A, R> {
+  state: State
+  action: A
+  response: R | undefined
+  robot: RobotHost
+  meta: typeof mockRequestMeta
+  getRobotByName: typeof mockGetRobotByName
+  fetchRobotApi: typeof mockFetchRobotApi
+  testScheduler: TestScheduler
+}
 
+interface TriggerAction {
+  meta: { requestId: string; [key: string]: unknown }
+  [key: string]: unknown
+}
 /**
  * Sets up the necessary mocks for robot HTTP API epic testing. Remember to
  * call `jest.resetAllMocks()` in `afterEach`!
  *
  * @returns {EpicTestMocks}
  */
-export const setupEpicTestMocks = <
-  A: { meta: { requestId: string, ... }, ... },
-  R: RobotApiResponse
->(
+export const setupEpicTestMocks = <A = TriggerAction, R = RobotApiResponse>(
   makeTriggerAction?: (robotName: string) => A,
   mockResponse?: R
 ): EpicTestMocks<A, R> => {
-  const mockState: State = ({ state: true, mock: true }: any)
+  const mockState: State = { state: true, mock: true } as any
   const triggerAction =
     typeof makeTriggerAction === 'function'
-      ? makeTriggerAction(mockRobot.name)
-      : {}
+      ? (makeTriggerAction(mockRobot.name) as A & { meta: any })
+      : ({} as A & { meta: any })
 
   const mockAction = {
     ...triggerAction,
     meta: { ...(triggerAction.meta || {}), ...mockRequestMeta },
   }
-
-  mockGetRobotByName.mockImplementation((state, robotName) => {
+  // @ts-expect-error(sa, 2021-05-17): mockRobot does not have all properties in the return value of getRobotByName
+  mockGetRobotByName.mockImplementation((state: State, robotName: string) => {
     expect(state).toBe(mockState)
     expect(robotName).toBe(mockRobot.name)
 
@@ -83,17 +76,19 @@ export const setupEpicTestMocks = <
   }
 }
 
-export const runEpicTest = <A, R: RobotApiResponse>(
+export const runEpicTest = <A, R = RobotApiResponse>(
   epicMocks: EpicTestMocks<A, R>,
-  run: (schedularArgs: any) => mixed
-) => {
+  run: (schedularArgs: any) => unknown
+): void => {
   const { testScheduler, fetchRobotApi, response } = epicMocks
 
   testScheduler.run(schedulerArgs => {
     const { cold } = schedulerArgs
 
     if (response) {
-      fetchRobotApi.mockReturnValue(cold('r', { r: response }))
+      fetchRobotApi.mockReturnValue(
+        cold<RobotApiResponse>('r', { r: response } as any)
+      )
     }
 
     run(schedulerArgs)
diff --git a/app/src/redux/robot-api/__utils__/index.ts b/app/src/redux/robot-api/__utils__/index.ts
index c158696d5b2..6452fc8afec 100644
--- a/app/src/redux/robot-api/__utils__/index.ts
+++ b/app/src/redux/robot-api/__utils__/index.ts
@@ -1,3 +1 @@
-// @flow
-
 export * from './epic-test-mocks'
diff --git a/app/src/redux/robot-api/actions.ts b/app/src/redux/robot-api/actions.ts
index d9cc3ffdadb..caa8e7ef298 100644
--- a/app/src/redux/robot-api/actions.ts
+++ b/app/src/redux/robot-api/actions.ts
@@ -1,4 +1,3 @@
-// @flow
 import * as Types from './types'
 import { DISMISS_REQUEST } from './constants'
 
diff --git a/app/src/redux/robot-api/constants.ts b/app/src/redux/robot-api/constants.ts
index 15cfdd81195..8b135cdcd1a 100644
--- a/app/src/redux/robot-api/constants.ts
+++ b/app/src/redux/robot-api/constants.ts
@@ -1,5 +1,3 @@
-// @flow
-
 export const HTTP_API_VERSION: 2 = 2
 
 export const GET: 'GET' = 'GET'
diff --git a/app/src/redux/robot-api/helpers.ts b/app/src/redux/robot-api/helpers.ts
index 08315045467..90c1e0e5926 100644
--- a/app/src/redux/robot-api/helpers.ts
+++ b/app/src/redux/robot-api/helpers.ts
@@ -1,17 +1,19 @@
-// @flow
-
 import * as Types from './types'
 
 // TODO(mc, 2020-06-17): this is unit tested by component tests
 // write some direct tests and maybe fold into getRequestState selector
 export const getErrorResponseMessage = (
-  response: {| message?: string |} | Types.RobotApiV2ErrorResponseBody
-): string => {
+  response: { message?: string } | Types.RobotApiV2ErrorResponseBody
+): string | undefined => {
+  // @ts-expect-error TODO: use in operator to narrow allow for type narrowing
   if (response.message) {
+    // @ts-expect-error TODO: use in operator to narrow allow for type narrowing
     return response.message
   }
 
+  // @ts-expect-error TODO: use in operator to narrow allow for type narrowing
   if (response.errors) {
+    // @ts-expect-error TODO: use in operator to narrow allow for type narrowing
     return response.errors.flatMap(e => (e.detail ? [e.detail] : [])).join(',')
   }
 
diff --git a/app/src/redux/robot-api/hooks.ts b/app/src/redux/robot-api/hooks.ts
index 2f604a9e8dd..c29904ed1ed 100644
--- a/app/src/redux/robot-api/hooks.ts
+++ b/app/src/redux/robot-api/hooks.ts
@@ -1,4 +1,3 @@
-// @flow
 // hooks for components that depend on API state
 import { useReducer, useCallback, useRef, useState } from 'react'
 import { useDispatch, useSelector } from 'react-redux'
@@ -9,17 +8,23 @@ import { PENDING } from './constants'
 import { getRequestById } from './selectors'
 import type { RequestState } from './types'
 
+type ActionWithRequestMeta = Action & {
+  meta: { [requestId: string]: string }
+}
+export type DispatchApiRequestType = (a: Action) => ActionWithRequestMeta
+export type DispatchRequestsType = (...actions: Action[]) => void
+
 /**
  * React hook to attach a unique request ID to and dispatch an API action
  * Note: dispatching will trigger a re-render of the component
  *
- * @returns {[action => mixed, Array<string>]} tuple of dispatch function and dispatched request IDs
+ * @returns {[(action: Action) => unknown, string[]]} tuple of dispatch function and dispatched request IDs
  *
  * @example
  * import { useDispatchApiRequest } from '../../robot-api'
  * import { fetchPipettes } from '../../pipettes'
  *
- * type Props = {| robotName: string |}
+ * type Props = { robotName: string }
  *
  * export function FetchPipettesButton(props: Props) {
  *   const { robotName } = props
@@ -32,20 +37,19 @@ import type { RequestState } from './types'
  *   )
  * }
  */
-export function useDispatchApiRequest<
-  A: { ...Action, meta: { requestId: string } }
->(): [(A) => A, Array<string>] {
-  const dispatch = useDispatch<(A) => void>()
+export function useDispatchApiRequest(): [DispatchApiRequestType, string[]] {
+  const dispatch = useDispatch<(a: Action) => void>()
 
   // TODO(mc, 2019-11-06): evaluate whether or not this can be a ref
-  const [requestIds, addRequestId] = useReducer<Array<string>, string>(
-    (ids, next) => [...ids, next],
+  const [requestIds, addRequestId] = useReducer(
+    (ids: string[], next: string) => [...ids, next],
     []
   )
 
   const dispatchApiRequest = useCallback(
-    (a: A): A => {
+    (a: Action): ActionWithRequestMeta => {
       const requestId = uniqueId('robotApi_request_')
+      //  @ts-expect-error(sa, 2021-05-17): type guard a.meta, also robotCommand might not exist on a.meta
       const action = { ...a, meta: { ...a.meta, requestId } }
 
       addRequestId(requestId)
@@ -65,14 +69,14 @@ export function useDispatchApiRequest<
  * upon dispatch of said action.
  * Note: dispatching will trigger a re-render of the component
  *
- * @returns {[action => mixed, Array<string>]} tuple of dispatch function and dispatched request IDs
+ * @returns {[(action: Action) => unknown, string[]]} tuple of dispatch function and dispatched request IDs
  *
  * @example
  * import { useDispatchApiRequests } from '../../robot-api'
  * import { fetchPipettes } from '../../pipettes'
  * import { fetchModules } from '../../modules'
  *
- * type Props = {| robotName: string |}
+ * type Props = { robotName: string }
  *
  * export function FetchPipettesButton(props: Props) {
  *   const { robotName } = props
@@ -85,15 +89,13 @@ export function useDispatchApiRequest<
  *   )
  * }
  */
-export function useDispatchApiRequests<
-  A: { ...Action, meta: { requestId: string } }
->(
-  onDispatchedRequest: (A => void) | null = null
-): [(...Array<A>) => void, Array<string>] {
+export function useDispatchApiRequests(
+  onDispatchedRequest: ((action: Action) => void) | null = null
+): [DispatchRequestsType, string[]] {
   const [dispatchRequest, requestIds] = useDispatchApiRequest()
 
-  const trackedRequestId = useRef<string | null>(null)
-  const [unrequestedQueue, setUnrequestedQueue] = useState<Array<A>>([])
+  const trackedRequestId = useRef<string | null | undefined>(null)
+  const [unrequestedQueue, setUnrequestedQueue] = useState<Action[]>([])
 
   const trackedRequestIsPending =
     useSelector<State, RequestState | null>(state => {
@@ -109,7 +111,7 @@ export function useDispatchApiRequests<
     setUnrequestedQueue(unrequestedQueue.slice(1))
   }
 
-  const dispatchApiRequests = (...a: Array<A>) => {
+  const dispatchApiRequests = (...a: Action[]): void => {
     setUnrequestedQueue([...unrequestedQueue, ...a])
   }
 
diff --git a/app/src/redux/robot-api/http.ts b/app/src/redux/robot-api/http.ts
index d69d47a9364..953b305f0ad 100644
--- a/app/src/redux/robot-api/http.ts
+++ b/app/src/redux/robot-api/http.ts
@@ -1,4 +1,3 @@
-// @flow
 // simple fetch wrapper to format URL for robot and parse JSON response
 import { of, from } from 'rxjs'
 import { map, switchMap, catchError } from 'rxjs/operators'
@@ -15,7 +14,7 @@ import type {
   RobotApiResponse,
 } from './types'
 
-const checkEmpty = (val: mixed): boolean => val == null || val === ''
+const checkEmpty = (val: unknown): boolean => val == null || val === ''
 
 export function robotApiUrl(
   host: RobotHost,
@@ -40,7 +39,7 @@ export function fetchRobotApi(
 ): Observable<RobotApiResponse> {
   const { path, method, body: reqBody, form: reqForm } = request
   const url = robotApiUrl(host, request)
-  const options: RequestOptions = {
+  const options: RequestInit = {
     method,
     headers: { 'Opentrons-Version': `${HTTP_API_VERSION}` },
   }
diff --git a/app/src/redux/robot-api/index.ts b/app/src/redux/robot-api/index.ts
index 6395616724c..d29e1ad5124 100644
--- a/app/src/redux/robot-api/index.ts
+++ b/app/src/redux/robot-api/index.ts
@@ -1,4 +1,3 @@
-// @flow
 export * from './constants'
 export * from './helpers'
 export * from './hooks'
diff --git a/app/src/redux/robot-api/operators.ts b/app/src/redux/robot-api/operators.ts
index 2731f6060a0..ddfec300379 100644
--- a/app/src/redux/robot-api/operators.ts
+++ b/app/src/redux/robot-api/operators.ts
@@ -1,4 +1,3 @@
-// @flow
 import { pipe } from 'rxjs'
 import { map, mergeMap, withLatestFrom, filter } from 'rxjs/operators'
 
@@ -6,51 +5,57 @@ import { getRobotByName } from '../discovery/selectors'
 import { fetchRobotApi } from './http'
 import * as Types from './types'
 
-import type { Observable } from 'rxjs'
+import type { Observable, UnaryFunction, OperatorFunction } from 'rxjs'
 import type { State, Action } from '../types'
+import type { RobotHost } from './types'
 
 export type ActionToRequestMapper<TriggerAction> = (
-  TriggerAction,
-  State
+  triggerAction: TriggerAction,
+  state: State
 ) => Types.RobotApiRequestOptions | null
 
 export type ResponseToActionMapper<TriggerAction> = (
-  Types.RobotApiResponse,
-  TriggerAction,
-  State
+  response: Types.RobotApiResponse,
+  triggerAction: TriggerAction,
+  state: State
 ) => Action
 
 export function withRobotHost<A>(
   state$: Observable<State>,
-  getRobotName: A => string
-): rxjs$OperatorFunction<A, [A, State, Types.RobotHost]> {
+  getRobotName: (action: A) => string
+): UnaryFunction<Observable<A>, Observable<[A, State, RobotHost]>> {
   return pipe(
-    withLatestFrom(state$, (a: A, s: State): [
-      A,
-      State,
-      Types.RobotHost | null
-    ] => [a, s, getRobotByName(s, getRobotName(a))]),
-    filter(([a, s, maybeRobot]) => maybeRobot !== null)
+    withLatestFrom(state$, (a: A, s: State): [A, State, RobotHost | null] => [
+      a,
+      s,
+      getRobotByName(s, getRobotName(a)) as RobotHost | null,
+    ]),
+    filter((args): args is [A, State, RobotHost] => {
+      const [, , maybeRobot] = args
+      return maybeRobot !== null
+    })
   )
 }
 
 export function mapToRobotApiRequest<A>(
   state$: Observable<State>,
-  getRobotName: A => string,
+  getRobotName: (action: A) => string,
   mapActionToRequest: ActionToRequestMapper<A>,
   mapResponseToAction: ResponseToActionMapper<A>
-): rxjs$OperatorFunction<A, Action> {
+): OperatorFunction<A, Action> {
   return pipe(
     withRobotHost(state$, getRobotName),
     map(([a, s, host]) => [host, mapActionToRequest(a, s), a]),
-    filter(([host, request, origAction]) => request !== null),
+    filter(([_host, request, _origAction]) => request !== null),
     // TODO(mc, 2019-11-15): this is a mergeMap rather than switchMap because:
     // - Our vanilla fetch usage means switchMap won't cancel inflight requests
     // - Our request lifecycle state can't handle a cancelled request
     // Change this to a switchMap once one or both of these are addressed
     mergeMap(([host, request, origAction]) => {
+      // @ts-expect-error(sa, 2021-05-17): host could be null, type guard in the filter
       return fetchRobotApi(host, request).pipe(
         withLatestFrom(state$),
+        // @ts-expect-error(sa, 2021-05-17): action could be null, type guard in the filter
         map(([resp, state]) => mapResponseToAction(resp, origAction, state))
       )
     })
diff --git a/app/src/redux/robot-api/reducer.ts b/app/src/redux/robot-api/reducer.ts
index 3887d720a96..88c7088ce90 100644
--- a/app/src/redux/robot-api/reducer.ts
+++ b/app/src/redux/robot-api/reducer.ts
@@ -1,4 +1,3 @@
-// @flow
 // api request state reducer
 // tracks requests by ID
 // TODO(mc, 2020-03-05): caution! type checking in this file appears to
@@ -17,7 +16,7 @@ export function robotApiReducer(
   if (action.type === DISMISS_REQUEST) {
     return omit(state, action.payload.requestId)
   }
-
+  // @ts-expect-error(sa, 2021-05-17): type guard action.meta
   const meta = action.meta ? action.meta : {}
 
   if (meta.requestId != null) {
@@ -34,6 +33,7 @@ export function robotApiReducer(
 
     if (meta.response.ok === false) {
       const error =
+        // @ts-expect-error(sa, 2021-05-17): type guard action.payload
         action.payload && action.payload.error ? action.payload.error : {}
 
       return {
diff --git a/app/src/redux/robot-api/selectors.ts b/app/src/redux/robot-api/selectors.ts
index 19aa0061abd..b8c3ab7bf2e 100644
--- a/app/src/redux/robot-api/selectors.ts
+++ b/app/src/redux/robot-api/selectors.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import type { State } from '../types'
 import * as Types from './types'
 
@@ -12,7 +10,7 @@ export const getRequestById = (
 
 export const getRequests = (
   state: State,
-  ids: $ReadOnlyArray<string>
+  ids: string[]
 ): Array<Types.RequestState | null> => {
   return ids.map(id => getRequestById(state, id))
 }
diff --git a/app/src/redux/robot-api/types.ts b/app/src/redux/robot-api/types.ts
index 4b081587f05..b32f0da11ac 100644
--- a/app/src/redux/robot-api/types.ts
+++ b/app/src/redux/robot-api/types.ts
@@ -1,117 +1,116 @@
-// @flow
-import typeof { PENDING, SUCCESS, FAILURE } from './constants'
+import { PENDING, SUCCESS, FAILURE } from './constants'
 
 export type Method = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE'
 
 // api call + response types
 
-export type RobotHost = {
-  name: string,
-  ip: string,
-  port: number,
-  ...
+export interface RobotHost {
+  name: string
+  ip: string
+  port: number
+  [key: string]: unknown
 }
 
-export type RobotApiRequestOptions = {|
-  method: Method,
-  path: string,
-  body?: { ... },
-  query?: { [param: string]: string | boolean | number | null | void, ... },
-  form?: FormData,
-|}
-
-export type RobotApiResponseMeta = {|
-  path: string,
-  method: Method,
-  status: number,
-  ok: boolean,
-|}
-
-export type RobotApiResponse = {|
-  ...RobotApiResponseMeta,
-  host: RobotHost,
-  body: any,
-|}
-
-export type RobotApiRequestMeta = $Shape<{|
-  requestId: string,
-  response: {|
-    method: Method,
-    path: string,
-    status: number,
-    ok: boolean,
-  |},
-|}>
-
-export type RobotApiErrorResponse = {
-  message: string,
-  ...
+export interface RobotApiRequestOptions {
+  method: Method
+  path: string
+  body?: {}
+  query?: {
+    [param: string]: string | boolean | number | null | undefined
+  }
+  form?: FormData
+}
+
+export interface RobotApiResponseMeta {
+  path: string
+  method: Method
+  status: number
+  ok: boolean
+}
+
+export interface RobotApiResponse extends RobotApiResponseMeta {
+  host: RobotHost
+  body: any
+}
+
+export interface RobotApiRequestMeta {
+  requestId?: string
+  response: {
+    method: Method
+    path: string
+    status: number
+    ok: boolean
+  }
+  [key: string]: unknown
+}
+
+export interface RobotApiErrorResponse {
+  message: string
+  [key: string]: unknown
 }
 
 // action types
 
-export type DismissRequestAction = {|
-  type: 'robotApi:DISMISS_REQUEST',
-  payload: {| requestId: string |},
-|}
+export interface DismissRequestAction {
+  type: 'robotApi:DISMISS_REQUEST'
+  payload: { requestId: string }
+}
 
 export type RobotApiAction = DismissRequestAction
 
 // parameterized response type
 // DataT parameter must be a subtype of RobotApiV2ResponseData
 // MetaT defaults to void if unspecified
-export type ResourceLink = {|
-  href: string,
-  meta?: $Shape<{| [string]: string | void |}>,
-|}
+export interface ResourceLink {
+  href: string
+  meta?: Partial<{ [key: string]: string | null | undefined }>
+}
 
-export type ResourceLinks = $Shape<{| [string]: ResourceLink | string | void |}>
+export type ResourceLinks = Record<
+  string,
+  ResourceLink | string | null | undefined
+>
 
 // generic response data supertype
-export type RobotApiV2ResponseData = {
-  id: string,
-  ...
+export type RobotApiV2ResponseData = Partial<{ id: string }>
+
+export interface RobotApiV2ResponseBody<
+  DataT extends RobotApiV2ResponseData | RobotApiV2ResponseData[]
+> {
+  data: DataT
+  links?: ResourceLinks
 }
 
-export type RobotApiV2ResponseBody<
-  DataT: RobotApiV2ResponseData | $ReadOnlyArray<RobotApiV2ResponseData>
-> = {|
-  data: DataT,
-  links?: ResourceLinks,
-|}
-
-export type RobotApiV2Error = {|
-  id?: string,
-  links?: ResourceLinks,
-  status?: string,
-  title?: string,
-  detail?: string,
-  source?: {|
-    pointer?: string,
-    parameter?: string,
-  |},
-  meta?: { ... },
-|}
-
-export type RobotApiV2ErrorResponseBody = {|
-  errors: Array<RobotApiV2Error>,
-|}
+export interface RobotApiV2Error {
+  id?: string
+  links?: ResourceLinks
+  status?: string
+  title?: string
+  detail?: string
+  source?: {
+    pointer?: string
+    parameter?: string
+  }
+  meta?: {}
+}
+
+export interface RobotApiV2ErrorResponseBody {
+  errors: RobotApiV2Error[]
+}
 
 // API request tracking state
 
-export type RequestStatus = PENDING | SUCCESS | FAILURE
+export type RequestStatus = typeof PENDING | typeof SUCCESS | typeof FAILURE
 
 export type RequestState =
-  | $ReadOnly<{| status: PENDING |}>
-  | $ReadOnly<{| status: SUCCESS, response: RobotApiResponseMeta |}>
-  | $ReadOnly<{|
-      status: FAILURE,
-      response: RobotApiResponseMeta,
-      error: {| message?: string |} | RobotApiV2ErrorResponseBody,
-    |}>
-
-export type RobotApiState = $Shape<
-  $ReadOnly<{|
-    [requestId: string]: void | RequestState,
-  |}>
->
+  | { status: typeof PENDING }
+  | { status: typeof SUCCESS; response: RobotApiResponseMeta }
+  | {
+      status: typeof FAILURE
+      response: RobotApiResponseMeta
+      error: { message?: string } | RobotApiV2ErrorResponseBody
+    }
+
+export type RobotApiState = Partial<{
+  [requestId: string]: null | undefined | RequestState
+}>
diff --git a/app/src/redux/robot-controls/__fixtures__/home.ts b/app/src/redux/robot-controls/__fixtures__/home.ts
index f0d5998a51e..d14bf12a9f2 100644
--- a/app/src/redux/robot-controls/__fixtures__/home.ts
+++ b/app/src/redux/robot-controls/__fixtures__/home.ts
@@ -1,11 +1,10 @@
-// @flow
-
 import { mockRobot } from '../../robot-api/__fixtures__'
+import type { Method } from '../../robot-api/types'
 
 // POST /robot/home
 
 export const mockHomeSuccessMeta = {
-  method: 'POST',
+  method: 'POST' as Method,
   path: '/robot/home',
   ok: true,
   status: 200,
@@ -18,7 +17,7 @@ export const mockHomeSuccess = {
 }
 
 export const mockHomeFailureMeta = {
-  method: 'POST',
+  method: 'POST' as Method,
   path: '/robot/home',
   ok: false,
   status: 500,
diff --git a/app/src/redux/robot-controls/__fixtures__/index.ts b/app/src/redux/robot-controls/__fixtures__/index.ts
index 37998a24778..340f4b8a5bb 100644
--- a/app/src/redux/robot-controls/__fixtures__/index.ts
+++ b/app/src/redux/robot-controls/__fixtures__/index.ts
@@ -1,5 +1,3 @@
-// @flow
-
 export * from './lights'
 export * from './home'
 export * from './move'
diff --git a/app/src/redux/robot-controls/__fixtures__/lights.ts b/app/src/redux/robot-controls/__fixtures__/lights.ts
index 9ccbdbd7e4d..ec4799ab166 100644
--- a/app/src/redux/robot-controls/__fixtures__/lights.ts
+++ b/app/src/redux/robot-controls/__fixtures__/lights.ts
@@ -1,12 +1,12 @@
-// @flow
 // mock HTTP responses for /robot/lights endpoints
 
 import { mockRobot } from '../../robot-api/__fixtures__'
+import type { Method } from '../../robot-api/types'
 
 // GET /robot/lights
 
 export const mockFetchLightsSuccessMeta = {
-  method: 'GET',
+  method: 'GET' as Method,
   path: '/robot/lights',
   ok: true,
   status: 200,
@@ -19,7 +19,7 @@ export const mockFetchLightsSuccess = {
 }
 
 export const mockFetchLightsFailureMeta = {
-  method: 'GET',
+  method: 'GET' as Method,
   path: '/robot/lights',
   ok: false,
   status: 500,
@@ -34,7 +34,7 @@ export const mockFetchLightsFailure = {
 // POST /robot/lights
 
 export const mockUpdateLightsSuccessMeta = {
-  method: 'POST',
+  method: 'POST' as Method,
   path: '/robot/lights',
   ok: true,
   status: 200,
@@ -47,7 +47,7 @@ export const mockUpdateLightsSuccess = {
 }
 
 export const mockUpdateLightsFailureMeta = {
-  method: 'POST',
+  method: 'POST' as Method,
   path: '/robot/lights',
   ok: false,
   status: 500,
diff --git a/app/src/redux/robot-controls/__fixtures__/move.ts b/app/src/redux/robot-controls/__fixtures__/move.ts
index 8baadb74335..80254337607 100644
--- a/app/src/redux/robot-controls/__fixtures__/move.ts
+++ b/app/src/redux/robot-controls/__fixtures__/move.ts
@@ -1,11 +1,10 @@
-// @flow
-
 import { mockRobot } from '../../robot-api/__fixtures__'
+import type { Method } from '../../robot-api/types'
 
 // POST /robot/move
 
 export const mockMoveSuccessMeta = {
-  method: 'POST',
+  method: 'POST' as Method,
   path: '/robot/move',
   ok: true,
   status: 200,
@@ -18,7 +17,7 @@ export const mockMoveSuccess = {
 }
 
 export const mockMoveFailureMeta = {
-  method: 'POST',
+  method: 'POST' as Method,
   path: '/robot/move',
   ok: false,
   status: 500,
@@ -45,7 +44,7 @@ export const mockPositions = {
 }
 
 export const mockFetchPositionsSuccessMeta = {
-  method: 'GET',
+  method: 'GET' as Method,
   path: '/robot/positions',
   ok: true,
   status: 200,
@@ -60,7 +59,7 @@ export const mockFetchPositionsSuccess = {
 }
 
 export const mockFetchPositionsFailureMeta = {
-  method: 'GET',
+  method: 'GET' as Method,
   path: '/robot/positions',
   ok: false,
   status: 500,
@@ -75,7 +74,7 @@ export const mockFetchPositionsFailure = {
 // POST /motors/disengage
 
 export const mockDisengageMotorsSuccessMeta = {
-  method: 'POST',
+  method: 'POST' as Method,
   path: '/motors/disengage',
   ok: true,
   status: 200,
@@ -88,7 +87,7 @@ export const mockDisengageMotorsSuccess = {
 }
 
 export const mockDisengageMotorsFailureMeta = {
-  method: 'POST',
+  method: 'POST' as Method,
   path: '/motors/disengage',
   ok: false,
   status: 500,
diff --git a/app/src/redux/robot-controls/__tests__/actions.test.ts b/app/src/redux/robot-controls/__tests__/actions.test.ts
index 81fba9c4bfa..efda566b8fe 100644
--- a/app/src/redux/robot-controls/__tests__/actions.test.ts
+++ b/app/src/redux/robot-controls/__tests__/actions.test.ts
@@ -1,17 +1,15 @@
-// @flow
-
 import * as Actions from '../actions'
 
 import type { RobotControlsAction } from '../types'
 
-type ActionSpec = {|
-  name: string,
-  creator: (...Array<any>) => mixed,
-  args: Array<mixed>,
-  expected: RobotControlsAction,
-|}
+interface ActionSpec {
+  name: string
+  creator: (...args: any[]) => unknown
+  args: unknown[]
+  expected: RobotControlsAction
+}
 
-const SPECS: Array<ActionSpec> = [
+const SPECS: ActionSpec[] = [
   {
     name: 'robotControls:FETCH_LIGHTS',
     creator: Actions.fetchLights,
@@ -19,7 +17,7 @@ const SPECS: Array<ActionSpec> = [
     expected: {
       type: 'robotControls:FETCH_LIGHTS',
       payload: { robotName: 'robot-name' },
-      meta: {},
+      meta: {} as any,
     },
   },
   {
@@ -32,7 +30,7 @@ const SPECS: Array<ActionSpec> = [
         robotName: 'robot-name',
         lightsOn: true,
       },
-      meta: { requestId: 'abc' },
+      meta: { requestId: 'abc' } as any,
     },
   },
   {
@@ -45,7 +43,7 @@ const SPECS: Array<ActionSpec> = [
         robotName: 'robot-name',
         error: { message: 'AH' },
       },
-      meta: { requestId: 'abc' },
+      meta: { requestId: 'abc' } as any,
     },
   },
   {
@@ -55,7 +53,7 @@ const SPECS: Array<ActionSpec> = [
     expected: {
       type: 'robotControls:UPDATE_LIGHTS',
       payload: { robotName: 'robot-name', lightsOn: true },
-      meta: {},
+      meta: {} as any,
     },
   },
   {
@@ -68,7 +66,7 @@ const SPECS: Array<ActionSpec> = [
         robotName: 'robot-name',
         lightsOn: true,
       },
-      meta: { requestId: 'abc' },
+      meta: { requestId: 'abc' } as any,
     },
   },
   {
@@ -81,7 +79,7 @@ const SPECS: Array<ActionSpec> = [
         robotName: 'robot-name',
         error: { message: 'AH' },
       },
-      meta: { requestId: 'abc' },
+      meta: { requestId: 'abc' } as any,
     },
   },
   {
@@ -91,7 +89,7 @@ const SPECS: Array<ActionSpec> = [
     expected: {
       type: 'robotControls:HOME',
       payload: { robotName: 'robot-name', target: 'robot' },
-      meta: {},
+      meta: {} as any,
     },
   },
   {
@@ -101,7 +99,7 @@ const SPECS: Array<ActionSpec> = [
     expected: {
       type: 'robotControls:HOME',
       payload: { robotName: 'robot-name', target: 'pipette', mount: 'left' },
-      meta: {},
+      meta: {} as any,
     },
   },
   {
@@ -111,7 +109,7 @@ const SPECS: Array<ActionSpec> = [
     expected: {
       type: 'robotControls:HOME_SUCCESS',
       payload: { robotName: 'robot-name' },
-      meta: { requestId: 'abc' },
+      meta: { requestId: 'abc' } as any,
     },
   },
   {
@@ -121,7 +119,7 @@ const SPECS: Array<ActionSpec> = [
     expected: {
       type: 'robotControls:HOME_FAILURE',
       payload: { robotName: 'robot-name', error: { message: 'AH' } },
-      meta: { requestId: 'abc' },
+      meta: { requestId: 'abc' } as any,
     },
   },
   {
@@ -136,7 +134,7 @@ const SPECS: Array<ActionSpec> = [
         mount: 'left',
         disengageMotors: true,
       },
-      meta: {},
+      meta: {} as any,
     },
   },
   {
@@ -146,7 +144,7 @@ const SPECS: Array<ActionSpec> = [
     expected: {
       type: 'robotControls:MOVE_SUCCESS',
       payload: { robotName: 'robot-name' },
-      meta: { requestId: 'abc' },
+      meta: { requestId: 'abc' } as any,
     },
   },
   {
@@ -156,7 +154,7 @@ const SPECS: Array<ActionSpec> = [
     expected: {
       type: 'robotControls:MOVE_FAILURE',
       payload: { robotName: 'robot-name', error: { message: 'AH' } },
-      meta: { requestId: 'abc' },
+      meta: { requestId: 'abc' } as any,
     },
   },
   {
diff --git a/app/src/redux/robot-controls/__tests__/reducer.test.ts b/app/src/redux/robot-controls/__tests__/reducer.test.ts
index cd5b8a8570d..01c81994cb6 100644
--- a/app/src/redux/robot-controls/__tests__/reducer.test.ts
+++ b/app/src/redux/robot-controls/__tests__/reducer.test.ts
@@ -1,17 +1,16 @@
-// @flow
 import { robotControlsReducer } from '../reducer'
 
 import type { Action } from '../../types'
 import type { PerRobotControlsState } from '../types'
 
-type ReducerSpec = {|
-  name: string,
-  state: $Shape<{ [robotName: string]: $Shape<PerRobotControlsState> }>,
-  action: Action,
-  expected: $Shape<{ [robotName: string]: $Shape<PerRobotControlsState> }>,
-|}
+interface ReducerSpec {
+  name: string
+  state: Partial<{ [robotName: string]: Partial<PerRobotControlsState> }>
+  action: Action
+  expected: Partial<{ [robotName: string]: Partial<PerRobotControlsState> }>
+}
 
-const SPECS: Array<ReducerSpec> = [
+const SPECS: ReducerSpec[] = [
   {
     name: 'handles robotControls:FETCH_LIGHTS_SUCCESS',
     action: {
@@ -20,7 +19,7 @@ const SPECS: Array<ReducerSpec> = [
         robotName: 'robotName',
         lightsOn: true,
       },
-      meta: {},
+      meta: {} as any,
     },
     state: { robotName: { lightsOn: false } },
     expected: { robotName: { lightsOn: true } },
@@ -33,7 +32,7 @@ const SPECS: Array<ReducerSpec> = [
         robotName: 'robotName',
         lightsOn: false,
       },
-      meta: {},
+      meta: {} as any,
     },
     state: { robotName: { lightsOn: true } },
     expected: { robotName: { lightsOn: false } },
@@ -43,7 +42,7 @@ const SPECS: Array<ReducerSpec> = [
     action: {
       type: 'robotControls:HOME',
       payload: { robotName: 'robotName', target: 'robot' },
-      meta: {},
+      meta: {} as any,
     },
     state: { robotName: { movementStatus: null } },
     expected: { robotName: { movementStatus: 'homing', movementError: null } },
@@ -53,7 +52,7 @@ const SPECS: Array<ReducerSpec> = [
     action: {
       type: 'robotControls:HOME_SUCCESS',
       payload: { robotName: 'robotName' },
-      meta: {},
+      meta: {} as any,
     },
     state: { robotName: { movementStatus: 'homing' } },
     expected: { robotName: { movementStatus: null, movementError: null } },
@@ -63,7 +62,7 @@ const SPECS: Array<ReducerSpec> = [
     action: {
       type: 'robotControls:HOME_FAILURE',
       payload: { robotName: 'robotName', error: { message: 'AH' } },
-      meta: {},
+      meta: {} as any,
     },
     state: { robotName: { movementStatus: 'homing' } },
     expected: {
@@ -80,7 +79,7 @@ const SPECS: Array<ReducerSpec> = [
         mount: 'left',
         disengageMotors: false,
       },
-      meta: {},
+      meta: {} as any,
     },
     state: { robotName: { movementStatus: null } },
     expected: { robotName: { movementStatus: 'moving', movementError: null } },
@@ -90,7 +89,7 @@ const SPECS: Array<ReducerSpec> = [
     action: {
       type: 'robotControls:MOVE_SUCCESS',
       payload: { robotName: 'robotName' },
-      meta: {},
+      meta: {} as any,
     },
     state: { robotName: { movementStatus: 'moving' } },
     expected: { robotName: { movementStatus: null, movementError: null } },
@@ -100,7 +99,7 @@ const SPECS: Array<ReducerSpec> = [
     action: {
       type: 'robotControls:MOVE_FAILURE',
       payload: { robotName: 'robotName', error: { message: 'AH' } },
-      meta: {},
+      meta: {} as any,
     },
     state: { robotName: { movementStatus: 'moving' } },
     expected: {
@@ -124,7 +123,7 @@ describe('robotControlsReducer', () => {
   SPECS.forEach(spec => {
     const { name, state, action, expected } = spec
     it(name, () =>
-      expect(robotControlsReducer(state, action)).toEqual(expected)
+      expect(robotControlsReducer(state as any, action)).toEqual(expected)
     )
   })
 })
diff --git a/app/src/redux/robot-controls/__tests__/selectors.test.ts b/app/src/redux/robot-controls/__tests__/selectors.test.ts
index 8d9c4556ab8..8b83bb84925 100644
--- a/app/src/redux/robot-controls/__tests__/selectors.test.ts
+++ b/app/src/redux/robot-controls/__tests__/selectors.test.ts
@@ -1,21 +1,19 @@
-// @flow
-
 import * as Selectors from '../selectors'
 import type { State } from '../../types'
 
-type SelectorSpec = {|
-  name: string,
-  selector: (State, ...Array<any>) => mixed,
-  state: $Shape<State>,
-  args?: Array<any>,
-  expected: mixed,
-|}
+interface SelectorSpec {
+  name: string
+  selector: (state: State, ...args: any[]) => unknown
+  state: State
+  args?: any[]
+  expected: unknown
+}
 
-const SPECS: Array<SelectorSpec> = [
+const SPECS: SelectorSpec[] = [
   {
     name: 'getLightsOn returns null by default',
     selector: Selectors.getLightsOn,
-    state: { robotControls: {} },
+    state: { robotControls: {} } as any,
     args: ['robotName'],
     expected: null,
   },
@@ -30,7 +28,7 @@ const SPECS: Array<SelectorSpec> = [
           movementError: null,
         },
       },
-    },
+    } as any,
     args: ['robotName'],
     expected: false,
   },
@@ -39,7 +37,7 @@ const SPECS: Array<SelectorSpec> = [
     selector: Selectors.getMovementStatus,
     state: {
       robotControls: {},
-    },
+    } as any,
     args: ['robotName'],
     expected: null,
   },
@@ -54,7 +52,7 @@ const SPECS: Array<SelectorSpec> = [
           movementError: null,
         },
       },
-    },
+    } as any,
     args: ['robotName'],
     expected: 'homing',
   },
@@ -63,7 +61,7 @@ const SPECS: Array<SelectorSpec> = [
     selector: Selectors.getMovementError,
     state: {
       robotControls: {},
-    },
+    } as any,
     args: ['robotName'],
     expected: null,
   },
@@ -78,7 +76,7 @@ const SPECS: Array<SelectorSpec> = [
           movementError: 'AH',
         },
       },
-    },
+    } as any,
     args: ['robotName'],
     expected: 'AH',
   },
diff --git a/app/src/redux/robot-controls/actions.ts b/app/src/redux/robot-controls/actions.ts
index 95126071986..4bf95e449e2 100644
--- a/app/src/redux/robot-controls/actions.ts
+++ b/app/src/redux/robot-controls/actions.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import * as Constants from './constants'
 import * as Types from './types'
 
@@ -24,7 +22,7 @@ export const fetchLightsSuccess = (
 
 export const fetchLightsFailure = (
   robotName: string,
-  error: {| message: string |},
+  error: { message: string },
   meta: RobotApiRequestMeta
 ): Types.FetchLightsFailureAction => ({
   type: Constants.FETCH_LIGHTS_FAILURE,
@@ -38,7 +36,8 @@ export const updateLights = (
 ): Types.UpdateLightsAction => ({
   type: Constants.UPDATE_LIGHTS,
   payload: { robotName, lightsOn },
-  meta: {},
+  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+  meta: {} as RobotApiRequestMeta,
 })
 
 export const updateLightsSuccess = (
@@ -53,7 +52,7 @@ export const updateLightsSuccess = (
 
 export const updateLightsFailure = (
   robotName: string,
-  error: {| message: string |},
+  error: { message: string },
   meta: RobotApiRequestMeta
 ): Types.UpdateLightsFailureAction => ({
   type: Constants.UPDATE_LIGHTS_FAILURE,
@@ -67,7 +66,11 @@ type HomeActionCreator = ((
 ) => Types.HomeAction) &
   ((robotName: string, target: 'pipette', mount: Mount) => Types.HomeAction)
 
-export const home: HomeActionCreator = (robotName, target, mount) => ({
+export const home: HomeActionCreator = (
+  robotName: string,
+  target: 'robot' | 'pipette',
+  mount?: Mount
+): Types.HomeAction => ({
   type: Constants.HOME,
   payload:
     target === Constants.PIPETTE && typeof mount === 'string'
@@ -87,7 +90,7 @@ export const homeSuccess = (
 
 export const homeFailure = (
   robotName: string,
-  error: {| message: string |},
+  error: { message: string },
   meta: RobotApiRequestMeta
 ): Types.HomeFailureAction => ({
   type: Constants.HOME_FAILURE,
@@ -117,7 +120,7 @@ export const moveSuccess = (
 
 export const moveFailure = (
   robotName: string,
-  error: {| message: string |},
+  error: { message: string },
   meta: RobotApiRequestMeta
 ): Types.MoveFailureAction => ({
   type: Constants.MOVE_FAILURE,
diff --git a/app/src/redux/robot-controls/constants.ts b/app/src/redux/robot-controls/constants.ts
index b62b76f8968..101a92adef8 100644
--- a/app/src/redux/robot-controls/constants.ts
+++ b/app/src/redux/robot-controls/constants.ts
@@ -1,5 +1,3 @@
-// @flow
-
 // homing and move request targets
 
 export const ROBOT: 'robot' = 'robot'
diff --git a/app/src/redux/robot-controls/epic/__tests__/fetchLightsEpic.test.ts b/app/src/redux/robot-controls/epic/__tests__/fetchLightsEpic.test.ts
index 00890247c59..d008c311c09 100644
--- a/app/src/redux/robot-controls/epic/__tests__/fetchLightsEpic.test.ts
+++ b/app/src/redux/robot-controls/epic/__tests__/fetchLightsEpic.test.ts
@@ -1,4 +1,3 @@
-// @flow
 import { TestScheduler } from 'rxjs/testing'
 
 import { mockRobot } from '../../../robot-api/__fixtures__'
@@ -9,31 +8,26 @@ import * as Actions from '../../actions'
 import * as Types from '../../types'
 import { robotControlsEpic } from '..'
 
-import type { Observable } from 'rxjs'
-import type {
-  RobotHost,
-  RobotApiRequestOptions,
-  RobotApiResponse,
-} from '../../../robot-api/types'
+import type { Action, State } from '../../../types'
 
 jest.mock('../../../robot-api/http')
 jest.mock('../../../discovery/selectors')
 
-const mockState = { state: true }
+const mockState: State = { state: true } as any
 
-const mockFetchRobotApi: JestMockFn<
-  [RobotHost, RobotApiRequestOptions],
-  Observable<RobotApiResponse>
-> = RobotApiHttp.fetchRobotApi
+const mockFetchRobotApi = RobotApiHttp.fetchRobotApi as jest.MockedFunction<
+  typeof RobotApiHttp.fetchRobotApi
+>
 
-const mockGetRobotByName: JestMockFn<[any, string], mixed> =
-  DiscoverySelectors.getRobotByName
+const mockGetRobotByName = DiscoverySelectors.getRobotByName as jest.MockedFunction<
+  typeof DiscoverySelectors.getRobotByName
+>
 
 describe('fetchLightsEpic', () => {
-  let testScheduler
+  let testScheduler: TestScheduler
 
   beforeEach(() => {
-    mockGetRobotByName.mockReturnValue(mockRobot)
+    mockGetRobotByName.mockReturnValue(mockRobot as any)
 
     testScheduler = new TestScheduler((actual, expected) => {
       expect(actual).toEqual(expected)
@@ -56,8 +50,8 @@ describe('fetchLightsEpic', () => {
         cold('r', { r: Fixtures.mockFetchLightsSuccess })
       )
 
-      const action$ = hot('--a', { a: action })
-      const state$ = hot('a-a', { a: mockState })
+      const action$ = hot<Action>('--a', { a: action })
+      const state$ = hot<State>('a-a', { a: mockState })
       const output$ = robotControlsEpic(action$, state$)
 
       expectObservable(output$)
@@ -77,8 +71,8 @@ describe('fetchLightsEpic', () => {
         cold('r', { r: Fixtures.mockFetchLightsSuccess })
       )
 
-      const action$ = hot('--a', { a: action })
-      const state$ = hot('a-a', { a: {} })
+      const action$ = hot<Action>('--a', { a: action })
+      const state$ = hot<State>('a-a', { a: {} } as any)
       const output$ = robotControlsEpic(action$, state$)
 
       expectObservable(output$).toBe('--a', {
@@ -97,8 +91,8 @@ describe('fetchLightsEpic', () => {
         cold('r', { r: Fixtures.mockFetchLightsFailure })
       )
 
-      const action$ = hot('--a', { a: action })
-      const state$ = hot('a-a', { a: {} })
+      const action$ = hot<Action>('--a', { a: action })
+      const state$ = hot<State>('a-a', { a: {} } as any)
       const output$ = robotControlsEpic(action$, state$)
 
       expectObservable(output$).toBe('--a', {
diff --git a/app/src/redux/robot-controls/epic/__tests__/homeEpic.test.ts b/app/src/redux/robot-controls/epic/__tests__/homeEpic.test.ts
index 1196651abe6..d5cd2a40730 100644
--- a/app/src/redux/robot-controls/epic/__tests__/homeEpic.test.ts
+++ b/app/src/redux/robot-controls/epic/__tests__/homeEpic.test.ts
@@ -1,4 +1,3 @@
-// @flow
 import { TestScheduler } from 'rxjs/testing'
 
 import { mockRobot } from '../../../robot-api/__fixtures__'
@@ -9,31 +8,26 @@ import * as Actions from '../../actions'
 import * as Types from '../../types'
 import { robotControlsEpic } from '..'
 
-import type { Observable } from 'rxjs'
-import type {
-  RobotHost,
-  RobotApiRequestOptions,
-  RobotApiResponse,
-} from '../../../robot-api/types'
+import type { Action, State } from '../../../types'
 
 jest.mock('../../../robot-api/http')
 jest.mock('../../../discovery/selectors')
 
-const mockState = { state: true }
+const mockState: State = { state: true } as any
 
-const mockFetchRobotApi: JestMockFn<
-  [RobotHost, RobotApiRequestOptions],
-  Observable<RobotApiResponse>
-> = RobotApiHttp.fetchRobotApi
+const mockFetchRobotApi = RobotApiHttp.fetchRobotApi as jest.MockedFunction<
+  typeof RobotApiHttp.fetchRobotApi
+>
 
-const mockGetRobotByName: JestMockFn<[any, string], mixed> =
-  DiscoverySelectors.getRobotByName
+const mockGetRobotByName = DiscoverySelectors.getRobotByName as jest.MockedFunction<
+  typeof DiscoverySelectors.getRobotByName
+>
 
 describe('homeEpic', () => {
-  let testScheduler
+  let testScheduler: TestScheduler
 
   beforeEach(() => {
-    mockGetRobotByName.mockReturnValue(mockRobot)
+    mockGetRobotByName.mockReturnValue(mockRobot as any)
 
     testScheduler = new TestScheduler((actual, expected) => {
       expect(actual).toEqual(expected)
@@ -56,8 +50,8 @@ describe('homeEpic', () => {
         cold('r', { r: Fixtures.mockHomeSuccess })
       )
 
-      const action$ = hot('--a', { a: action })
-      const state$ = hot('a-a', { a: mockState })
+      const action$ = hot<Action>('--a', { a: action })
+      const state$ = hot<State>('a-a', { a: mockState })
       const output$ = robotControlsEpic(action$, state$)
 
       expectObservable(output$)
@@ -82,8 +76,8 @@ describe('homeEpic', () => {
         cold('r', { r: Fixtures.mockHomeSuccess })
       )
 
-      const action$ = hot('--a', { a: action })
-      const state$ = hot('a-a', { a: mockState })
+      const action$ = hot<Action>('--a', { a: action })
+      const state$ = hot<State>('a-a', { a: mockState })
       const output$ = robotControlsEpic(action$, state$)
 
       expectObservable(output$)
@@ -104,8 +98,8 @@ describe('homeEpic', () => {
         cold('r', { r: Fixtures.mockHomeSuccess })
       )
 
-      const action$ = hot('--a', { a: action })
-      const state$ = hot('a-a', { a: {} })
+      const action$ = hot<Action>('--a', { a: action })
+      const state$ = hot<State>('a-a', { a: {} } as any)
       const output$ = robotControlsEpic(action$, state$)
 
       expectObservable(output$).toBe('--a', {
@@ -123,8 +117,8 @@ describe('homeEpic', () => {
         cold('r', { r: Fixtures.mockHomeFailure })
       )
 
-      const action$ = hot('--a', { a: action })
-      const state$ = hot('a-a', { a: {} })
+      const action$ = hot<Action>('--a', { a: action })
+      const state$ = hot<State>('a-a', { a: {} } as any)
       const output$ = robotControlsEpic(action$, state$)
 
       expectObservable(output$).toBe('--a', {
diff --git a/app/src/redux/robot-controls/epic/__tests__/moveEpic.test.ts b/app/src/redux/robot-controls/epic/__tests__/moveEpic.test.ts
index 3b5356ac1ea..bd826f9237d 100644
--- a/app/src/redux/robot-controls/epic/__tests__/moveEpic.test.ts
+++ b/app/src/redux/robot-controls/epic/__tests__/moveEpic.test.ts
@@ -1,4 +1,3 @@
-// @flow
 import { TestScheduler } from 'rxjs/testing'
 
 import { mockRobot } from '../../../robot-api/__fixtures__'
@@ -10,35 +9,31 @@ import * as Actions from '../../actions'
 import * as Types from '../../types'
 import { robotControlsEpic } from '..'
 
-import type { Observable } from 'rxjs'
-import type {
-  RobotHost,
-  RobotApiRequestOptions,
-  RobotApiResponse,
-} from '../../../robot-api/types'
+import type { Action, State } from '../../../types'
 
 jest.mock('../../../robot-api/http')
 jest.mock('../../../discovery/selectors')
 jest.mock('../../../pipettes/selectors')
 
-const mockState = { state: true }
+const mockState: State = { state: true } as any
 
-const mockFetchRobotApi: JestMockFn<
-  [RobotHost, RobotApiRequestOptions],
-  Observable<RobotApiResponse>
-> = RobotApiHttp.fetchRobotApi
+const mockFetchRobotApi = RobotApiHttp.fetchRobotApi as jest.MockedFunction<
+  typeof RobotApiHttp.fetchRobotApi
+>
 
-const mockGetRobotByName: JestMockFn<[any, string], mixed> =
-  DiscoverySelectors.getRobotByName
+const mockGetRobotByName = DiscoverySelectors.getRobotByName as jest.MockedFunction<
+  typeof DiscoverySelectors.getRobotByName
+>
 
-const mockGetAttachedPipettes: JestMockFn<[any, string], mixed> =
-  PipettesSelectors.getAttachedPipettes
+const mockGetAttachedPipettes = PipettesSelectors.getAttachedPipettes as jest.MockedFunction<
+  typeof PipettesSelectors.getAttachedPipettes
+>
 
 describe('moveEpic', () => {
-  let testScheduler
+  let testScheduler: TestScheduler
 
   beforeEach(() => {
-    mockGetRobotByName.mockReturnValue(mockRobot)
+    mockGetRobotByName.mockReturnValue(mockRobot as any)
 
     testScheduler = new TestScheduler((actual, expected) => {
       expect(actual).toEqual(expected)
@@ -64,8 +59,8 @@ describe('moveEpic', () => {
         )
         .mockReturnValueOnce(cold('m', { m: Fixtures.mockMoveSuccess }))
 
-      const action$ = hot('--a', { a: action })
-      const state$ = hot('a-a', { a: mockState })
+      const action$ = hot<Action>('--a', { a: action })
+      const state$ = hot<State>('a-a', { a: mockState })
       const output$ = robotControlsEpic(action$, state$)
 
       expectObservable(output$)
@@ -103,11 +98,11 @@ describe('moveEpic', () => {
 
       mockGetAttachedPipettes.mockReturnValue({
         left: null,
-        right: { model: 'p300_single_v2.0' },
+        right: { model: 'p300_single_v2.0' } as any,
       })
 
-      const action$ = hot('--a', { a: action })
-      const state$ = hot('a-a', { a: mockState })
+      const action$ = hot<Action>('--a', { a: action })
+      const state$ = hot<State>('a-a', { a: mockState })
       const output$ = robotControlsEpic(action$, state$)
 
       expectObservable(output$)
@@ -147,8 +142,8 @@ describe('moveEpic', () => {
           cold('d', { d: Fixtures.mockDisengageMotorsSuccess })
         )
 
-      const action$ = hot('--a', { a: action })
-      const state$ = hot('a-a', { a: mockState })
+      const action$ = hot<Action>('--a', { a: action })
+      const state$ = hot<State>('a-a', { a: mockState })
       const output$ = robotControlsEpic(action$, state$)
 
       expectObservable(output$)
@@ -179,8 +174,8 @@ describe('moveEpic', () => {
           cold('d', { d: Fixtures.mockDisengageMotorsSuccess })
         )
 
-      const action$ = hot('--a', { a: action })
-      const state$ = hot('a-a', { a: {} })
+      const action$ = hot<Action>('--a', { a: action })
+      const state$ = hot<State>('a-a', { a: {} } as any)
       const output$ = robotControlsEpic(action$, state$)
 
       expectObservable(output$).toBe('--a', {
@@ -208,8 +203,8 @@ describe('moveEpic', () => {
           cold('d', { d: Fixtures.mockDisengageMotorsSuccess })
         )
 
-      const action$ = hot('--a', { a: action })
-      const state$ = hot('a-a', { a: {} })
+      const action$ = hot<Action>('--a', { a: action })
+      const state$ = hot<State>('a-a', { a: {} } as any)
       const output$ = robotControlsEpic(action$, state$)
 
       expectObservable(output$).toBe('--a', {
@@ -232,8 +227,8 @@ describe('moveEpic', () => {
         cold('r', { r: Fixtures.mockFetchPositionsFailure })
       )
 
-      const action$ = hot('--a', { a: action })
-      const state$ = hot('a-a', { a: {} })
+      const action$ = hot<Action>('--a', { a: action })
+      const state$ = hot<State>('a-a', { a: {} } as any)
       const output$ = robotControlsEpic(action$, state$)
 
       expectObservable(output$).toBe('--a', {
@@ -259,8 +254,8 @@ describe('moveEpic', () => {
         )
         .mockReturnValueOnce(cold('m', { m: Fixtures.mockMoveFailure }))
 
-      const action$ = hot('--a', { a: action })
-      const state$ = hot('a-a', { a: {} })
+      const action$ = hot<Action>('--a', { a: action })
+      const state$ = hot<State>('a-a', { a: {} } as any)
       const output$ = robotControlsEpic(action$, state$)
 
       expectObservable(output$).toBe('--a', {
@@ -289,8 +284,8 @@ describe('moveEpic', () => {
           cold('d', { d: Fixtures.mockDisengageMotorsFailure })
         )
 
-      const action$ = hot('--a', { a: action })
-      const state$ = hot('a-a', { a: {} })
+      const action$ = hot<Action>('--a', { a: action })
+      const state$ = hot<State>('a-a', { a: {} } as any)
       const output$ = robotControlsEpic(action$, state$)
 
       expectObservable(output$).toBe('--a', {
diff --git a/app/src/redux/robot-controls/epic/__tests__/updateLightsEpic.test.ts b/app/src/redux/robot-controls/epic/__tests__/updateLightsEpic.test.ts
index 35cce2354d5..4dc1f357fd3 100644
--- a/app/src/redux/robot-controls/epic/__tests__/updateLightsEpic.test.ts
+++ b/app/src/redux/robot-controls/epic/__tests__/updateLightsEpic.test.ts
@@ -1,4 +1,3 @@
-// @flow
 import { TestScheduler } from 'rxjs/testing'
 
 import { mockRobot } from '../../../robot-api/__fixtures__'
@@ -9,31 +8,27 @@ import * as Actions from '../../actions'
 import * as Types from '../../types'
 import { robotControlsEpic } from '..'
 
-import type { Observable } from 'rxjs'
-import type {
-  RobotHost,
-  RobotApiRequestOptions,
-  RobotApiResponse,
-} from '../../../robot-api/types'
+import type { Action, State } from '../../../types'
+import type { RobotApiRequestMeta } from '../../../robot-api/types'
 
 jest.mock('../../../robot-api/http')
 jest.mock('../../../discovery/selectors')
 
-const mockState = { state: true }
+const mockState: State = { state: true } as any
 
-const mockFetchRobotApi: JestMockFn<
-  [RobotHost, RobotApiRequestOptions],
-  Observable<RobotApiResponse>
-> = RobotApiHttp.fetchRobotApi
+const mockFetchRobotApi = RobotApiHttp.fetchRobotApi as jest.MockedFunction<
+  typeof RobotApiHttp.fetchRobotApi
+>
 
-const mockGetRobotByName: JestMockFn<[any, string], mixed> =
-  DiscoverySelectors.getRobotByName
+const mockGetRobotByName = DiscoverySelectors.getRobotByName as jest.MockedFunction<
+  typeof DiscoverySelectors.getRobotByName
+>
 
 describe('updateLightsEpic', () => {
-  let testScheduler
+  let testScheduler: TestScheduler
 
   beforeEach(() => {
-    mockGetRobotByName.mockReturnValue(mockRobot)
+    mockGetRobotByName.mockReturnValue(mockRobot as any)
 
     testScheduler = new TestScheduler((actual, expected) => {
       expect(actual).toEqual(expected)
@@ -44,7 +39,7 @@ describe('updateLightsEpic', () => {
     jest.resetAllMocks()
   })
 
-  const meta = { requestId: '1234' }
+  const meta = { requestId: '1234' } as RobotApiRequestMeta
   const action: Types.UpdateLightsAction = {
     ...Actions.updateLights(mockRobot.name, true),
     meta,
@@ -56,8 +51,8 @@ describe('updateLightsEpic', () => {
         cold('r', { r: Fixtures.mockUpdateLightsSuccess })
       )
 
-      const action$ = hot('--a', { a: action })
-      const state$ = hot('a-a', { a: mockState })
+      const action$ = hot<Action>('--a', { a: action })
+      const state$ = hot<State>('a-a', { a: mockState })
       const output$ = robotControlsEpic(action$, state$)
 
       expectObservable(output$)
@@ -78,8 +73,8 @@ describe('updateLightsEpic', () => {
         cold('r', { r: Fixtures.mockUpdateLightsSuccess })
       )
 
-      const action$ = hot('--a', { a: action })
-      const state$ = hot('a-a', { a: {} })
+      const action$ = hot<Action>('--a', { a: action })
+      const state$ = hot<State>('a-a', { a: {} } as any)
       const output$ = robotControlsEpic(action$, state$)
 
       expectObservable(output$).toBe('--a', {
@@ -98,8 +93,8 @@ describe('updateLightsEpic', () => {
         cold('r', { r: Fixtures.mockUpdateLightsFailure })
       )
 
-      const action$ = hot('--a', { a: action })
-      const state$ = hot('a-a', { a: {} })
+      const action$ = hot<Action>('--a', { a: action })
+      const state$ = hot<State>('a-a', { a: {} } as any)
       const output$ = robotControlsEpic(action$, state$)
 
       expectObservable(output$).toBe('--a', {
diff --git a/app/src/redux/robot-controls/epic/fetchLightsEpic.ts b/app/src/redux/robot-controls/epic/fetchLightsEpic.ts
index 0d3666750f6..a3bc0816fba 100644
--- a/app/src/redux/robot-controls/epic/fetchLightsEpic.ts
+++ b/app/src/redux/robot-controls/epic/fetchLightsEpic.ts
@@ -1,4 +1,3 @@
-// @flow
 import { ofType } from 'redux-observable'
 
 import { GET } from '../../robot-api/constants'
@@ -7,7 +6,7 @@ import { mapToRobotApiRequest } from '../../robot-api/operators'
 import * as Actions from '../actions'
 import * as Constants from '../constants'
 
-import type { Epic } from '../../types'
+import type { Action, Epic } from '../../types'
 
 import type {
   ActionToRequestMapper,
@@ -35,7 +34,7 @@ const mapResponseToAction: ResponseToActionMapper<FetchLightsAction> = (
 
 export const fetchLightsEpic: Epic = (action$, state$) => {
   return action$.pipe(
-    ofType(Constants.FETCH_LIGHTS),
+    ofType<Action, FetchLightsAction>(Constants.FETCH_LIGHTS),
     mapToRobotApiRequest(
       state$,
       a => a.payload.robotName,
diff --git a/app/src/redux/robot-controls/epic/homeEpic.ts b/app/src/redux/robot-controls/epic/homeEpic.ts
index 4c838e73555..dedb783fd21 100644
--- a/app/src/redux/robot-controls/epic/homeEpic.ts
+++ b/app/src/redux/robot-controls/epic/homeEpic.ts
@@ -1,4 +1,3 @@
-// @flow
 import { ofType } from 'redux-observable'
 
 import { POST } from '../../robot-api/constants'
@@ -7,7 +6,7 @@ import { mapToRobotApiRequest } from '../../robot-api/operators'
 import * as Actions from '../actions'
 import * as Constants from '../constants'
 
-import type { Epic } from '../../types'
+import type { Action, Epic } from '../../types'
 
 import type {
   ActionToRequestMapper,
@@ -39,7 +38,7 @@ const mapResponseToAction: ResponseToActionMapper<HomeAction> = (
 
 export const homeEpic: Epic = (action$, state$) => {
   return action$.pipe(
-    ofType(Constants.HOME),
+    ofType<Action, HomeAction>(Constants.HOME),
     mapToRobotApiRequest(
       state$,
       a => a.payload.robotName,
diff --git a/app/src/redux/robot-controls/epic/index.ts b/app/src/redux/robot-controls/epic/index.ts
index 0822ec11ca5..5052ddd2b24 100644
--- a/app/src/redux/robot-controls/epic/index.ts
+++ b/app/src/redux/robot-controls/epic/index.ts
@@ -1,4 +1,3 @@
-// @flow
 import { combineEpics } from 'redux-observable'
 
 import { fetchLightsEpic } from './fetchLightsEpic'
@@ -8,7 +7,7 @@ import { moveEpic } from './moveEpic'
 
 import type { Epic } from '../../types'
 
-export const robotControlsEpic: Epic = combineEpics(
+export const robotControlsEpic: Epic = combineEpics<Epic>(
   fetchLightsEpic,
   updateLightsEpic,
   homeEpic,
diff --git a/app/src/redux/robot-controls/epic/moveEpic.ts b/app/src/redux/robot-controls/epic/moveEpic.ts
index 71f71f81ea6..ee05b165a0b 100644
--- a/app/src/redux/robot-controls/epic/moveEpic.ts
+++ b/app/src/redux/robot-controls/epic/moveEpic.ts
@@ -1,4 +1,3 @@
-// @flow
 import { ofType } from 'redux-observable'
 import { of } from 'rxjs'
 import { map, switchMap } from 'rxjs/operators'
@@ -10,10 +9,12 @@ import { getAttachedPipettes } from '../../pipettes'
 import * as Actions from '../actions'
 import * as Constants from '../constants'
 
+import type { Observable } from 'rxjs'
 import type { State, Action, Epic } from '../../types'
 import type {
   RobotApiRequestOptions,
   RobotApiResponse,
+  RobotHost,
 } from '../../robot-api/types'
 
 import type { MoveAction, PositionsResponse } from '../types'
@@ -69,41 +70,43 @@ const disengageMotorsRequest = {
 // 3. Call POST /motors/disengage if we need to
 export const moveEpic: Epic = (action$, state$) => {
   return action$.pipe(
-    ofType(Constants.MOVE),
+    ofType<Action, MoveAction>(Constants.MOVE),
     withRobotHost(state$, a => a.payload.robotName),
-    switchMap(([action, state, host]) => {
-      // hit GET /robot/positions to figure out what POST /robot/move body will be
-      return fetchRobotApi(host, fetchPositionsRequest).pipe(
-        switchMap(positionsResponse => {
-          // call move endpoint if we have positions, otherwise
-          // pass the failure response along
-          return positionsResponse.ok
-            ? fetchRobotApi(
-                host,
-                mapActionToRequest(action, state, positionsResponse.body)
-              )
-            : of(positionsResponse)
-        }),
-        // at this point we have either a successful movement call,
-        // a failed movement call, or a failed position call
-        switchMap(maybeMoveSuccess => {
-          // if the last call was successful and we need to disengage motors,
-          // go ahead and make that call; otherwise pass the response along
-          return maybeMoveSuccess.ok && action.payload.disengageMotors
-            ? fetchRobotApi(host, disengageMotorsRequest).pipe(
-                map(disengageResponse =>
-                  // if the disengage call succeeds, make sure we still pass
-                  // our movement success response into our final action for
-                  // consistency
-                  disengageResponse.ok ? maybeMoveSuccess : disengageResponse
+    switchMap<[MoveAction, State, RobotHost], Observable<Action>>(
+      ([action, state, host]) => {
+        // hit GET /robot/positions to figure out what POST /robot/move body will be
+        return fetchRobotApi(host, fetchPositionsRequest).pipe(
+          switchMap(positionsResponse => {
+            // call move endpoint if we have positions, otherwise
+            // pass the failure response along
+            return positionsResponse.ok
+              ? fetchRobotApi(
+                  host,
+                  mapActionToRequest(action, state, positionsResponse.body)
                 )
-              )
-            : of(maybeMoveSuccess)
-        }),
-        // response will be one of:
-        // movement success, movement fail, positions fail, disengage fail
-        map(response => mapResponseToAction(response, action))
-      )
-    })
+              : of(positionsResponse)
+          }),
+          // at this point we have either a successful movement call,
+          // a failed movement call, or a failed position call
+          switchMap(maybeMoveSuccess => {
+            // if the last call was successful and we need to disengage motors,
+            // go ahead and make that call; otherwise pass the response along
+            return maybeMoveSuccess.ok && action.payload.disengageMotors
+              ? fetchRobotApi(host, disengageMotorsRequest).pipe(
+                  map(disengageResponse =>
+                    // if the disengage call succeeds, make sure we still pass
+                    // our movement success response into our final action for
+                    // consistency
+                    disengageResponse.ok ? maybeMoveSuccess : disengageResponse
+                  )
+                )
+              : of(maybeMoveSuccess)
+          }),
+          // response will be one of:
+          // movement success, movement fail, positions fail, disengage fail
+          map(response => mapResponseToAction(response, action))
+        )
+      }
+    )
   )
 }
diff --git a/app/src/redux/robot-controls/epic/updateLightsEpic.ts b/app/src/redux/robot-controls/epic/updateLightsEpic.ts
index 94a7446d708..e47bdf8340a 100644
--- a/app/src/redux/robot-controls/epic/updateLightsEpic.ts
+++ b/app/src/redux/robot-controls/epic/updateLightsEpic.ts
@@ -1,4 +1,3 @@
-// @flow
 import { ofType } from 'redux-observable'
 
 import { POST } from '../../robot-api/constants'
@@ -7,7 +6,7 @@ import { mapToRobotApiRequest } from '../../robot-api/operators'
 import * as Actions from '../actions'
 import * as Constants from '../constants'
 
-import type { Epic } from '../../types'
+import type { Action, Epic } from '../../types'
 
 import type {
   ActionToRequestMapper,
@@ -15,6 +14,7 @@ import type {
 } from '../../robot-api/operators'
 
 import type { UpdateLightsAction } from '../types'
+import { RobotApiRequestMeta } from '../../robot-api/types'
 
 const mapActionToRequest: ActionToRequestMapper<UpdateLightsAction> = action => ({
   method: POST,
@@ -27,7 +27,10 @@ const mapResponseToAction: ResponseToActionMapper<UpdateLightsAction> = (
   originalAction
 ) => {
   const { host, body, ...responseMeta } = response
-  const meta = { ...originalAction.meta, response: responseMeta }
+  const meta: RobotApiRequestMeta = {
+    ...originalAction.meta,
+    response: responseMeta,
+  }
 
   return response.ok
     ? Actions.updateLightsSuccess(host.name, body.on, meta)
@@ -36,7 +39,7 @@ const mapResponseToAction: ResponseToActionMapper<UpdateLightsAction> = (
 
 export const updateLightsEpic: Epic = (action$, state$) => {
   return action$.pipe(
-    ofType(Constants.UPDATE_LIGHTS),
+    ofType<Action, UpdateLightsAction>(Constants.UPDATE_LIGHTS),
     mapToRobotApiRequest(
       state$,
       a => a.payload.robotName,
diff --git a/app/src/redux/robot-controls/index.ts b/app/src/redux/robot-controls/index.ts
index 375ed43fe48..497c8935180 100644
--- a/app/src/redux/robot-controls/index.ts
+++ b/app/src/redux/robot-controls/index.ts
@@ -1,5 +1,3 @@
-// @flow
-
 export * from './actions'
 export * from './constants'
 export * from './selectors'
diff --git a/app/src/redux/robot-controls/reducer.ts b/app/src/redux/robot-controls/reducer.ts
index 3ec450dc598..a15ef0afc99 100644
--- a/app/src/redux/robot-controls/reducer.ts
+++ b/app/src/redux/robot-controls/reducer.ts
@@ -1,7 +1,6 @@
-// @flow
-
 import * as Constants from './constants'
 
+import type { Reducer } from 'redux'
 import type { Action } from '../types'
 import type { RobotControlsState, PerRobotControlsState } from './types'
 
@@ -16,7 +15,7 @@ const INITIAL_CONTROLS_STATE: PerRobotControlsState = {
 const updateRobotState = (
   state: RobotControlsState,
   robotName: string,
-  update: $Shape<PerRobotControlsState>
+  update: Partial<PerRobotControlsState>
 ): RobotControlsState => {
   const robotState = state[robotName] || INITIAL_CONTROLS_STATE
 
@@ -26,10 +25,10 @@ const updateRobotState = (
   }
 }
 
-export function robotControlsReducer(
-  state: RobotControlsState = INITIAL_STATE,
-  action: Action
-): RobotControlsState {
+export const robotControlsReducer: Reducer<RobotControlsState, Action> = (
+  state = INITIAL_STATE,
+  action
+) => {
   switch (action.type) {
     case Constants.FETCH_LIGHTS_SUCCESS:
     case Constants.UPDATE_LIGHTS_SUCCESS: {
diff --git a/app/src/redux/robot-controls/selectors.ts b/app/src/redux/robot-controls/selectors.ts
index e72e4550ec9..3b2f1b09f73 100644
--- a/app/src/redux/robot-controls/selectors.ts
+++ b/app/src/redux/robot-controls/selectors.ts
@@ -1,4 +1,3 @@
-// @flow
 import type { State } from '../types'
 import type { MovementStatus } from './types'
 
diff --git a/app/src/redux/robot-controls/types.ts b/app/src/redux/robot-controls/types.ts
index 09bce5eb4fb..d17e8aa25b4 100644
--- a/app/src/redux/robot-controls/types.ts
+++ b/app/src/redux/robot-controls/types.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import type { RobotApiRequestMeta } from '../robot-api/types'
 import type { Mount } from '../pipettes/types'
 
@@ -11,112 +9,112 @@ export type MovePosition = 'changePipette' | 'attachTip'
 
 // http responses
 
-export type PositionsResponse = {|
-  positions: {|
-    change_pipette: {|
-      target: 'mount',
-      left: [number, number, number],
-      right: [number, number, number],
-    |},
-    attach_tip: {| target: 'pipette', point: [number, number, number] |},
-  |},
-|}
+export interface PositionsResponse {
+  positions: {
+    change_pipette: {
+      target: 'mount'
+      left: [number, number, number]
+      right: [number, number, number]
+    }
+    attach_tip: { target: 'pipette'; point: [number, number, number] }
+  }
+}
 
 // action types
 
 // fetch lights
 
-export type FetchLightsAction = {|
-  type: 'robotControls:FETCH_LIGHTS',
-  payload: {| robotName: string |},
-  meta: RobotApiRequestMeta,
-|}
+export interface FetchLightsAction {
+  type: 'robotControls:FETCH_LIGHTS'
+  payload: { robotName: string }
+  meta: RobotApiRequestMeta | {}
+}
 
-export type FetchLightsSuccessAction = {|
-  type: 'robotControls:FETCH_LIGHTS_SUCCESS',
-  payload: {| robotName: string, lightsOn: boolean |},
-  meta: RobotApiRequestMeta,
-|}
+export interface FetchLightsSuccessAction {
+  type: 'robotControls:FETCH_LIGHTS_SUCCESS'
+  payload: { robotName: string; lightsOn: boolean }
+  meta: RobotApiRequestMeta
+}
 
-export type FetchLightsFailureAction = {|
-  type: 'robotControls:FETCH_LIGHTS_FAILURE',
-  payload: {| robotName: string, error: {| message: string |} |},
-  meta: RobotApiRequestMeta,
-|}
+export interface FetchLightsFailureAction {
+  type: 'robotControls:FETCH_LIGHTS_FAILURE'
+  payload: { robotName: string; error: { message: string } }
+  meta: RobotApiRequestMeta
+}
 
 // update lights
 
-export type UpdateLightsAction = {|
-  type: 'robotControls:UPDATE_LIGHTS',
-  payload: {| robotName: string, lightsOn: boolean |},
-  meta: RobotApiRequestMeta,
-|}
+export interface UpdateLightsAction {
+  type: 'robotControls:UPDATE_LIGHTS'
+  payload: { robotName: string; lightsOn: boolean }
+  meta: RobotApiRequestMeta
+}
 
-export type UpdateLightsSuccessAction = {|
-  type: 'robotControls:UPDATE_LIGHTS_SUCCESS',
-  payload: {| robotName: string, lightsOn: boolean |},
-  meta: RobotApiRequestMeta,
-|}
+export interface UpdateLightsSuccessAction {
+  type: 'robotControls:UPDATE_LIGHTS_SUCCESS'
+  payload: { robotName: string; lightsOn: boolean }
+  meta: RobotApiRequestMeta
+}
 
-export type UpdateLightsFailureAction = {|
-  type: 'robotControls:UPDATE_LIGHTS_FAILURE',
-  payload: {| robotName: string, error: {| message: string |} |},
-  meta: RobotApiRequestMeta,
-|}
+export interface UpdateLightsFailureAction {
+  type: 'robotControls:UPDATE_LIGHTS_FAILURE'
+  payload: { robotName: string; error: { message: string } }
+  meta: RobotApiRequestMeta
+}
 
 // home
 
-export type HomeAction = {|
-  type: 'robotControls:HOME',
+export interface HomeAction {
+  type: 'robotControls:HOME'
   payload:
-    | {| robotName: string, target: 'robot' |}
-    | {| robotName: string, target: 'pipette', mount: Mount |},
-  meta: RobotApiRequestMeta,
-|}
-
-export type HomeSuccessAction = {|
-  type: 'robotControls:HOME_SUCCESS',
-  payload: {| robotName: string |},
-  meta: RobotApiRequestMeta,
-|}
-
-export type HomeFailureAction = {|
-  type: 'robotControls:HOME_FAILURE',
-  payload: {| robotName: string, error: {| message: string |} |},
-  meta: RobotApiRequestMeta,
-|}
+    | { robotName: string; target: 'robot' }
+    | { robotName: string; target: 'pipette'; mount: Mount }
+  meta: RobotApiRequestMeta | {}
+}
+
+export interface HomeSuccessAction {
+  type: 'robotControls:HOME_SUCCESS'
+  payload: { robotName: string }
+  meta: RobotApiRequestMeta
+}
+
+export interface HomeFailureAction {
+  type: 'robotControls:HOME_FAILURE'
+  payload: { robotName: string; error: { message: string } }
+  meta: RobotApiRequestMeta
+}
 
 // move
 
-export type MoveAction = {|
-  type: 'robotControls:MOVE',
-  payload: {|
-    robotName: string,
-    mount: Mount,
-    position: MovePosition,
-    disengageMotors: boolean,
-  |},
-  meta: RobotApiRequestMeta,
-|}
-
-export type MoveSuccessAction = {|
-  type: 'robotControls:MOVE_SUCCESS',
-  payload: {| robotName: string |},
-  meta: RobotApiRequestMeta,
-|}
-
-export type MoveFailureAction = {|
-  type: 'robotControls:MOVE_FAILURE',
-  payload: {| robotName: string, error: {| message: string |} |},
-  meta: RobotApiRequestMeta,
-|}
+export interface MoveAction {
+  type: 'robotControls:MOVE'
+  payload: {
+    robotName: string
+    mount: Mount
+    position: MovePosition
+    disengageMotors: boolean
+  }
+  meta: RobotApiRequestMeta | {}
+}
+
+export interface MoveSuccessAction {
+  type: 'robotControls:MOVE_SUCCESS'
+  payload: { robotName: string }
+  meta: RobotApiRequestMeta
+}
+
+export interface MoveFailureAction {
+  type: 'robotControls:MOVE_FAILURE'
+  payload: { robotName: string; error: { message: string } }
+  meta: RobotApiRequestMeta
+}
 
 // clear homing and movement status and error
 
-export type ClearMovementStatusAction = {|
-  type: 'robotControls:CLEAR_MOVEMENT_STATUS',
-  payload: {| robotName: string |},
-|}
+export interface ClearMovementStatusAction {
+  type: 'robotControls:CLEAR_MOVEMENT_STATUS'
+  payload: { robotName: string }
+}
 
 // action union
 
@@ -137,14 +135,14 @@ export type RobotControlsAction =
 
 // state types
 
-export type PerRobotControlsState = $ReadOnly<{|
-  lightsOn: boolean | null,
-  movementStatus: MovementStatus | null,
-  movementError: string | null,
-|}>
+export type PerRobotControlsState = Readonly<{
+  lightsOn: boolean | null
+  movementStatus: MovementStatus | null
+  movementError: string | null
+}>
 
-export type RobotControlsState = $Shape<
-  $ReadOnly<{|
-    [robotName: string]: void | PerRobotControlsState,
-  |}>
+export type RobotControlsState = Partial<
+  Readonly<{
+    [robotName: string]: undefined | PerRobotControlsState
+  }>
 >
diff --git a/app/src/redux/robot-settings/__fixtures__/index.ts b/app/src/redux/robot-settings/__fixtures__/index.ts
index 9fa0f36b936..17e3e82980a 100644
--- a/app/src/redux/robot-settings/__fixtures__/index.ts
+++ b/app/src/redux/robot-settings/__fixtures__/index.ts
@@ -1,9 +1,12 @@
-// @flow
 // robot settings fixtures
 
 import { mockRobot } from '../../robot-api/__fixtures__'
 
 import type { RobotSettings } from '../types'
+import type {
+  RobotApiResponse,
+  RobotApiResponseMeta,
+} from '../../robot-api/types'
 
 export const mockRobotSettings: RobotSettings = [
   { id: 'foo', title: 'Foo', description: 'foobar', value: true },
@@ -12,14 +15,14 @@ export const mockRobotSettings: RobotSettings = [
 
 // fetch settings
 
-export const mockFetchSettingsSuccessMeta = {
+export const mockFetchSettingsSuccessMeta: RobotApiResponseMeta = {
   method: 'GET',
   path: '/settings',
   ok: true,
   status: 200,
 }
 
-export const mockFetchSettingsSuccess = {
+export const mockFetchSettingsSuccess: RobotApiResponse = {
   ...mockFetchSettingsSuccessMeta,
   host: mockRobot,
   body: {
@@ -28,14 +31,14 @@ export const mockFetchSettingsSuccess = {
   },
 }
 
-export const mockFetchSettingsFailureMeta = {
+export const mockFetchSettingsFailureMeta: RobotApiResponseMeta = {
   method: 'GET',
   path: '/settings',
   ok: false,
   status: 500,
 }
 
-export const mockFetchSettingsFailure = {
+export const mockFetchSettingsFailure: RobotApiResponse = {
   ...mockFetchSettingsFailureMeta,
   host: mockRobot,
   body: { message: 'AH' },
@@ -43,14 +46,14 @@ export const mockFetchSettingsFailure = {
 
 // update setting
 
-export const mockUpdateSettingSuccessMeta = {
+export const mockUpdateSettingSuccessMeta: RobotApiResponseMeta = {
   method: 'POST',
   path: '/settings',
   ok: true,
   status: 200,
 }
 
-export const mockUpdateSettingSuccess = {
+export const mockUpdateSettingSuccess: RobotApiResponse = {
   ...mockUpdateSettingSuccessMeta,
   host: mockRobot,
   body: {
@@ -59,14 +62,14 @@ export const mockUpdateSettingSuccess = {
   },
 }
 
-export const mockUpdateSettingFailureMeta = {
+export const mockUpdateSettingFailureMeta: RobotApiResponseMeta = {
   method: 'POST',
   path: '/settings',
   ok: false,
   status: 500,
 }
 
-export const mockUpdateSettingFailure = {
+export const mockUpdateSettingFailure: RobotApiResponse = {
   ...mockUpdateSettingFailureMeta,
   host: mockRobot,
   body: { message: 'AH' },
diff --git a/app/src/redux/robot-settings/__tests__/actions.test.ts b/app/src/redux/robot-settings/__tests__/actions.test.ts
index fcced027fa4..c84dd5eb32b 100644
--- a/app/src/redux/robot-settings/__tests__/actions.test.ts
+++ b/app/src/redux/robot-settings/__tests__/actions.test.ts
@@ -1,18 +1,16 @@
-// @flow
-
 import * as Actions from '../actions'
 import * as Fixtures from '../__fixtures__'
 import type { RobotSettingsAction } from '../types'
 
-type ActionSpec = {|
-  name: string,
-  creator: (...Array<any>) => mixed,
-  args: Array<mixed>,
-  expected: RobotSettingsAction,
-|}
+interface ActionSpec {
+  name: string
+  creator: (...args: any[]) => unknown
+  args: unknown[]
+  expected: RobotSettingsAction
+}
 
 describe('robot settings actions', () => {
-  const SPECS: Array<ActionSpec> = [
+  const SPECS: ActionSpec[] = [
     {
       name: 'robotSettings:FETCH_SETTINGS',
       creator: Actions.fetchSettings,
@@ -20,7 +18,7 @@ describe('robot settings actions', () => {
       expected: {
         type: 'robotSettings:FETCH_SETTINGS',
         payload: { robotName: 'robot-name' },
-        meta: {},
+        meta: {} as any,
       },
     },
     {
@@ -39,7 +37,7 @@ describe('robot settings actions', () => {
           settings: Fixtures.mockRobotSettings,
           restartPath: null,
         },
-        meta: { requestId: 'abc' },
+        meta: { requestId: 'abc' } as any,
       },
     },
     {
@@ -49,7 +47,7 @@ describe('robot settings actions', () => {
       expected: {
         type: 'robotSettings:FETCH_SETTINGS_FAILURE',
         payload: { robotName: 'robot-name', error: { message: 'AH' } },
-        meta: { requestId: 'abc' },
+        meta: { requestId: 'abc' } as any,
       },
     },
     {
@@ -63,7 +61,7 @@ describe('robot settings actions', () => {
           settingId: 'foo',
           value: true,
         },
-        meta: {},
+        meta: {} as any,
       },
     },
     {
@@ -82,7 +80,7 @@ describe('robot settings actions', () => {
           settings: Fixtures.mockRobotSettings,
           restartPath: null,
         },
-        meta: { requestId: 'abc' },
+        meta: { requestId: 'abc' } as any,
       },
     },
     {
@@ -92,7 +90,7 @@ describe('robot settings actions', () => {
       expected: {
         type: 'robotSettings:UPDATE_SETTING_FAILURE',
         payload: { robotName: 'robot-name', error: { message: 'AH' } },
-        meta: { requestId: 'abc' },
+        meta: { requestId: 'abc' } as any,
       },
     },
     {
diff --git a/app/src/redux/robot-settings/__tests__/reducer.test.ts b/app/src/redux/robot-settings/__tests__/reducer.test.ts
index 34dcfac2596..8cbe5531d35 100644
--- a/app/src/redux/robot-settings/__tests__/reducer.test.ts
+++ b/app/src/redux/robot-settings/__tests__/reducer.test.ts
@@ -1,25 +1,23 @@
-// @flow
-
 import { robotSettingsReducer } from '../reducer'
 import * as Fixtures from '../__fixtures__'
 
 import type { Action } from '../../types'
 import type { RobotSettingsState } from '../types'
 
-type ReducerSpec = {|
-  name: string,
-  action: Action,
-  state: RobotSettingsState,
-  expected: RobotSettingsState,
-|}
+interface ReducerSpec {
+  name: string
+  action: Action
+  state: RobotSettingsState
+  expected: RobotSettingsState
+}
 
 describe('robotSettingsReducer', () => {
-  const SPECS: Array<ReducerSpec> = [
+  const SPECS: ReducerSpec[] = [
     {
       name: 'handles FETCH_SETTINGS_SUCCESS without restart required',
       action: {
         type: 'robotSettings:FETCH_SETTINGS_SUCCESS',
-        meta: {},
+        meta: {} as any,
         payload: {
           robotName: 'robotName',
           settings: Fixtures.mockRobotSettings,
@@ -38,7 +36,7 @@ describe('robotSettingsReducer', () => {
       name: 'handles FETCH_SETTINGS_SUCCESS with restart required',
       action: {
         type: 'robotSettings:FETCH_SETTINGS_SUCCESS',
-        meta: {},
+        meta: {} as any,
         payload: {
           robotName: 'robotName',
           settings: Fixtures.mockRobotSettings.slice(0, 1),
@@ -62,7 +60,7 @@ describe('robotSettingsReducer', () => {
       name: 'handles UPDATE_SETTING_SUCCESS',
       action: {
         type: 'robotSettings:UPDATE_SETTING_SUCCESS',
-        meta: {},
+        meta: {} as any,
         payload: {
           robotName: 'robotName',
           settings: Fixtures.mockRobotSettings,
diff --git a/app/src/redux/robot-settings/__tests__/selectors.test.ts b/app/src/redux/robot-settings/__tests__/selectors.test.ts
index 99c6be9a95f..c746a1eb99f 100644
--- a/app/src/redux/robot-settings/__tests__/selectors.test.ts
+++ b/app/src/redux/robot-settings/__tests__/selectors.test.ts
@@ -1,17 +1,16 @@
-// @flow
 import * as Selectors from '../selectors'
 import type { State } from '../../types'
 
-type SelectorSpec = {|
-  name: string,
-  selector: ($Shape<State>, ...Array<any>) => mixed,
-  state: $Shape<State>,
-  args?: Array<any>,
-  expected: mixed,
-|}
+interface SelectorSpec {
+  name: string
+  selector: (state: State, ...args: any[]) => unknown
+  state: State
+  args?: any[]
+  expected: unknown
+}
 
 describe('robot settings selectors', () => {
-  const SPECS: Array<SelectorSpec> = [
+  const SPECS: SelectorSpec[] = [
     {
       name: 'getRobotSettings',
       selector: Selectors.getRobotSettings,
@@ -24,7 +23,7 @@ describe('robot settings selectors', () => {
             ],
           },
         },
-      },
+      } as any,
       args: ['robotName'],
       expected: [{ id: 'foo', title: 'Foo', description: 'Foo', value: true }],
     },
@@ -33,7 +32,7 @@ describe('robot settings selectors', () => {
       selector: Selectors.getRobotRestartPath,
       state: {
         robotSettings: { robotName: { restartPath: '/restart', settings: [] } },
-      },
+      } as any,
       args: ['robotName'],
       expected: '/restart',
     },
@@ -42,7 +41,7 @@ describe('robot settings selectors', () => {
       selector: Selectors.getRobotRestartRequired,
       state: {
         robotSettings: { robotName: { restartPath: '/restart', settings: [] } },
-      },
+      } as any,
       args: ['robotName'],
       expected: true,
     },
@@ -51,7 +50,7 @@ describe('robot settings selectors', () => {
       selector: Selectors.getRobotRestartRequired,
       state: {
         robotSettings: { robotName: { restartPath: null, settings: [] } },
-      },
+      } as any,
       args: ['robotName'],
       expected: false,
     },
@@ -64,7 +63,7 @@ describe('robot settings selectors', () => {
           b: { restartPath: null, settings: [] },
           c: { restartPath: '/restart', settings: [] },
         },
-      },
+      } as any,
       args: [],
       expected: ['a', 'c'],
     },
diff --git a/app/src/redux/robot-settings/actions.ts b/app/src/redux/robot-settings/actions.ts
index 4db864ed6bb..fcf22b0c59a 100644
--- a/app/src/redux/robot-settings/actions.ts
+++ b/app/src/redux/robot-settings/actions.ts
@@ -1,4 +1,3 @@
-// @flow
 import * as Constants from './constants'
 import * as Types from './types'
 
@@ -25,7 +24,7 @@ export const fetchSettingsSuccess = (
 
 export const fetchSettingsFailure = (
   robotName: string,
-  error: {| message: string |},
+  error: { message: string },
   meta: RobotApiRequestMeta
 ): Types.FetchSettingsFailureAction => ({
   type: Constants.FETCH_SETTINGS_FAILURE,
@@ -56,7 +55,7 @@ export const updateSettingSuccess = (
 
 export const updateSettingFailure = (
   robotName: string,
-  error: {| message: string |},
+  error: { message: string },
   meta: RobotApiRequestMeta
 ): Types.UpdateSettingFailureAction => ({
   type: Constants.UPDATE_SETTING_FAILURE,
diff --git a/app/src/redux/robot-settings/constants.ts b/app/src/redux/robot-settings/constants.ts
index bb471995eb5..98b6168a971 100644
--- a/app/src/redux/robot-settings/constants.ts
+++ b/app/src/redux/robot-settings/constants.ts
@@ -1,5 +1,3 @@
-// @flow
-
 export const SETTINGS_PATH: '/settings' = '/settings'
 
 export const FETCH_SETTINGS: 'robotSettings:FETCH_SETTINGS' =
diff --git a/app/src/redux/robot-settings/epic/__tests__/clearRestartPathEpic.test.ts b/app/src/redux/robot-settings/epic/__tests__/clearRestartPathEpic.test.ts
index 3fcc45c8128..b8711c96f76 100644
--- a/app/src/redux/robot-settings/epic/__tests__/clearRestartPathEpic.test.ts
+++ b/app/src/redux/robot-settings/epic/__tests__/clearRestartPathEpic.test.ts
@@ -1,4 +1,3 @@
-// @flow
 import { TestScheduler } from 'rxjs/testing'
 
 import * as RobotAdminSelectors from '../../../robot-admin/selectors'
@@ -6,19 +5,21 @@ import * as Actions from '../../actions'
 import * as Selectors from '../../selectors'
 import { robotSettingsEpic } from '..'
 
-import type { State } from '../../../types'
+import type { Action, State } from '../../../types'
 
 jest.mock('../../../robot-admin/selectors')
 jest.mock('../../selectors')
 
-const mockGetRobotRestarting: JestMockFn<[State, string], mixed> =
-  RobotAdminSelectors.getRobotRestarting
+const mockGetRobotRestarting = RobotAdminSelectors.getRobotRestarting as jest.MockedFunction<
+  typeof RobotAdminSelectors.getRobotRestarting
+>
 
-const mockGetAllRestartRequiredRobots: JestMockFn<[State], Array<string>> =
-  Selectors.getAllRestartRequiredRobots
+const mockGetAllRestartRequiredRobots = Selectors.getAllRestartRequiredRobots as jest.MockedFunction<
+  typeof Selectors.getAllRestartRequiredRobots
+>
 
 describe('clearRestartPathEpic', () => {
-  let testScheduler
+  let testScheduler: TestScheduler
 
   beforeEach(() => {
     mockGetAllRestartRequiredRobots.mockReturnValue([])
@@ -38,8 +39,8 @@ describe('clearRestartPathEpic', () => {
     mockGetRobotRestarting.mockReturnValue(true)
 
     testScheduler.run(({ hot, cold, expectObservable }) => {
-      const action$ = cold('--')
-      const state$ = hot('-a', { a: {} })
+      const action$ = cold<Action>('--')
+      const state$ = hot<State>('-a', { a: {} } as any)
       const output$ = robotSettingsEpic(action$, state$)
 
       expectObservable(output$).toBe('-(ab)', {
diff --git a/app/src/redux/robot-settings/epic/__tests__/fetchSettingsEpic.test.ts b/app/src/redux/robot-settings/epic/__tests__/fetchSettingsEpic.test.ts
index 957c55be05e..c4acab1e528 100644
--- a/app/src/redux/robot-settings/epic/__tests__/fetchSettingsEpic.test.ts
+++ b/app/src/redux/robot-settings/epic/__tests__/fetchSettingsEpic.test.ts
@@ -1,4 +1,3 @@
-// @flow
 import { TestScheduler } from 'rxjs/testing'
 
 import { mockRobot } from '../../../robot-api/__fixtures__'
@@ -10,36 +9,32 @@ import * as Actions from '../../actions'
 import * as Types from '../../types'
 import { robotSettingsEpic } from '..'
 
-import type { Observable } from 'rxjs'
-import type { State } from '../../../types'
-import type {
-  RobotHost,
-  RobotApiRequestOptions,
-  RobotApiResponse,
-} from '../../../robot-api/types'
+import type { Action, State } from '../../../types'
+import type { RobotApiRequestMeta } from '../../../robot-api/types'
 
 jest.mock('../../../robot-api/http')
 jest.mock('../../../discovery/selectors')
 jest.mock('../../selectors')
 
-const mockState = { state: true }
+const mockState: State = { state: true } as any
 
-const mockFetchRobotApi: JestMockFn<
-  [RobotHost, RobotApiRequestOptions],
-  Observable<RobotApiResponse>
-> = RobotApiHttp.fetchRobotApi
+const mockFetchRobotApi = RobotApiHttp.fetchRobotApi as jest.MockedFunction<
+  typeof RobotApiHttp.fetchRobotApi
+>
 
-const mockGetRobotByName: JestMockFn<[any, string], mixed> =
-  DiscoverySelectors.getRobotByName
+const mockGetRobotByName = DiscoverySelectors.getRobotByName as jest.MockedFunction<
+  typeof DiscoverySelectors.getRobotByName
+>
 
-const mockGetAllRestartRequiredRobots: JestMockFn<[State], Array<string>> =
-  Selectors.getAllRestartRequiredRobots
+const mockGetAllRestartRequiredRobots = Selectors.getAllRestartRequiredRobots as jest.MockedFunction<
+  typeof Selectors.getAllRestartRequiredRobots
+>
 
 describe('fetchSettingsEpic', () => {
-  let testScheduler
+  let testScheduler: TestScheduler
 
   beforeEach(() => {
-    mockGetRobotByName.mockReturnValue(mockRobot)
+    mockGetRobotByName.mockReturnValue(mockRobot as any)
     mockGetAllRestartRequiredRobots.mockReturnValue([])
 
     testScheduler = new TestScheduler((actual, expected) => {
@@ -51,7 +46,7 @@ describe('fetchSettingsEpic', () => {
     jest.resetAllMocks()
   })
 
-  const meta = { requestId: '1234' }
+  const meta: RobotApiRequestMeta = { requestId: '1234' } as any
   const action: Types.FetchSettingsAction = {
     ...Actions.fetchSettings(mockRobot.name),
     meta,
@@ -63,8 +58,8 @@ describe('fetchSettingsEpic', () => {
         cold('r', { r: Fixtures.mockFetchSettingsSuccess })
       )
 
-      const action$ = hot('--a', { a: action })
-      const state$ = hot('a-a', { a: mockState })
+      const action$ = hot<Action>('--a', { a: action })
+      const state$ = hot<State>('a-a', { a: mockState })
       const output$ = robotSettingsEpic(action$, state$)
 
       expectObservable(output$)
@@ -84,8 +79,8 @@ describe('fetchSettingsEpic', () => {
         cold('r', { r: Fixtures.mockFetchSettingsSuccess })
       )
 
-      const action$ = hot('--a', { a: action })
-      const state$ = hot('a-a', { a: {} })
+      const action$ = hot<Action>('--a', { a: action })
+      const state$ = hot<State>('a-a', { a: {} } as any)
       const output$ = robotSettingsEpic(action$, state$)
 
       expectObservable(output$).toBe('--a', {
@@ -105,8 +100,8 @@ describe('fetchSettingsEpic', () => {
         cold('r', { r: Fixtures.mockFetchSettingsFailure })
       )
 
-      const action$ = hot('--a', { a: action })
-      const state$ = hot('a-a', { a: {} })
+      const action$ = hot<Action>('--a', { a: action })
+      const state$ = hot<State>('a-a', { a: {} } as any)
       const output$ = robotSettingsEpic(action$, state$)
 
       expectObservable(output$).toBe('--a', {
diff --git a/app/src/redux/robot-settings/epic/__tests__/updateSettingEpic.test.ts b/app/src/redux/robot-settings/epic/__tests__/updateSettingEpic.test.ts
index 80c015024b7..877153b2892 100644
--- a/app/src/redux/robot-settings/epic/__tests__/updateSettingEpic.test.ts
+++ b/app/src/redux/robot-settings/epic/__tests__/updateSettingEpic.test.ts
@@ -1,4 +1,3 @@
-// @flow
 import { TestScheduler } from 'rxjs/testing'
 
 import { mockRobot } from '../../../robot-api/__fixtures__'
@@ -10,36 +9,32 @@ import * as Actions from '../../actions'
 import * as Types from '../../types'
 import { robotSettingsEpic } from '..'
 
-import type { Observable } from 'rxjs'
-import type { State } from '../../../types'
-import type {
-  RobotHost,
-  RobotApiRequestOptions,
-  RobotApiResponse,
-} from '../../../robot-api/types'
+import type { Action, State } from '../../../types'
+import type { RobotApiRequestMeta } from '../../../robot-api/types'
 
 jest.mock('../../../robot-api/http')
 jest.mock('../../../discovery/selectors')
 jest.mock('../../selectors')
 
-const mockState = { state: true }
+const mockState: State = { state: true } as any
 
-const mockFetchRobotApi: JestMockFn<
-  [RobotHost, RobotApiRequestOptions],
-  Observable<RobotApiResponse>
-> = RobotApiHttp.fetchRobotApi
+const mockFetchRobotApi = RobotApiHttp.fetchRobotApi as jest.MockedFunction<
+  typeof RobotApiHttp.fetchRobotApi
+>
 
-const mockGetRobotByName: JestMockFn<[any, string], mixed> =
-  DiscoverySelectors.getRobotByName
+const mockGetRobotByName = DiscoverySelectors.getRobotByName as jest.MockedFunction<
+  typeof DiscoverySelectors.getRobotByName
+>
 
-const mockGetAllRestartRequiredRobots: JestMockFn<[State], Array<string>> =
-  Selectors.getAllRestartRequiredRobots
+const mockGetAllRestartRequiredRobots = Selectors.getAllRestartRequiredRobots as jest.MockedFunction<
+  typeof Selectors.getAllRestartRequiredRobots
+>
 
 describe('updateSettingEpic', () => {
-  let testScheduler
+  let testScheduler: TestScheduler
 
   beforeEach(() => {
-    mockGetRobotByName.mockReturnValue(mockRobot)
+    mockGetRobotByName.mockReturnValue(mockRobot as any)
     mockGetAllRestartRequiredRobots.mockReturnValue([])
 
     testScheduler = new TestScheduler((actual, expected) => {
@@ -51,7 +46,7 @@ describe('updateSettingEpic', () => {
     jest.resetAllMocks()
   })
 
-  const meta = { requestId: '1234' }
+  const meta: RobotApiRequestMeta = { requestId: '1234' } as any
   const action: Types.UpdateSettingAction = {
     ...Actions.updateSetting(mockRobot.name, 'setting-id', true),
     meta,
@@ -63,8 +58,8 @@ describe('updateSettingEpic', () => {
         cold('r', { r: Fixtures.mockUpdateSettingSuccess })
       )
 
-      const action$ = hot('--a', { a: action })
-      const state$ = hot('a-a', { a: mockState })
+      const action$ = hot<Action>('--a', { a: action })
+      const state$ = hot<State>('a-a', { a: mockState })
       const output$ = robotSettingsEpic(action$, state$)
 
       expectObservable(output$)
@@ -85,8 +80,8 @@ describe('updateSettingEpic', () => {
         cold('r', { r: Fixtures.mockUpdateSettingSuccess })
       )
 
-      const action$ = hot('--a', { a: action })
-      const state$ = hot('a-a', { a: {} })
+      const action$ = hot<Action>('--a', { a: action })
+      const state$ = hot<State>('a-a', { a: {} } as any)
       const output$ = robotSettingsEpic(action$, state$)
 
       expectObservable(output$).toBe('--a', {
@@ -106,8 +101,8 @@ describe('updateSettingEpic', () => {
         cold('r', { r: Fixtures.mockUpdateSettingFailure })
       )
 
-      const action$ = hot('--a', { a: action })
-      const state$ = hot('a-a', { a: {} })
+      const action$ = hot<Action>('--a', { a: action })
+      const state$ = hot<State>('a-a', { a: {} } as any)
       const output$ = robotSettingsEpic(action$, state$)
 
       expectObservable(output$).toBe('--a', {
diff --git a/app/src/redux/robot-settings/epic/clearRestartPathEpic.ts b/app/src/redux/robot-settings/epic/clearRestartPathEpic.ts
index 1bca7a4d8a0..737ac6e7660 100644
--- a/app/src/redux/robot-settings/epic/clearRestartPathEpic.ts
+++ b/app/src/redux/robot-settings/epic/clearRestartPathEpic.ts
@@ -1,4 +1,3 @@
-// @flow
 import { of } from 'rxjs'
 import { map, filter, switchMap } from 'rxjs/operators'
 import { getRobotRestarting } from '../../robot-admin'
diff --git a/app/src/redux/robot-settings/epic/fetchSettingsEpic.ts b/app/src/redux/robot-settings/epic/fetchSettingsEpic.ts
index 4ff8d17f723..281648ebf94 100644
--- a/app/src/redux/robot-settings/epic/fetchSettingsEpic.ts
+++ b/app/src/redux/robot-settings/epic/fetchSettingsEpic.ts
@@ -1,4 +1,3 @@
-// @flow
 import { ofType } from 'redux-observable'
 
 import { GET } from '../../robot-api'
@@ -7,7 +6,7 @@ import { mapToRobotApiRequest } from '../../robot-api/operators'
 import * as Actions from '../actions'
 import * as Constants from '../constants'
 
-import type { Epic } from '../../types'
+import type { Action, Epic } from '../../types'
 
 import type {
   ActionToRequestMapper,
@@ -40,7 +39,7 @@ const mapResponseToAction: ResponseToActionMapper<FetchSettingsAction> = (
 
 export const fetchSettingsEpic: Epic = (action$, state$) => {
   return action$.pipe(
-    ofType(Constants.FETCH_SETTINGS),
+    ofType<Action, FetchSettingsAction>(Constants.FETCH_SETTINGS),
     mapToRobotApiRequest(
       state$,
       a => a.payload.robotName,
diff --git a/app/src/redux/robot-settings/epic/index.ts b/app/src/redux/robot-settings/epic/index.ts
index 3bb32242f8b..375bb4ab6cc 100644
--- a/app/src/redux/robot-settings/epic/index.ts
+++ b/app/src/redux/robot-settings/epic/index.ts
@@ -1,4 +1,3 @@
-// @flow
 import { combineEpics } from 'redux-observable'
 import type { Epic } from '../../types'
 
@@ -6,7 +5,7 @@ import { fetchSettingsEpic } from './fetchSettingsEpic'
 import { updateSettingEpic } from './updateSettingEpic'
 import { clearRestartPathEpic } from './clearRestartPathEpic'
 
-export const robotSettingsEpic: Epic = combineEpics(
+export const robotSettingsEpic: Epic = combineEpics<Epic>(
   fetchSettingsEpic,
   updateSettingEpic,
   clearRestartPathEpic
diff --git a/app/src/redux/robot-settings/epic/updateSettingEpic.ts b/app/src/redux/robot-settings/epic/updateSettingEpic.ts
index 0ab9f881d41..a6b8447156d 100644
--- a/app/src/redux/robot-settings/epic/updateSettingEpic.ts
+++ b/app/src/redux/robot-settings/epic/updateSettingEpic.ts
@@ -1,4 +1,3 @@
-// @flow
 import { ofType } from 'redux-observable'
 
 import { POST } from '../../robot-api'
@@ -7,7 +6,7 @@ import { mapToRobotApiRequest } from '../../robot-api/operators'
 import * as Actions from '../actions'
 import * as Constants from '../constants'
 
-import type { Epic } from '../../types'
+import type { Action, Epic } from '../../types'
 
 import type {
   ActionToRequestMapper,
@@ -41,7 +40,7 @@ const mapResponseToAction: ResponseToActionMapper<UpdateSettingAction> = (
 
 export const updateSettingEpic: Epic = (action$, state$) => {
   return action$.pipe(
-    ofType(Constants.UPDATE_SETTING),
+    ofType<Action, UpdateSettingAction>(Constants.UPDATE_SETTING),
     mapToRobotApiRequest(
       state$,
       a => a.payload.robotName,
diff --git a/app/src/redux/robot-settings/index.ts b/app/src/redux/robot-settings/index.ts
index 552091d705d..cd485f0f980 100644
--- a/app/src/redux/robot-settings/index.ts
+++ b/app/src/redux/robot-settings/index.ts
@@ -1,4 +1,3 @@
-// @flow
 // robot settings actions, constants, selectors re-exports for convenience
 export * from './actions'
 export * from './constants'
diff --git a/app/src/redux/robot-settings/reducer.ts b/app/src/redux/robot-settings/reducer.ts
index 7bd29ceb756..d2f1deafd40 100644
--- a/app/src/redux/robot-settings/reducer.ts
+++ b/app/src/redux/robot-settings/reducer.ts
@@ -1,6 +1,6 @@
-// @flow
 import * as Constants from './constants'
 
+import type { Reducer } from 'redux'
 import type { Action } from '../types'
 import type { RobotSettingsState, PerRobotRobotSettingsState } from './types'
 
@@ -11,10 +11,10 @@ const INITIAL_ROBOT_STATE: PerRobotRobotSettingsState = {
   restartPath: null,
 }
 
-export function robotSettingsReducer(
-  state: RobotSettingsState = INITIAL_STATE,
-  action: Action
-): RobotSettingsState {
+export const robotSettingsReducer: Reducer<RobotSettingsState, Action> = (
+  state = INITIAL_STATE,
+  action
+) => {
   switch (action.type) {
     case Constants.FETCH_SETTINGS_SUCCESS:
     case Constants.UPDATE_SETTING_SUCCESS: {
diff --git a/app/src/redux/robot-settings/selectors.ts b/app/src/redux/robot-settings/selectors.ts
index 25d134f0537..31bc530ffc7 100644
--- a/app/src/redux/robot-settings/selectors.ts
+++ b/app/src/redux/robot-settings/selectors.ts
@@ -1,9 +1,11 @@
-// @flow
 import type { State } from '../types'
-import type { RobotSettings } from './types'
+import type { RobotSettings, PerRobotRobotSettingsState } from './types'
 
-const robotState = (state: State, name: string | null) =>
-  name != null ? state.robotSettings[name] : null
+const robotState = (
+  state: State,
+  name: string | null
+): PerRobotRobotSettingsState | null =>
+  name != null ? state.robotSettings[name] ?? null : null
 
 export function getRobotSettings(
   state: State,
@@ -26,7 +28,7 @@ export function getRobotRestartRequired(
   return getRobotRestartPath(state, robotName) !== null
 }
 
-export function getAllRestartRequiredRobots(state: State): Array<string> {
+export function getAllRestartRequiredRobots(state: State): string[] {
   return Object.keys(state.robotSettings).filter((name: string) => {
     return getRobotRestartRequired(state, name)
   })
diff --git a/app/src/redux/robot-settings/types.ts b/app/src/redux/robot-settings/types.ts
index ba0a9f24f68..5571be6a441 100644
--- a/app/src/redux/robot-settings/types.ts
+++ b/app/src/redux/robot-settings/types.ts
@@ -1,92 +1,90 @@
-// @flow
-
 import type { RobotApiRequestMeta } from '../robot-api/types'
 
-export type RobotSettingsField = {|
-  id: string,
-  title: string,
-  description: string,
-  value: boolean | null,
-  restart_required?: boolean,
-|}
+export interface RobotSettingsField {
+  id: string
+  title: string
+  description: string
+  value: boolean | null
+  restart_required?: boolean
+}
 
-export type RobotSettings = Array<RobotSettingsField>
+export type RobotSettings = RobotSettingsField[]
 
-export type RobotSettingsResponse = {|
-  settings: RobotSettings,
-  links?: {| restart?: string |},
-|}
+export interface RobotSettingsResponse {
+  settings: RobotSettings
+  links?: { restart?: string }
+}
 
-export type PerRobotRobotSettingsState = {|
-  settings: RobotSettings,
-  restartPath: string | null,
-|}
+export interface PerRobotRobotSettingsState {
+  settings: RobotSettings
+  restartPath: string | null
+}
 
-export type RobotSettingsState = $Shape<{|
-  [robotName: string]: void | PerRobotRobotSettingsState,
-|}>
+export type RobotSettingsState = Partial<{
+  [robotName: string]: undefined | PerRobotRobotSettingsState
+}>
 
-export type RobotSettingsFieldUpdate = {|
-  id: $PropertyType<RobotSettingsField, 'id'>,
-  value: $PropertyType<RobotSettingsField, 'value'>,
-|}
+export interface RobotSettingsFieldUpdate {
+  id: RobotSettingsField['id']
+  value: RobotSettingsField['value']
+}
 
 // action types
 
 // fetch settings
 
-export type FetchSettingsAction = {|
-  type: 'robotSettings:FETCH_SETTINGS',
-  payload: {| robotName: string |},
-  meta: RobotApiRequestMeta,
-|}
-
-export type FetchSettingsSuccessAction = {|
-  type: 'robotSettings:FETCH_SETTINGS_SUCCESS',
-  payload: {|
-    robotName: string,
-    settings: RobotSettings,
-    restartPath: string | null,
-  |},
-  meta: RobotApiRequestMeta,
-|}
-
-export type FetchSettingsFailureAction = {|
-  type: 'robotSettings:FETCH_SETTINGS_FAILURE',
-  payload: {| robotName: string, error: {| message: string |} |},
-  meta: RobotApiRequestMeta,
-|}
+export interface FetchSettingsAction {
+  type: 'robotSettings:FETCH_SETTINGS'
+  payload: { robotName: string }
+  meta: RobotApiRequestMeta | {}
+}
+
+export interface FetchSettingsSuccessAction {
+  type: 'robotSettings:FETCH_SETTINGS_SUCCESS'
+  payload: {
+    robotName: string
+    settings: RobotSettings
+    restartPath: string | null
+  }
+  meta: RobotApiRequestMeta
+}
+
+export interface FetchSettingsFailureAction {
+  type: 'robotSettings:FETCH_SETTINGS_FAILURE'
+  payload: { robotName: string; error: { message: string } }
+  meta: RobotApiRequestMeta
+}
 
 // update setting
 
-export type UpdateSettingAction = {|
-  type: 'robotSettings:UPDATE_SETTING',
-  payload: {| robotName: string, settingId: string, value: boolean | null |},
-  meta: RobotApiRequestMeta,
-|}
-
-export type UpdateSettingSuccessAction = {|
-  type: 'robotSettings:UPDATE_SETTING_SUCCESS',
-  payload: {|
-    robotName: string,
-    settings: RobotSettings,
-    restartPath: string | null,
-  |},
-  meta: RobotApiRequestMeta,
-|}
-
-export type UpdateSettingFailureAction = {|
-  type: 'robotSettings:UPDATE_SETTING_FAILURE',
-  payload: {| robotName: string, error: {| message: string |} |},
-  meta: RobotApiRequestMeta,
-|}
+export interface UpdateSettingAction {
+  type: 'robotSettings:UPDATE_SETTING'
+  payload: { robotName: string; settingId: string; value: boolean | null }
+  meta: RobotApiRequestMeta | {}
+}
+
+export interface UpdateSettingSuccessAction {
+  type: 'robotSettings:UPDATE_SETTING_SUCCESS'
+  payload: {
+    robotName: string
+    settings: RobotSettings
+    restartPath: string | null
+  }
+  meta: RobotApiRequestMeta
+}
+
+export interface UpdateSettingFailureAction {
+  type: 'robotSettings:UPDATE_SETTING_FAILURE'
+  payload: { robotName: string; error: { message: string } }
+  meta: RobotApiRequestMeta
+}
 
 // clear restart path
 
-export type ClearRestartPathAction = {|
-  type: 'robotSettings:CLEAR_RESTART_PATH',
-  payload: { robotName: string },
-|}
+export interface ClearRestartPathAction {
+  type: 'robotSettings:CLEAR_RESTART_PATH'
+  payload: { robotName: string }
+}
 
 export type RobotSettingsAction =
   | ClearRestartPathAction
diff --git a/app/src/redux/robot/actions.ts b/app/src/redux/robot/actions.ts
index a7da7300bf6..89128dbd9b6 100755
--- a/app/src/redux/robot/actions.ts
+++ b/app/src/redux/robot/actions.ts
@@ -1,107 +1,106 @@
-// @flow
 // robot actions and action types
 import type { Error } from '../types'
 import type { ProtocolData } from '../protocol/types'
 import type { Mount, Slot, Axis, Direction, SessionUpdate } from './types'
 
-export type ConnectAction = {|
-  type: 'robot:CONNECT',
-  payload: {|
-    name: string,
-  |},
-  meta: {|
-    robotCommand: true,
-  |},
-|}
-
-export type ConnectResponseAction = {|
-  type: 'robot:CONNECT_RESPONSE',
-  payload: {|
-    error: ?Error,
-    sessionCapabilities: Array<string>,
-  |},
-|}
-
-export type ReturnTipAction = {|
-  type: 'robot:RETURN_TIP',
-  payload: {|
-    mount: Mount,
-  |},
-  meta: {|
-    robotCommand: true,
-  |},
-|}
-
-export type ReturnTipResponseAction = {|
-  type: 'robot:RETURN_TIP_RESPONSE',
-  error: boolean,
-  payload?: Error,
-|}
-
-export type ClearConnectResponseAction = {|
-  type: 'robot:CLEAR_CONNECT_RESPONSE',
-|}
-
-export type DisconnectAction = {|
-  type: 'robot:DISCONNECT',
-  meta: {|
-    robotCommand: true,
-  |},
-|}
-
-export type DisconnectResponseAction = {|
-  type: 'robot:DISCONNECT_RESPONSE',
-  payload: {},
-|}
-
-export type UnexpectedDisconnectAction = {|
-  type: 'robot:UNEXPECTED_DISCONNECT',
-|}
-
-export type ConfirmProbedAction = {|
-  type: 'robot:CONFIRM_PROBED',
-  payload: Mount,
-  meta: {|
-    robotCommand: true,
-  |},
-|}
-
-export type PipetteCalibrationAction = {|
-  type: 'robot:JOG',
-  payload: {|
-    mount: Mount,
-    axis?: Axis,
-    direction?: Direction,
-    step?: number,
-  |},
-  meta: {|
-    robotCommand: true,
-  |},
-|}
-
-export type SetJogDistanceAction = {|
-  type: 'robot:SET_JOG_DISTANCE',
-  payload: number,
-|}
-
-export type LabwareCalibrationAction = {|
+export interface ConnectAction {
+  type: 'robot:CONNECT'
+  payload: {
+    name: string
+  }
+  meta: {
+    robotCommand: true
+  }
+}
+
+export interface ConnectResponseAction {
+  type: 'robot:CONNECT_RESPONSE'
+  payload: {
+    error: Error | null | undefined
+    sessionCapabilities: string[]
+  }
+}
+
+export interface ReturnTipAction {
+  type: 'robot:RETURN_TIP'
+  payload: {
+    mount: Mount
+  }
+  meta: {
+    robotCommand: true
+  }
+}
+
+export interface ReturnTipResponseAction {
+  type: 'robot:RETURN_TIP_RESPONSE'
+  error: boolean
+  payload?: Error
+}
+
+export interface ClearConnectResponseAction {
+  type: 'robot:CLEAR_CONNECT_RESPONSE'
+}
+
+export interface DisconnectAction {
+  type: 'robot:DISCONNECT'
+  meta: {
+    robotCommand: true
+  }
+}
+
+export interface DisconnectResponseAction {
+  type: 'robot:DISCONNECT_RESPONSE'
+  payload: {}
+}
+
+export interface UnexpectedDisconnectAction {
+  type: 'robot:UNEXPECTED_DISCONNECT'
+}
+
+export interface ConfirmProbedAction {
+  type: 'robot:CONFIRM_PROBED'
+  payload: Mount
+  meta: {
+    robotCommand: true
+  }
+}
+
+export interface PipetteCalibrationAction {
+  type: 'robot:JOG'
+  payload: {
+    mount: Mount
+    axis?: Axis
+    direction?: Direction
+    step?: number
+  }
+  meta: {
+    robotCommand: true
+  }
+}
+
+export interface SetJogDistanceAction {
+  type: 'robot:SET_JOG_DISTANCE'
+  payload: number
+}
+
+export interface LabwareCalibrationAction {
   type:
     | 'robot:MOVE_TO'
     | 'robot:PICKUP_AND_HOME'
     | 'robot:DROP_TIP_AND_HOME'
     | 'robot:CONFIRM_TIPRACK'
     | 'robot:UPDATE_OFFSET'
-    | 'robot:SET_JOG_DISTANCE',
-  payload: {|
-    mount: Mount,
-    slot: Slot,
-  |},
-  meta: {|
-    robotCommand: true,
-  |},
-|}
-
-export type CalibrationSuccessAction = {|
+    | 'robot:SET_JOG_DISTANCE'
+  payload: {
+    mount: Mount
+    slot: Slot
+  }
+  meta: {
+    robotCommand: true
+  }
+}
+
+export interface CalibrationSuccessAction {
   type:
     | 'robot:MOVE_TO_SUCCESS'
     | 'robot:JOG_SUCCESS'
@@ -109,14 +108,14 @@ export type CalibrationSuccessAction = {|
     | 'robot:DROP_TIP_AND_HOME_SUCCESS'
     | 'robot:CONFIRM_TIPRACK_SUCCESS'
     | 'robot:UPDATE_OFFSET_SUCCESS'
-    | 'robot:RETURN_TIP_SUCCESS',
+    | 'robot:RETURN_TIP_SUCCESS'
   payload: {
-    isTiprack?: boolean,
-    tipOn?: boolean,
-  },
-|}
+    isTiprack?: boolean
+    tipOn?: boolean
+  }
+}
 
-export type CalibrationFailureAction = {|
+export interface CalibrationFailureAction {
   type:
     | 'robot:MOVE_TO_FAILURE'
     | 'robot:JOG_FAILURE'
@@ -124,161 +123,163 @@ export type CalibrationFailureAction = {|
     | 'robot:DROP_TIP_AND_HOME_FAILURE'
     | 'robot:CONFIRM_TIPRACK_FAILURE'
     | 'robot:UPDATE_OFFSET_FAILURE'
-    | 'robot:RETURN_TIP_FAILURE',
-  error: true,
-  payload: Error,
-|}
+    | 'robot:RETURN_TIP_FAILURE'
+  error: true
+  payload: Error
+}
 
-export type SessionResponseAction = {|
-  type: 'robot:SESSION_RESPONSE',
+export interface SessionResponseAction {
+  type: 'robot:SESSION_RESPONSE'
   // TODO(mc, 2018-09-06): this payload is incomplete
   payload: {
-    name: string,
-    protocolText: string,
-    metadata?: ?$PropertyType<ProtocolData, 'metadata'>,
-    apiLevel: [number, number],
-    ...
-  },
-  meta: {| freshUpload: boolean |},
-|}
-
-export type SessionErrorAction = {|
-  type: 'robot:SESSION_ERROR',
-  payload: {| error: Error |},
-  meta: {| freshUpload: boolean |},
-|}
-
-export type SessionUpdateAction = {|
-  type: 'robot:SESSION_UPDATE',
-  payload: SessionUpdate,
-  meta: {| now: number |},
-|}
-
-export type RefreshSessionAction = {|
-  type: 'robot:REFRESH_SESSION',
-  meta: {| robotCommand: true |},
-|}
+    name: string
+    protocolText: string
+    metadata?: ProtocolData['metadata'] | null | undefined
+    apiLevel: [number, number]
+    [key: string]: unknown
+  }
+  meta: { freshUpload: boolean }
+}
+
+export interface SessionErrorAction {
+  type: 'robot:SESSION_ERROR'
+  payload: { error: Error }
+  meta: { freshUpload: boolean }
+}
+
+export interface SessionUpdateAction {
+  type: 'robot:SESSION_UPDATE'
+  payload: SessionUpdate
+  meta: { now: number }
+}
+
+export interface RefreshSessionAction {
+  type: 'robot:REFRESH_SESSION'
+  meta: { robotCommand: true }
+}
 
 export type CalibrationResponseAction =
   | CalibrationSuccessAction
   | CalibrationFailureAction
 
-export type SetModulesReviewedAction = {|
-  type: 'robot:SET_MODULES_REVIEWED',
-  payload: boolean,
-|}
-
-export type ClearCalibrationRequestAction = {|
-  type: 'robot:CLEAR_CALIBRATION_REQUEST',
-|}
-
-export type SetDeckPopulatedAction = {|
-  type: 'robot:SET_DECK_POPULATED',
-  payload: boolean,
-|}
-
-export type MoveToFrontAction = {|
-  type: 'robot:MOVE_TO_FRONT',
-  payload: {| mount: Mount |},
-  meta: {| robotCommand: true |},
-|}
-
-export type MoveToFrontResponseAction = {|
-  type: 'robot:MOVE_TO_FRONT_RESPONSE',
-  error: boolean,
-  payload?: Error,
-|}
-
-export type ProbeTipAction = {|
-  type: 'robot:PROBE_TIP',
-  payload: {| mount: Mount |},
-  meta: {| robotCommand: true |},
-|}
-
-export type ProbeTipResponseAction = {|
-  type: 'robot:PROBE_TIP_RESPONSE',
-  error: boolean,
-  payload?: Error,
-|}
-
-export type ConfirmLabwareAction = {|
-  type: 'robot:CONFIRM_LABWARE',
-  payload: {| labware: Slot |},
-|}
-
-export type RunAction = {|
-  type: 'robot:RUN',
-  meta: {| robotCommand: true |},
-|}
-
-export type RunResponseAction = {|
-  type: 'robot:RUN_RESPONSE',
-  error: boolean,
-  payload?: Error,
-|}
-
-export type PauseAction = {|
-  type: 'robot:PAUSE',
-  meta: {| robotCommand: true |},
-|}
-
-export type PauseResponseAction = {|
-  type: 'robot:PAUSE_RESPONSE',
-  error: boolean,
-  payload?: Error,
-|}
-
-export type ResumeAction = {|
-  type: 'robot:RESUME',
-  meta: {| robotCommand: true |},
-|}
-
-export type ResumeResponseAction = {|
-  type: 'robot:RESUME_RESPONSE',
-  error: boolean,
-  payload?: Error,
-|}
-
-export type CancelAction = {|
-  type: 'robot:CANCEL',
-  meta: {| robotCommand: true |},
-|}
-
-export type CancelResponseAction = {|
-  type: 'robot:CANCEL_RESPONSE',
-  error: boolean,
-  payload?: Error,
-|}
-
-export type TickRunTimeAction = {| type: 'robot:TICK_RUN_TIME' |}
+export interface SetModulesReviewedAction {
+  type: 'robot:SET_MODULES_REVIEWED'
+  payload: boolean
+}
+
+export interface ClearCalibrationRequestAction {
+  type: 'robot:CLEAR_CALIBRATION_REQUEST'
+}
+
+export interface SetDeckPopulatedAction {
+  type: 'robot:SET_DECK_POPULATED'
+  payload: boolean
+}
+
+export interface MoveToFrontAction {
+  type: 'robot:MOVE_TO_FRONT'
+  payload: { mount: Mount }
+  meta: { robotCommand: true }
+}
+
+export interface MoveToFrontResponseAction {
+  type: 'robot:MOVE_TO_FRONT_RESPONSE'
+  error: boolean
+  payload?: Error
+}
+
+export interface ProbeTipAction {
+  type: 'robot:PROBE_TIP'
+  payload: { mount: Mount }
+  meta: { robotCommand: true }
+}
+
+export interface ProbeTipResponseAction {
+  type: 'robot:PROBE_TIP_RESPONSE'
+  error: boolean
+  payload?: Error
+}
+
+export interface ConfirmLabwareAction {
+  type: 'robot:CONFIRM_LABWARE'
+  payload: { labware: Slot }
+}
+
+export interface RunAction {
+  type: 'robot:RUN'
+  meta: { robotCommand: true }
+}
+
+export interface RunResponseAction {
+  type: 'robot:RUN_RESPONSE'
+  error: boolean
+  payload?: Error
+}
+
+export interface PauseAction {
+  type: 'robot:PAUSE'
+  meta: { robotCommand: true }
+}
+
+export interface PauseResponseAction {
+  type: 'robot:PAUSE_RESPONSE'
+  error: boolean
+  payload?: Error
+}
+
+export interface ResumeAction {
+  type: 'robot:RESUME'
+  meta: { robotCommand: true }
+}
+
+export interface ResumeResponseAction {
+  type: 'robot:RESUME_RESPONSE'
+  error: boolean
+  payload?: Error
+}
+
+export interface CancelAction {
+  type: 'robot:CANCEL'
+  meta: { robotCommand: true }
+}
+
+export interface CancelResponseAction {
+  type: 'robot:CANCEL_RESPONSE'
+  error: boolean
+  payload?: Error
+}
+
+export interface TickRunTimeAction {
+  type: 'robot:TICK_RUN_TIME'
+}
 
 // TODO(mc, 2018-01-23): refactor to use type above
 //   DO NOT ADD NEW ACTIONS HERE
 export const actionTypes = {
   // calibration
-  SET_DECK_POPULATED: ('robot:SET_DECK_POPULATED': 'robot:SET_DECK_POPULATED'),
+  SET_DECK_POPULATED: 'robot:SET_DECK_POPULATED',
   // TODO(mc, 2018-01-10): rename MOVE_TO_FRONT to PREPARE_TO_PROBE?
-  MOVE_TO_FRONT: ('robot:MOVE_TO_FRONT': 'robot:MOVE_TO_FRONT'),
-  MOVE_TO_FRONT_RESPONSE: ('robot:MOVE_TO_FRONT_RESPONSE': 'robot:MOVE_TO_FRONT_RESPONSE'),
-  PROBE_TIP: ('robot:PROBE_TIP': 'robot:PROBE_TIP'),
-  PROBE_TIP_RESPONSE: ('robot:PROBE_TIP_RESPONSE': 'robot:PROBE_TIP_RESPONSE'),
+  MOVE_TO_FRONT: 'robot:MOVE_TO_FRONT',
+  MOVE_TO_FRONT_RESPONSE: 'robot:MOVE_TO_FRONT_RESPONSE',
+  PROBE_TIP: 'robot:PROBE_TIP',
+  PROBE_TIP_RESPONSE: 'robot:PROBE_TIP_RESPONSE',
 
-  RETURN_TIP: ('robot:RETURN_TIP': 'robot:RETURN_TIP'),
-  RETURN_TIP_RESPONSE: ('robot:RETURN_TIP_RESPONSE': 'robot:RETURN_TIP_RESPONSE'),
-  CONFIRM_LABWARE: ('robot:CONFIRM_LABWARE': 'robot:CONFIRM_LABWARE'),
+  RETURN_TIP: 'robot:RETURN_TIP',
+  RETURN_TIP_RESPONSE: 'robot:RETURN_TIP_RESPONSE',
+  CONFIRM_LABWARE: 'robot:CONFIRM_LABWARE',
 
   // protocol run controls
-  RUN: ('robot:RUN': 'robot:RUN'),
-  RUN_RESPONSE: ('robot:RUN_RESPONSE': 'robot:RUN_RESPONSE'),
-  PAUSE: ('robot:PAUSE': 'robot:PAUSE'),
-  PAUSE_RESPONSE: ('robot:PAUSE_RESPONSE': 'robot:PAUSE_RESPONSE'),
-  RESUME: ('robot:RESUME': 'robot:RESUME'),
-  RESUME_RESPONSE: ('robot:RESUME_RESPONSE': 'robot:RESUME_RESPONSE'),
-  CANCEL: ('robot:CANCEL': 'robot:CANCEL'),
-  CANCEL_RESPONSE: ('robot:CANCEL_RESPONSE': 'robot:CANCEL_RESPONSE'),
-
-  TICK_RUN_TIME: ('robot:TICK_RUN_TIME': 'robot:TICK_RUN_TIME'),
-}
+  RUN: 'robot:RUN',
+  RUN_RESPONSE: 'robot:RUN_RESPONSE',
+  PAUSE: 'robot:PAUSE',
+  PAUSE_RESPONSE: 'robot:PAUSE_RESPONSE',
+  RESUME: 'robot:RESUME',
+  RESUME_RESPONSE: 'robot:RESUME_RESPONSE',
+  CANCEL: 'robot:CANCEL',
+  CANCEL_RESPONSE: 'robot:CANCEL_RESPONSE',
+
+  TICK_RUN_TIME: 'robot:TICK_RUN_TIME',
+} as const
 
 // TODO(mc, 2018-01-23): NEW ACTION TYPES GO HERE
 export type Action =
@@ -329,7 +330,7 @@ export const actions = {
 
   connectResponse(
     error: Error | null,
-    sessionCapabilities: Array<string> = []
+    sessionCapabilities: string[] = []
   ): ConnectResponseAction {
     return {
       type: 'robot:CONNECT_RESPONSE',
@@ -357,7 +358,7 @@ export const actions = {
   },
 
   sessionResponse(
-    error: ?Error,
+    error: Error | null | undefined,
     // TODO(mc, 2018-01-23): type Session (see reducers/session.js)
     session: any,
     freshUpload: boolean
@@ -397,7 +398,9 @@ export const actions = {
   },
 
   // response for pickup and home
-  pickupAndHomeResponse(error: ?Error = null): CalibrationResponseAction {
+  pickupAndHomeResponse(
+    error: Error | null | undefined = null
+  ): CalibrationResponseAction {
     if (error) {
       return {
         type: 'robot:PICKUP_AND_HOME_FAILURE',
@@ -422,7 +425,9 @@ export const actions = {
   },
 
   // response for drop tip and home
-  dropTipAndHomeResponse(error: ?Error = null): CalibrationResponseAction {
+  dropTipAndHomeResponse(
+    error: Error | null | undefined = null
+  ): CalibrationResponseAction {
     if (error) {
       return {
         type: 'robot:DROP_TIP_AND_HOME_FAILURE',
@@ -449,7 +454,7 @@ export const actions = {
   // response for pickup and home
   // payload.tipOn is a flag for whether a tip remains on the pipette
   confirmTiprackResponse(
-    error: ?Error = null,
+    error: Error | null | undefined = null,
     tipOn: boolean = false
   ): CalibrationResponseAction {
     if (error) {
@@ -474,7 +479,9 @@ export const actions = {
     }
   },
 
-  moveToFrontResponse(error: ?Error = null): MoveToFrontResponseAction {
+  moveToFrontResponse(
+    error: Error | null | undefined = null
+  ): MoveToFrontResponseAction {
     const action: MoveToFrontResponseAction = {
       type: actionTypes.MOVE_TO_FRONT_RESPONSE,
       error: error != null,
@@ -492,7 +499,9 @@ export const actions = {
     }
   },
 
-  probeTipResponse(error: ?Error = null): ProbeTipResponseAction {
+  probeTipResponse(
+    error: Error | null | undefined = null
+  ): ProbeTipResponseAction {
     const action: ProbeTipResponseAction = {
       type: actionTypes.PROBE_TIP_RESPONSE,
       error: error != null,
@@ -519,7 +528,9 @@ export const actions = {
     }
   },
 
-  returnTipResponse(error: ?Error = null): ReturnTipResponseAction {
+  returnTipResponse(
+    error: Error | null | undefined = null
+  ): ReturnTipResponseAction {
     const action: ReturnTipResponseAction = {
       type: actionTypes.RETURN_TIP_RESPONSE,
       error: error != null,
@@ -537,7 +548,9 @@ export const actions = {
     }
   },
 
-  moveToResponse(error: ?Error = null): CalibrationResponseAction {
+  moveToResponse(
+    error: Error | null | undefined = null
+  ): CalibrationResponseAction {
     if (error) {
       return {
         type: 'robot:MOVE_TO_FAILURE',
@@ -566,7 +579,9 @@ export const actions = {
     }
   },
 
-  jogResponse(error: ?Error = null): CalibrationResponseAction {
+  jogResponse(
+    error: Error | null | undefined = null
+  ): CalibrationResponseAction {
     if (error) {
       return {
         type: 'robot:JOG_FAILURE',
@@ -588,7 +603,9 @@ export const actions = {
   },
 
   // response for updateOffset
-  updateOffsetResponse(error: ?Error = null): CalibrationResponseAction {
+  updateOffsetResponse(
+    error: Error | null | undefined = null
+  ): CalibrationResponseAction {
     if (error) {
       return {
         type: 'robot:UPDATE_OFFSET_FAILURE',
@@ -611,7 +628,7 @@ export const actions = {
     return { type: actionTypes.RUN, meta: { robotCommand: true } }
   },
 
-  runResponse(error: ?Error = null): RunResponseAction {
+  runResponse(error: Error | null | undefined = null): RunResponseAction {
     const action: RunResponseAction = {
       type: actionTypes.RUN_RESPONSE,
       error: error != null,
@@ -625,7 +642,7 @@ export const actions = {
     return { type: actionTypes.PAUSE, meta: { robotCommand: true } }
   },
 
-  pauseResponse(error: ?Error = null): PauseResponseAction {
+  pauseResponse(error: Error | null | undefined = null): PauseResponseAction {
     const action: PauseResponseAction = {
       type: actionTypes.PAUSE_RESPONSE,
       error: error != null,
@@ -639,7 +656,7 @@ export const actions = {
     return { type: actionTypes.RESUME, meta: { robotCommand: true } }
   },
 
-  resumeResponse(error: ?Error = null): ResumeResponseAction {
+  resumeResponse(error: Error | null | undefined = null): ResumeResponseAction {
     const action: ResumeResponseAction = {
       type: actionTypes.RESUME_RESPONSE,
       error: error != null,
@@ -653,7 +670,7 @@ export const actions = {
     return { type: actionTypes.CANCEL, meta: { robotCommand: true } }
   },
 
-  cancelResponse(error: ?Error = null): CancelResponseAction {
+  cancelResponse(error: Error | null | undefined = null): CancelResponseAction {
     const action: CancelResponseAction = {
       type: actionTypes.CANCEL_RESPONSE,
       error: error != null,
diff --git a/app/src/redux/robot/api-client/__tests__/create-sessions.test.ts b/app/src/redux/robot/api-client/__tests__/create-sessions.test.js
similarity index 100%
rename from app/src/redux/robot/api-client/__tests__/create-sessions.test.ts
rename to app/src/redux/robot/api-client/__tests__/create-sessions.test.js
diff --git a/app/src/redux/robot/api-client/client.ts b/app/src/redux/robot/api-client/client.js
similarity index 100%
rename from app/src/redux/robot/api-client/client.ts
rename to app/src/redux/robot/api-client/client.js
diff --git a/app/src/redux/robot/api-client/index.ts b/app/src/redux/robot/api-client/index.ts
index bea99e5d595..6a982541aa4 100644
--- a/app/src/redux/robot/api-client/index.ts
+++ b/app/src/redux/robot/api-client/index.ts
@@ -2,12 +2,15 @@
 // wraps the api client worker to handle API side effects in a different thread
 
 import { createLogger } from '../../../logger'
+import type { Action, Middleware } from '../../types'
 
 const log = createLogger(__filename)
 
-const shouldProcess = a => a.meta && (a.meta.robot || a.meta.robotCommand)
+const shouldProcess = (a: Action): boolean =>
+  // @ts-expect-error: make this `meta` access happier for TS
+  a.meta && (a.meta.robot || a.meta.robotCommand)
 
-export function apiClientMiddleware() {
+export function apiClientMiddleware(): Middleware {
   const worker = new Worker('./worker', { type: 'module' })
 
   return store => {
diff --git a/app/src/redux/robot/api-client/worker.ts b/app/src/redux/robot/api-client/worker.js
similarity index 100%
rename from app/src/redux/robot/api-client/worker.ts
rename to app/src/redux/robot/api-client/worker.js
diff --git a/app/src/redux/robot/api-types.ts b/app/src/redux/robot/api-types.ts
index 85c7dd7315c..00371fb4057 100644
--- a/app/src/redux/robot/api-types.ts
+++ b/app/src/redux/robot/api-types.ts
@@ -1,11 +1,7 @@
-// @flow
 //
-import {
-  typeof TEMPDECK,
-  typeof MAGDECK,
-  typeof THERMOCYCLER,
-  type ModuleModel,
-} from '@opentrons/shared-data'
+import { TEMPDECK, MAGDECK, THERMOCYCLER } from '@opentrons/shared-data'
+
+import type { ModuleModel } from '@opentrons/shared-data'
 
 export type Slot =
   | '1'
@@ -20,22 +16,22 @@ export type Slot =
   | '10'
   | '11'
 
-export type ApiSessionModule = {|
+export interface ApiSessionModule {
   // resource ID
-  _id: number,
+  _id: number
   // slot module is installed in
-  slot: Slot,
+  slot: Slot
   // name identifier of the module
-  name: TEMPDECK | MAGDECK | THERMOCYCLER,
-  model: ModuleModel,
-  protocolLoadOrder: number,
-|}
+  name: typeof TEMPDECK | typeof MAGDECK | typeof THERMOCYCLER
+  model: ModuleModel
+  protocolLoadOrder: number
+}
 
-export type ApiSessionModuleLegacy = {|
+export interface ApiSessionModuleLegacy {
   // resource ID
-  _id: number,
+  _id: number
   // slot module is installed in
-  slot: Slot,
+  slot: Slot
   // name identifier of the module
-  name: TEMPDECK | MAGDECK | THERMOCYCLER,
-|}
+  name: typeof TEMPDECK | typeof MAGDECK | typeof THERMOCYCLER
+}
diff --git a/app/src/redux/robot/constants.ts b/app/src/redux/robot/constants.ts
index 8a8f772519e..d3d3bfa08b5 100755
--- a/app/src/redux/robot/constants.ts
+++ b/app/src/redux/robot/constants.ts
@@ -1,4 +1,3 @@
-// @flow
 // robot redux module constants
 import type { Mount, Slot } from './types'
 
@@ -33,8 +32,8 @@ export const DOOR_OPEN: 'open' = 'open'
 export const DOOR_CLOSED: 'closed' = 'closed'
 
 // deck layout
-export const PIPETTE_MOUNTS: Array<Mount> = ['left', 'right']
-export const DECK_SLOTS: Array<Slot> = [
+export const PIPETTE_MOUNTS: Mount[] = ['left', 'right']
+export const DECK_SLOTS: Slot[] = [
   '1',
   '2',
   '3',
diff --git a/app/src/redux/robot/index.ts b/app/src/redux/robot/index.ts
index ef6fbaa2d6d..df8973abfe9 100644
--- a/app/src/redux/robot/index.ts
+++ b/app/src/redux/robot/index.ts
@@ -1,4 +1,3 @@
-// @flow
 // robot state module
 // split up into reducer.js, action.js, etc if / when necessary
 import * as selectors from './selectors'
diff --git a/app/src/redux/robot/reducer/calibration.ts b/app/src/redux/robot/reducer/calibration.ts
index 1b28f0554ac..0e24115ae64 100755
--- a/app/src/redux/robot/reducer/calibration.ts
+++ b/app/src/redux/robot/reducer/calibration.ts
@@ -1,4 +1,3 @@
-// @flow
 // robot calibration state and reducer
 // TODO(mc, 2018-01-10): refactor to use combineReducers
 import mapValues from 'lodash/mapValues'
@@ -40,25 +39,25 @@ type CalibrationRequestType =
   | 'SET_MODULES_REVIEWED'
   | 'RETURN_TIP'
 
-export type CalibrationRequest = $ReadOnly<{|
-  type: CalibrationRequestType,
-  mount?: Mount,
-  slot?: Slot,
-  inProgress: boolean,
-  error: Error | null,
-|}>
+export interface CalibrationRequest {
+  readonly type: CalibrationRequestType
+  readonly mount?: Mount
+  readonly slot?: Slot
+  readonly inProgress: boolean
+  readonly error: Error | null
+}
 
-export type CalibrationState = $ReadOnly<{|
-  deckPopulated: ?boolean,
-  modulesReviewed: ?boolean,
+export interface CalibrationState {
+  readonly deckPopulated: boolean | null | undefined
+  readonly modulesReviewed: boolean | null | undefined
 
-  probedByMount: { [Mount]: boolean },
-  tipOnByMount: { [Mount]: boolean },
+  readonly probedByMount: { [mount in Mount]?: boolean }
+  readonly tipOnByMount: { [mount in Mount]?: boolean }
 
-  confirmedBySlot: { [Slot]: boolean },
+  readonly confirmedBySlot: { [slot in Slot]?: boolean }
 
-  calibrationRequest: CalibrationRequest,
-|}>
+  readonly calibrationRequest: CalibrationRequest
+}
 
 // TODO(mc, 2018-01-11): replace actionType constants with Flow types
 const {
@@ -169,17 +168,17 @@ export function calibrationReducer(
 
     // TODO(mc, 20187-01-26): caution - not covered by flow yet
     case SET_DECK_POPULATED:
-      return handleSetDeckPopulated(state, action)
+      return handleSetDeckPopulated(state, action as any)
     case MOVE_TO_FRONT:
-      return handleMoveToFront(state, action)
+      return handleMoveToFront(state, action as any)
     case MOVE_TO_FRONT_RESPONSE:
-      return handleMoveToFrontResponse(state, action)
+      return handleMoveToFrontResponse(state, action as any)
     case PROBE_TIP:
-      return handleProbeTip(state, action)
+      return handleProbeTip(state, action as any)
     case PROBE_TIP_RESPONSE:
-      return handleProbeTipResponse(state, action)
+      return handleProbeTipResponse(state, action as any)
     case CONFIRM_LABWARE:
-      return handleConfirmLabware(state, action)
+      return handleConfirmLabware(state, action as any)
   }
 
   return state
diff --git a/app/src/redux/robot/reducer/connection.ts b/app/src/redux/robot/reducer/connection.ts
index 27c438c98d7..05fb4f03b6d 100644
--- a/app/src/redux/robot/reducer/connection.ts
+++ b/app/src/redux/robot/reducer/connection.ts
@@ -1,4 +1,3 @@
-// @flow
 // robot connection state and reducer
 import type { Action } from '../../types'
 
@@ -10,19 +9,19 @@ import type {
   DisconnectResponseAction,
 } from '../actions'
 
-export type ConnectionState = {|
-  connectedTo: ?string,
-  connectRequest: {|
-    inProgress: boolean,
-    error: ?{ message?: string, ... },
-    name: string,
-  |},
-  disconnectRequest: {|
-    inProgress: boolean,
-    error: ?{ message?: string, ... },
-  |},
-  unexpectedDisconnect: boolean,
-|}
+export interface ConnectionState {
+  connectedTo: string | null | undefined
+  connectRequest: {
+    inProgress: boolean
+    error: { message?: string; [key: string]: unknown } | null | undefined
+    name: string
+  }
+  disconnectRequest: {
+    inProgress: boolean
+    error: { message?: string; [key: string]: unknown } | null | undefined
+  }
+  unexpectedDisconnect: boolean
+}
 
 const INITIAL_STATE: ConnectionState = {
   connectedTo: null,
@@ -32,7 +31,7 @@ const INITIAL_STATE: ConnectionState = {
 }
 
 export function connectionReducer(
-  state?: ConnectionState,
+  state: ConnectionState | null,
   action: Action
 ): ConnectionState {
   if (state == null) return INITIAL_STATE
@@ -78,7 +77,7 @@ function handleConnectResponse(
   action: ConnectResponseAction
 ): ConnectionState {
   const error = action.payload.error || null
-  let connectedTo = state.connectRequest.name
+  let connectedTo: string | null = state.connectRequest.name
   let requestName = ''
 
   if (error) {
diff --git a/app/src/redux/robot/reducer/index.ts b/app/src/redux/robot/reducer/index.ts
index 46b5e8062d0..a1f641f7efc 100644
--- a/app/src/redux/robot/reducer/index.ts
+++ b/app/src/redux/robot/reducer/index.ts
@@ -1,4 +1,3 @@
-// @flow
 // robot reducer
 import { combineReducers } from 'redux'
 
@@ -12,14 +11,14 @@ import type { ConnectionState } from './connection'
 import type { SessionState } from './session'
 import type { CalibrationState } from './calibration'
 
-export type RobotState = {|
-  connection: ConnectionState,
-  session: SessionState,
-  calibration: CalibrationState,
-|}
-
+export interface RobotState {
+  connection: ConnectionState
+  session: SessionState
+  calibration: CalibrationState
+}
+// TODO: (sa 2021-15-18: remove any typed state in combineReducers)
 export const robotReducer: Reducer<RobotState, Action> = combineReducers<
-  _,
+  any,
   Action
 >({
   connection: connectionReducer,
diff --git a/app/src/redux/robot/reducer/session.ts b/app/src/redux/robot/reducer/session.ts
index 07ba0f0e571..0287dd249c3 100644
--- a/app/src/redux/robot/reducer/session.ts
+++ b/app/src/redux/robot/reducer/session.ts
@@ -1,4 +1,3 @@
-// @flow
 // robot session (protocol) state and reducer
 import omit from 'lodash/omit'
 import { actionTypes } from '../actions'
@@ -19,46 +18,34 @@ import type {
 import type { InvalidProtocolFileAction } from '../../protocol/types'
 import type { SessionUpdateAction } from '../actions'
 
-type Request = {
-  inProgress: boolean,
-  error: ?{ message: string },
+export interface Request {
+  inProgress: boolean
+  error: { message: string } | null | undefined
 }
 
-export type SessionState = {
-  sessionRequest: Request,
-  state: SessionStatus,
-  statusInfo: SessionStatusInfo,
+export interface SessionState {
+  sessionRequest: Request
+  state: SessionStatus
+  statusInfo: SessionStatusInfo
   // TODO(aa, 2020-06-01): DoorState is not currently used anywhere yet
-  doorState: DoorState,
-  blocked: boolean,
-  errors: Array<{|
-    timestamp: number,
-    line: number,
-    message: string,
-  |}>,
+  doorState: DoorState
+  blocked: boolean
+  errors: Array<{ timestamp: number; line: number; message: string }>
   // TODO(mc, 2018-01-11): command IDs should be strings
-  protocolCommands: Array<number>,
-  protocolCommandsById: {
-    [number]: Command,
-  },
-  pipettesByMount: {
-    [Mount]: StatePipette,
-  },
-  labwareBySlot: {
-    [Slot]: StateLabware,
-  },
-  modulesBySlot: {
-    [Slot]: SessionModule,
-  },
-  runRequest: Request,
-  pauseRequest: Request,
-  resumeRequest: Request,
-  cancelRequest: Request,
-  remoteTimeCompensation: number | null,
-  startTime: ?number,
-  runTime: number,
-  apiLevel: [number, number] | null,
-  capabilities: Array<string>,
+  protocolCommands: number[]
+  protocolCommandsById: { [id: number]: Command }
+  pipettesByMount: { [mount in Mount]?: StatePipette }
+  labwareBySlot: { [slot in Slot]?: StateLabware }
+  modulesBySlot: { [slot in Slot]?: SessionModule }
+  runRequest: Request
+  pauseRequest: Request
+  resumeRequest: Request
+  cancelRequest: Request
+  remoteTimeCompensation: number | null
+  startTime: number | null | undefined
+  runTime: number
+  apiLevel: [number, number] | null
+  capabilities: string[]
 }
 
 // TODO(mc, 2018-01-11): replace actionType constants with Flow types
diff --git a/app/src/redux/robot/selectors.ts b/app/src/redux/robot/selectors.ts
index c32d9f9f3f3..e4b9a0e03e6 100644
--- a/app/src/redux/robot/selectors.ts
+++ b/app/src/redux/robot/selectors.ts
@@ -1,4 +1,3 @@
-// @flow
 // robot selectors
 import { head } from 'lodash'
 import padStart from 'lodash/padStart'
@@ -29,25 +28,30 @@ import type {
   SessionModule,
   TipracksByMountMap,
   NextTiprackPipetteInfo,
+  Command,
   CommandNode,
 } from './types'
 
 import type { ConnectionState } from './reducer/connection'
-import type { CalibrationRequest } from './reducer/calibration'
-import type { ModuleModel } from '@opentrons/shared-data'
+import type {
+  CalibrationRequest,
+  CalibrationState,
+} from './reducer/calibration'
+import type { SessionState, Request } from './reducer/session'
+import type { PipetteModel, ModuleModel } from '@opentrons/shared-data'
 
-const calibration = (state: State) => state.robot.calibration
-const connection = (state: State) => state.robot.connection
-const session = (state: State) => state.robot.session
-const sessionRequest = (state: State) => session(state).sessionRequest
-const cancelRequest = (state: State) => session(state).cancelRequest
+const calibration = (state: State): CalibrationState => state.robot.calibration
+const connection = (state: State): ConnectionState => state.robot.connection
+const session = (state: State): SessionState => state.robot.session
+const sessionRequest = (state: State): Request => session(state).sessionRequest
+const cancelRequest = (state: State): Request => session(state).cancelRequest
 
-export function isMount(target: ?string): boolean {
-  return Constants.PIPETTE_MOUNTS.indexOf(target) > -1
+export function isMount(target: string | null | undefined): boolean {
+  return Constants.PIPETTE_MOUNTS.includes(target as Mount)
 }
 
-export function isSlot(target: ?string): boolean {
-  return Constants.DECK_SLOTS.indexOf(target) > -1
+export function isSlot(target: string | null | undefined): boolean {
+  return Constants.DECK_SLOTS.includes(target as Slot)
 }
 
 export function labwareType(labware: Labware): LabwareType {
@@ -56,7 +60,7 @@ export function labwareType(labware: Labware): LabwareType {
 
 export function getConnectRequest(
   state: State
-): $PropertyType<ConnectionState, 'connectRequest'> {
+): ConnectionState['connectRequest'] {
   return connection(state).connectRequest
 }
 
@@ -64,7 +68,9 @@ export function getConnectedRobotName(state: State): string | null {
   return connection(state).connectedTo || null
 }
 
-export const getConnectionStatus: State => ConnectionStatus = createSelector(
+export const getConnectionStatus: (
+  state: State
+) => ConnectionStatus = createSelector(
   getConnectedRobotName,
   state => getConnectRequest(state).inProgress,
   state => connection(state).disconnectRequest.inProgress,
@@ -79,7 +85,7 @@ export const getConnectionStatus: State => ConnectionStatus = createSelector(
   }
 )
 
-export function getSessionCapabilities(state: State): Array<string> {
+export function getSessionCapabilities(state: State): string[] {
   return session(state).capabilities
 }
 
@@ -87,7 +93,9 @@ export function getSessionLoadInProgress(state: State): boolean {
   return sessionRequest(state).inProgress
 }
 
-export function getUploadError(state: State): ?{ message: string, ... } {
+export function getUploadError(
+  state: State
+): { message: string; [key: string]: unknown } | null | undefined {
   return sessionRequest(state).error
 }
 
@@ -100,24 +108,24 @@ export function getSessionStatusInfo(state: State): SessionStatusInfo {
 }
 
 export function getSessionIsLoaded(state: State): boolean {
-  return getSessionStatus(state) !== ('': SessionStatus)
+  return getSessionStatus(state) !== ('' as SessionStatus)
 }
 
 export function getIsReadyToRun(state: State): boolean {
-  return getSessionStatus(state) === ('loaded': SessionStatus)
+  return getSessionStatus(state) === ('loaded' as SessionStatus)
 }
 
 export function getIsRunning(state: State): boolean {
   const status = getSessionStatus(state)
 
   return (
-    status === ('running': SessionStatus) ||
-    status === ('paused': SessionStatus)
+    status === ('running' as SessionStatus) ||
+    status === ('paused' as SessionStatus)
   )
 }
 
 export function getIsPaused(state: State): boolean {
-  return getSessionStatus(state) === ('paused': SessionStatus)
+  return getSessionStatus(state) === ('paused' as SessionStatus)
 }
 
 export function getIsBlocked(state: State): boolean {
@@ -132,17 +140,17 @@ export function getIsDone(state: State): boolean {
   const status = getSessionStatus(state)
 
   return (
-    status === ('error': SessionStatus) ||
-    status === ('finished': SessionStatus) ||
-    status === ('stopped': SessionStatus)
+    status === ('error' as SessionStatus) ||
+    status === ('finished' as SessionStatus) ||
+    status === ('stopped' as SessionStatus)
   )
 }
 
 // helper function for getCommands selector
 function traverseCommands(
-  commandsById,
-  parentIsCurrent
-): (id: number, index: number, commands: Array<number>) => CommandNode {
+  commandsById: Record<number, Command>,
+  parentIsCurrent: boolean
+): (id: number, index: number, commands: number[]) => CommandNode {
   return function mapIdToCommand(id, index, commands) {
     const { description, handledAt, children } = commandsById[id]
     const next = commandsById[commands[index + 1]]
@@ -163,20 +171,23 @@ function traverseCommands(
   }
 }
 
-export const getCommands: State => Array<CommandNode> = createSelector(
+export const getCommands: (state: State) => CommandNode[] = createSelector(
   (state: State) => session(state).protocolCommands,
   (state: State) => session(state).protocolCommandsById,
   (commands, commandsById) => commands.map(traverseCommands(commandsById, true))
 )
 
-export const getRunProgress: State => number = createSelector(
+export const getRunProgress: (state: State) => number = createSelector(
   getCommands,
   (commands): number => {
     const leaves = commands.reduce(countLeaves, { handled: 0, total: 0 })
 
     return leaves.total && (leaves.handled / leaves.total) * 100
 
-    function countLeaves(result, command) {
+    function countLeaves(
+      result: { handled: number; total: number },
+      command: CommandNode
+    ): { handled: number; total: number } {
       let { handled, total } = result
 
       if (command.children.length) {
@@ -191,7 +202,7 @@ export const getRunProgress: State => number = createSelector(
   }
 )
 
-export const getSessionError: State => string | null = createSelector(
+export const getSessionError: (state: State) => string | null = createSelector(
   (state: State) => session(state).runRequest.error,
   (state: State) => session(state).errors,
   (runError, sessionErrors) => {
@@ -218,10 +229,13 @@ export const getStartTime: (state: State) => string | null = createSelector(
   }
 )
 
-export const getRunSeconds: State => number = createSelector(
+export const getRunSeconds: (state: State) => number = createSelector(
   getStartTimeMs,
   (state: State) => session(state).runTime,
-  (startTime: ?number, runTime: ?number): number => {
+  (
+    startTime: number | null | undefined,
+    runTime: number | null | undefined
+  ): number => {
     return runTime && startTime && runTime > startTime
       ? Math.floor((runTime - startTime) / 1000)
       : 0
@@ -236,7 +250,7 @@ export function formatSeconds(runSeconds: number): string {
   return `${hours}:${minutes}:${seconds}`
 }
 
-export const getRunTime: State => string = createSelector(
+export const getRunTime: (state: State) => string = createSelector(
   getRunSeconds,
   formatSeconds
 )
@@ -247,29 +261,35 @@ export function getCalibrationRequest(state: State): CalibrationRequest {
 
 export function getPipettesByMount(
   state: State
-): { [Mount]: StatePipette, ... } {
+): { [mount in Mount]?: StatePipette } {
   return session(state).pipettesByMount
 }
 
-export const getPipettes: State => Array<Pipette> = createSelector(
+export const getPipettes: (state: State) => Pipette[] = createSelector(
   getPipettesByMount,
-  (state: State) => calibration(state).probedByMount,
+  (state: State): { [mount in Mount]?: boolean } =>
+    calibration(state).probedByMount,
   (state: State) => calibration(state).tipOnByMount,
-  (pipettesByMount, probedByMount, tipOnByMount): Array<Pipette> => {
+  (
+    pipettesByMount: { [mount in Mount]?: StatePipette },
+    probedByMount: { [mount in Mount]?: boolean },
+    tipOnByMount: { [mount in Mount]?: boolean }
+  ): Pipette[] => {
     return Constants.PIPETTE_MOUNTS.filter(
-      mount => pipettesByMount[mount] != null
+      (mount: Mount) => pipettesByMount[mount] != null
     ).map(mount => {
-      const pipette = pipettesByMount[mount]
+      const pipette = pipettesByMount[mount] as StatePipette
       const probed = probedByMount[mount] || false
       const tipOn = tipOnByMount[mount] || false
 
-      return {
+      const fullPipette: Pipette = {
         ...pipette,
         probed,
         tipOn,
-        modelSpecs: getPipetteModelSpecs(pipette.name) || null,
-        requestedAs: pipette.requestedAs || null,
+        modelSpecs: getPipetteModelSpecs(pipette?.name as PipetteModel) || null,
+        requestedAs: pipette?.requestedAs || null,
       }
+      return fullPipette
     })
   }
 )
@@ -278,7 +298,7 @@ export function getApiLevel(state: State): [number, number] | null {
   return session(state).apiLevel
 }
 
-export const getNextPipette: State => Pipette | null = createSelector(
+export const getNextPipette: (state: State) => Pipette | null = createSelector(
   getPipettes,
   (pipettes): Pipette | null => {
     const usedPipettes = pipettes.filter(p => p.tipRacks.length > 0)
@@ -290,58 +310,75 @@ export const getNextPipette: State => Pipette | null = createSelector(
 
 // returns the mount of the pipette to use for labware calibration
 // TODO(mc, 2018-02-07): be smarter about the backup case
-export const getCalibrator: State => Pipette | void = createSelector(
+export const getCalibrator: (
+  state: State
+) => Pipette | undefined = createSelector(
   getPipettes,
   pipettes => pipettes.find(i => i.tipOn) ?? pipettes[0]
 )
 
 // TODO(mc, 2018-02-07): remove this selector in favor of the one above
-export function getCalibratorMount(state: State): ?Mount {
-  const calibrator: ?Pipette = getCalibrator(state)
+export function getCalibratorMount(state: State): Mount | null | undefined {
+  const calibrator: Pipette | undefined = getCalibrator(state)
 
   if (!calibrator) return null
 
   return calibrator.mount
 }
 
-export const getPipettesCalibrated: State => boolean = createSelector(
+export const getPipettesCalibrated: (state: State) => boolean = createSelector(
   getPipettes,
   pipettes => pipettes.length !== 0 && pipettes.every(i => i.probed)
 )
 
-export function getModulesBySlot(state: State): { [Slot]: SessionModule } {
+export function getModulesBySlot(
+  state: State
+): { [slot in Slot]?: SessionModule } {
   return session(state).modulesBySlot
 }
 
-export const getModules: State => Array<SessionModule> = createSelector(
+export const getModules: (state: State) => SessionModule[] = createSelector(
   getModulesBySlot,
   modulesBySlot =>
-    Object.keys(modulesBySlot).map((slot: Slot) => modulesBySlot[slot])
+    Object.keys(modulesBySlot)
+      .map<SessionModule | undefined>(
+        (slot: string) => modulesBySlot[slot as keyof typeof modulesBySlot]
+      )
+      .filter<SessionModule>(
+        (s: SessionModule | undefined): s is SessionModule => s !== undefined
+      )
 )
 
-export const getModulesByProtocolLoadOrder: State => Array<SessionModule> = createSelector(
-  getModules,
-  modules =>
-    modules.slice().sort((a, b) => a.protocolLoadOrder - b.protocolLoadOrder)
+export const getModulesByProtocolLoadOrder: (
+  state: State
+) => SessionModule[] = createSelector(getModules, modules =>
+  modules.slice().sort((a, b) => a.protocolLoadOrder - b.protocolLoadOrder)
 )
 
-export const getModulesByModel: State => {
-  [ModuleModel]: Array<SessionModule>,
+export const getModulesByModel: (
+  state: State
+) => {
+  [model in ModuleModel]?: SessionModule[]
 } = createSelector(getModules, modules => {
-  return modules.reduce((acc, val) => {
-    if (!acc[val.model]) {
-      acc[val.model] = []
-    }
-    acc[val.model].push(val)
-    return acc
-  }, {})
+  return modules.reduce<{ [model in ModuleModel]?: SessionModule[] }>(
+    (acc, val) => {
+      if (!acc[val.model]) {
+        acc[val.model] = []
+      }
+      acc[val.model]?.push(val)
+      return acc
+    },
+    {}
+  )
 })
 
-export function getLabwareBySlot(state: State): { [Slot]: StateLabware, ... } {
+export function getLabwareBySlot(
+  state: State
+): { [key in Slot]?: StateLabware } {
   return session(state).labwareBySlot
 }
 
-export const getLabware: State => Array<Labware> = createSelector(
+export const getLabware: (state: State) => Labware[] = createSelector(
   getPipettesByMount,
   getLabwareBySlot,
   (state: State) => calibration(state).confirmedBySlot,
@@ -360,9 +397,9 @@ export const getLabware: State => Array<Labware> = createSelector(
   ): Labware[] => {
     return Object.keys(lwBySlot)
       .filter(isSlot)
-      .map<Labware>((slot: Slot) => {
-        const labware = lwBySlot[slot]
-        const { type, isTiprack, isLegacy } = labware
+      .map(slot => {
+        const labware = lwBySlot[slot as Slot] as Labware
+        const { type, isTiprack, isLegacy } = labware ?? {}
 
         let definition = null
         if (!isLegacy) {
@@ -381,12 +418,13 @@ export const getLabware: State => Array<Labware> = createSelector(
         // type of parent (e.g. slot, tempdeck, thermocycler) is confirmed
         const confirmed = some(
           confirmedBySlot,
-          (value: boolean, key: Slot) =>
+          (value: boolean | undefined, key: string) =>
             value === true &&
             (key === slot ||
               (!isTiprack &&
-                type === lwBySlot[key].type &&
-                modulesBySlot[key]?.model === modulesBySlot[slot]?.model))
+                type === lwBySlot[key as Slot]?.type &&
+                modulesBySlot[key as Slot]?.model ===
+                  modulesBySlot[slot as Slot]?.model))
         )
 
         let calibration: LabwareCalibrationStatus = 'unconfirmed'
@@ -412,7 +450,14 @@ export const getLabware: State => Array<Labware> = createSelector(
           }
         }
 
-        return { ...labware, calibration, confirmed, isMoving, definition }
+        const fullLabware: Labware = {
+          ...labware,
+          calibration,
+          confirmed,
+          isMoving,
+          definition,
+        }
+        return fullLabware
       })
       .sort((a, b) => {
         if (a.isTiprack && !b.isTiprack) return -1
@@ -420,13 +465,13 @@ export const getLabware: State => Array<Labware> = createSelector(
         if (!a.isTiprack && !b.isTiprack) return 0
 
         // both a and b are tipracks, sort multi-channel calibrators first
-        const aChannels =
+        const aChannels: number =
           a.calibratorMount != null
-            ? instByMount[a.calibratorMount].channels
+            ? instByMount[a.calibratorMount as Mount]?.channels ?? 0
             : 0
-        const bChannels =
+        const bChannels: number =
           b.calibratorMount != null
-            ? instByMount[b.calibratorMount].channels
+            ? instByMount[b.calibratorMount as Mount]?.channels ?? 0
             : 0
 
         return bChannels - aChannels
@@ -443,38 +488,44 @@ export function getDeckPopulated(state: State): boolean | null {
   return deckPopulated != null ? deckPopulated : null
 }
 
-export const getUnconfirmedLabware: State => Array<Labware> = createSelector(
-  getLabware,
-  labware => labware.filter(lw => lw.type && !lw.confirmed)
+export const getUnconfirmedLabware: (
+  state: State
+) => Labware[] = createSelector(getLabware, labware =>
+  labware.filter(lw => lw.type && !lw.confirmed)
 )
 
-export const getTipracks: State => Array<Labware> = createSelector(
-  getLabware,
-  labware => labware.filter(lw => lw.type && lw.isTiprack)
+export const getTipracks: (
+  state: State
+) => Labware[] = createSelector(getLabware, labware =>
+  labware.filter(lw => lw.type && lw.isTiprack)
 )
 
-export const getNotTipracks: State => Array<Labware> = createSelector(
-  getLabware,
-  labware => labware.filter(lw => lw.type && !lw.isTiprack)
+export const getNotTipracks: (
+  state: State
+) => Labware[] = createSelector(getLabware, labware =>
+  labware.filter(lw => lw.type && !lw.isTiprack)
 )
 
-export const getUnconfirmedTipracks: State => Array<Labware> = createSelector(
-  getUnconfirmedLabware,
-  labware => labware.filter(lw => lw.type && lw.isTiprack)
+export const getUnconfirmedTipracks: (
+  state: State
+) => Labware[] = createSelector(getUnconfirmedLabware, labware =>
+  labware.filter(lw => lw.type && lw.isTiprack)
 )
 
-export const getNextLabware: State => Labware | void = createSelector(
+export const getNextLabware: (
+  state: State
+) => Labware | null | undefined = createSelector(
   getUnconfirmedTipracks,
   getUnconfirmedLabware,
   (tipracks, labware) => tipracks[0] ?? labware[0]
 )
 
-export const getTipracksConfirmed: State => boolean = createSelector(
+export const getTipracksConfirmed: (state: State) => boolean = createSelector(
   getUnconfirmedTipracks,
   remaining => remaining.length === 0
 )
 
-export const getLabwareConfirmed: State => boolean = createSelector(
+export const getLabwareConfirmed: (state: State) => boolean = createSelector(
   getUnconfirmedLabware,
   remaining => remaining.length === 0
 )
diff --git a/app/src/redux/robot/test/actions.test.ts b/app/src/redux/robot/test/actions.test.ts
index df6a2d292e0..76e82f85e6f 100644
--- a/app/src/redux/robot/test/actions.test.ts
+++ b/app/src/redux/robot/test/actions.test.ts
@@ -1,5 +1,6 @@
 // robot actions tests
 import { actions, actionTypes } from '../'
+import type { SessionUpdate } from '../types'
 
 describe('robot actions', () => {
   it('CONNECT action', () => {
@@ -70,7 +71,8 @@ describe('robot actions', () => {
   })
 
   it('SESSION_UPDATE action', () => {
-    const update = { state: 'running', startTime: 1 }
+    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+    const update = { state: 'running', startTime: 1 } as SessionUpdate
     const expected = {
       type: 'robot:SESSION_UPDATE',
       payload: update,
diff --git a/app/src/redux/robot/test/api-client.test.ts b/app/src/redux/robot/test/api-client.test.ts
index 53ca8db4c37..3c18a5340d5 100755
--- a/app/src/redux/robot/test/api-client.test.ts
+++ b/app/src/redux/robot/test/api-client.test.ts
@@ -2,8 +2,9 @@
 import functions from 'lodash/functions'
 import omit from 'lodash/omit'
 import { push } from 'connected-react-router'
-
+// @ts-expect-error(sa, 2021-05-17): api client is not typed yet
 import { client } from '../api-client/client'
+// @ts-expect-error(sa, 2021-05-17): rpc client is not typed yet
 import { Client as RpcClient } from '../../../rpc/client'
 import { actions, constants } from '../'
 import * as AdminActions from '../../robot-admin/actions'
@@ -16,26 +17,40 @@ import {
 import { MockCalibrationManager } from './__fixtures__/calibration-manager'
 import { mockConnectableRobot } from '../../discovery/__fixtures__'
 
-import { getConnectableRobots } from '../../discovery/selectors'
-import { getLabwareDefBySlot } from '../../protocol/selectors'
-import { getCustomLabwareDefinitions } from '../../custom-labware/selectors'
+import * as discoSelectors from '../../discovery/selectors'
+import * as protocolSelectors from '../../protocol/selectors'
+import * as customLwSelectors from '../../custom-labware/selectors'
+
+import type { Dispatch } from 'redux'
+import type { State, Action } from '../../types'
 
 jest.mock('../../../rpc/client')
 jest.mock('../../discovery/selectors')
 jest.mock('../../protocol/selectors')
 jest.mock('../../custom-labware/selectors')
 
-const delay = ms => new Promise(resolve => setTimeout(resolve, ms))
+const getLabwareDefBySlot = protocolSelectors.getLabwareDefBySlot as jest.MockedFunction<
+  typeof protocolSelectors.getLabwareDefBySlot
+>
+const getCustomLabwareDefinitions = customLwSelectors.getCustomLabwareDefinitions as jest.MockedFunction<
+  typeof customLwSelectors.getCustomLabwareDefinitions
+>
+const getConnectableRobots = discoSelectors.getConnectableRobots as jest.MockedFunction<
+  typeof discoSelectors.getConnectableRobots
+>
+
+const delay = (ms: number): Promise<ReturnType<typeof setTimeout>> =>
+  new Promise(resolve => setTimeout(resolve, ms))
 
 describe('api client', () => {
-  let dispatch
-  let sendToClient
-  let rpcClient
-  let session
-  let sessionManager
-  let calibrationManager
-
-  let _global = {}
+  let dispatch: jest.MockedFunction<Dispatch>
+  let sendToClient: (state: State, action: Action) => Promise<unknown>
+  let rpcClient: any
+  let session: any
+  let sessionManager: any
+  let calibrationManager: any
+
+  let _global: { [key: string]: unknown } = {}
   beforeAll(() => {
     _global = { setInterval, clearInterval }
 
@@ -92,26 +107,28 @@ describe('api client', () => {
 
   const ROBOT_NAME = mockConnectableRobot.name
   const ROBOT_IP = mockConnectableRobot.ip
-  const STATE = {
+  const STATE: State = {
     robot: {
       connection: {
         connectedTo: '',
         connectRequest: { inProgress: false },
       },
     },
-  }
+  } as any
 
-  const sendConnect = () => sendToClient(STATE, actions.connect(ROBOT_NAME))
+  const sendConnect = (): Promise<unknown> =>
+    sendToClient(STATE, actions.connect(ROBOT_NAME))
 
-  const sendDisconnect = () => sendToClient(STATE, actions.disconnect())
+  const sendDisconnect = (): Promise<unknown> =>
+    sendToClient(STATE, actions.disconnect())
 
-  const sendNotification = (topic, payload) => {
+  const sendNotification = (topic: any, payload: any): void => {
     expect(rpcClient.on).toHaveBeenCalledWith(
       'notification',
       expect.any(Function)
     )
 
-    const handler = rpcClient.on.mock.calls.find(args => {
+    const handler = rpcClient.on.mock.calls.find((args: any) => {
       return args[0] === 'notification'
     })[1]
 
@@ -174,10 +191,10 @@ describe('api client', () => {
     })
 
     it('disconnects RPC client on robotAdmin:RESTART message', () => {
-      const state = {
+      const state: State = {
         ...STATE,
         robot: { ...STATE.robot, connection: { connectedTo: ROBOT_NAME } },
-      }
+      } as any
       const expected = actions.disconnectResponse()
 
       return sendConnect()
@@ -206,13 +223,13 @@ describe('api client', () => {
     })
 
     it('will not try to connect multiple RpcClients at one time', () => {
-      const state = {
+      const state: State = {
         ...STATE,
         robot: {
           ...STATE.robot,
           connection: { connectRequest: { inProgress: true } },
         },
-      }
+      } as any
 
       return sendToClient(state, actions.connect(ROBOT_NAME)).then(() => {
         expect(RpcClient).toHaveBeenCalledTimes(0)
@@ -227,7 +244,7 @@ describe('api client', () => {
       session.run.mockResolvedValue()
 
       return sendConnect()
-        .then(() => sendToClient({}, actions.run()))
+        .then(() => sendToClient({} as any, actions.run()))
         .then(() => {
           expect(session.run).toHaveBeenCalled()
           expect(dispatch).toHaveBeenCalledWith(expected)
@@ -240,7 +257,7 @@ describe('api client', () => {
       session.run.mockRejectedValue(new Error('AH'))
 
       return sendConnect()
-        .then(() => sendToClient({}, actions.run()))
+        .then(() => sendToClient({} as any, actions.run()))
         .then(() => expect(dispatch).toHaveBeenCalledWith(expected))
     })
 
@@ -250,7 +267,7 @@ describe('api client', () => {
       session.pause.mockResolvedValue()
 
       return sendConnect()
-        .then(() => sendToClient({}, actions.pause()))
+        .then(() => sendToClient({} as any, actions.pause()))
         .then(() => {
           expect(session.pause).toHaveBeenCalled()
           expect(dispatch).toHaveBeenCalledWith(expected)
@@ -263,7 +280,7 @@ describe('api client', () => {
       session.pause.mockRejectedValue(new Error('AH'))
 
       return sendConnect()
-        .then(() => sendToClient({}, actions.pause()))
+        .then(() => sendToClient({} as any, actions.pause()))
         .then(() => expect(dispatch).toHaveBeenCalledWith(expected))
     })
 
@@ -273,7 +290,7 @@ describe('api client', () => {
       session.resume.mockResolvedValue()
 
       return sendConnect()
-        .then(() => sendToClient({}, actions.resume()))
+        .then(() => sendToClient({} as any, actions.resume()))
         .then(() => {
           expect(session.resume).toHaveBeenCalled()
           expect(dispatch).toHaveBeenCalledWith(expected)
@@ -286,7 +303,7 @@ describe('api client', () => {
       session.resume.mockRejectedValue(new Error('AH'))
 
       return sendConnect()
-        .then(() => sendToClient({}, actions.resume()))
+        .then(() => sendToClient({} as any, actions.resume()))
         .then(() => expect(dispatch).toHaveBeenCalledWith(expected))
     })
 
@@ -297,7 +314,7 @@ describe('api client', () => {
       session.stop.mockResolvedValue()
 
       return sendConnect()
-        .then(() => sendToClient({}, actions.cancel()))
+        .then(() => sendToClient({} as any, actions.cancel()))
         .then(() => {
           expect(session.resume).toHaveBeenCalled()
           expect(session.stop).toHaveBeenCalled()
@@ -312,7 +329,7 @@ describe('api client', () => {
       session.stop.mockRejectedValue(new Error('AH'))
 
       return sendConnect()
-        .then(() => sendToClient({}, actions.cancel()))
+        .then(() => sendToClient({} as any, actions.cancel()))
         .then(() => expect(dispatch).toHaveBeenCalledWith(expected))
     })
 
@@ -320,7 +337,7 @@ describe('api client', () => {
       session.refresh.mockResolvedValue()
 
       return sendConnect()
-        .then(() => sendToClient({}, actions.refreshSession()))
+        .then(() => sendToClient({} as any, actions.refreshSession()))
         .then(() => expect(session.refresh).toHaveBeenCalled())
     })
 
@@ -328,13 +345,13 @@ describe('api client', () => {
       session.run.mockResolvedValue()
 
       return sendConnect()
-        .then(() => sendToClient({}, actions.run()))
+        .then(() => sendToClient({} as any, actions.run()))
         .then(() => expect(global.setInterval).toHaveBeenCalled())
     })
   })
 
   describe('session responses', () => {
-    let expectedInitial
+    let expectedInitial: ReturnType<typeof actions.sessionResponse>
 
     beforeEach(() => {
       expectedInitial = actions.sessionResponse(
@@ -812,7 +829,7 @@ describe('api client', () => {
         },
         doorState: null,
         blocked: false,
-      }
+      } as any
       const expected = actions.sessionUpdate(actionInput, expect.any(Number))
 
       return sendConnect()
@@ -844,7 +861,7 @@ describe('api client', () => {
           changedAt: null,
           estimatedDuration: null,
         },
-      }
+      } as any
       const expected = actions.sessionUpdate(actionInput, expect.any(Number))
 
       return sendConnect()
@@ -881,7 +898,7 @@ describe('api client', () => {
           changedAt: 2,
           estimatedDuration: null,
         },
-      }
+      } as any
       const expected = actions.sessionUpdate(actionInput, expect.any(Number))
 
       return sendConnect()
@@ -912,7 +929,7 @@ describe('api client', () => {
           changedAt: null,
           estimatedDuration: null,
         },
-      }
+      } as any
       const expected = actions.sessionUpdate(actionInput, expect.any(Number))
 
       return sendConnect()
@@ -925,7 +942,7 @@ describe('api client', () => {
   })
 
   describe('calibration', () => {
-    let state
+    let state: State
     beforeEach(() => {
       state = {
         robot: {
@@ -956,7 +973,7 @@ describe('api client', () => {
             },
           },
         },
-      }
+      } as any
     })
 
     it('handles MOVE_TO_FRONT success', () => {
@@ -1221,7 +1238,8 @@ describe('api client', () => {
     })
 
     it('handles UPDATE_OFFSET success', () => {
-      const action = actions.updateOffset('left', 1)
+      const action = actions.updateOffset('left', 1 as any)
+      // @ts-expect-error actions.updateOffsetResponse only takes one arg but we're giving two here
       const expectedResponse = actions.updateOffsetResponse(null, false)
 
       calibrationManager.update_container_offset.mockResolvedValue()
@@ -1237,7 +1255,7 @@ describe('api client', () => {
     })
 
     it('handles UPDATE_OFFSET failure', () => {
-      const action = actions.updateOffset('left', 9)
+      const action = actions.updateOffset('left', 9 as any)
       const expectedResponse = actions.updateOffsetResponse(new Error('AH'))
 
       calibrationManager.update_container_offset.mockRejectedValue(
diff --git a/app/src/redux/robot/test/calibration-reducer.test.ts b/app/src/redux/robot/test/calibration-reducer.test.ts
index 14823766764..076c3300bfe 100644
--- a/app/src/redux/robot/test/calibration-reducer.test.ts
+++ b/app/src/redux/robot/test/calibration-reducer.test.ts
@@ -2,6 +2,9 @@
 import { HOME } from '../../robot-controls'
 import { robotReducer as reducer, actionTypes } from '..'
 
+import type { Action } from '../../types'
+import type { RobotState } from '..'
+
 const EXPECTED_INITIAL_STATE = {
   deckPopulated: null,
   modulesReviewed: null,
@@ -20,71 +23,84 @@ const EXPECTED_INITIAL_STATE = {
 
 describe('robot reducer - calibration', () => {
   it('initial state', () => {
-    const state = reducer(undefined, {})
+    const state = reducer(undefined, {} as any)
 
     expect(state.calibration).toEqual(EXPECTED_INITIAL_STATE)
   })
 
   it('handles robot:REFRESH_SESSION', () => {
     const state = reducer(
-      { calibration: {} },
-      { type: 'robot:REFRESH_SESSION' }
+      { calibration: {} } as any,
+      { type: 'robot:REFRESH_SESSION' } as any
     )
 
     expect(state.calibration).toEqual(EXPECTED_INITIAL_STATE)
   })
 
   it('handles DISCONNECT_RESPONSE success', () => {
-    const expected = reducer(undefined, {}).calibration
-    const state = { calibration: { dummy: 'state' } }
-    const action = { type: 'robot:DISCONNECT_RESPONSE', payload: {} }
+    const expected = reducer(undefined, {} as any).calibration
+    const state: RobotState = { calibration: { dummy: 'state' } } as any
+    const action: Action = { type: 'robot:DISCONNECT_RESPONSE', payload: {} }
 
     expect(reducer(state, action).calibration).toEqual(expected)
   })
 
   it('handles protocol:UPLOAD', () => {
-    const expected = reducer(undefined, {}).calibration
-    const state = { calibration: { dummy: 'state' } }
-    const action = {
+    const expected = reducer(undefined, {} as any).calibration
+    const state: RobotState = { calibration: { dummy: 'state' } } as any
+    const action: Action = {
       type: 'protocol:UPLOAD',
-      payload: {},
+      payload: {} as any,
+      meta: {} as any,
     }
 
     expect(reducer(state, action).calibration).toEqual(expected)
   })
 
   it('handles SET_MODULES_REVIEWED action', () => {
-    const setToTrue = { type: 'robot:SET_MODULES_REVIEWED', payload: true }
-    const setToFalse = { type: 'robot:SET_MODULES_REVIEWED', payload: false }
+    const setToTrue: Action = {
+      type: 'robot:SET_MODULES_REVIEWED',
+      payload: true,
+    }
+    const setToFalse: Action = {
+      type: 'robot:SET_MODULES_REVIEWED',
+      payload: false,
+    }
 
-    let state = { calibration: { modulesReviewed: false } }
+    let state: RobotState = { calibration: { modulesReviewed: false } } as any
     expect(reducer(state, setToTrue).calibration).toEqual({
       modulesReviewed: true,
     })
 
-    state = { calibration: { modulesReviewed: true } }
+    state = { calibration: { modulesReviewed: true } } as any
     expect(reducer(state, setToFalse).calibration).toEqual({
       modulesReviewed: false,
     })
   })
 
   it('handles SET_DECK_POPULATED action', () => {
-    const setToTrue = { type: actionTypes.SET_DECK_POPULATED, payload: true }
-    const setToFalse = { type: actionTypes.SET_DECK_POPULATED, payload: false }
-
-    let state = { calibration: { deckPopulated: false } }
+    const setToTrue = {
+      type: actionTypes.SET_DECK_POPULATED,
+      payload: true,
+    } as any
+    const setToFalse = {
+      type: actionTypes.SET_DECK_POPULATED,
+      payload: false,
+    } as any
+
+    let state: RobotState = { calibration: { deckPopulated: false } } as any
     expect(reducer(state, setToTrue).calibration).toEqual({
       deckPopulated: true,
     })
 
-    state = { calibration: { deckPopulated: true } }
+    state = { calibration: { deckPopulated: true } } as any
     expect(reducer(state, setToFalse).calibration).toEqual({
       deckPopulated: false,
     })
   })
 
   it('handles PICKUP_AND_HOME action', () => {
-    const state = {
+    const state: RobotState = {
       calibration: {
         deckPopulated: false,
         modulesReviewed: false,
@@ -94,11 +110,12 @@ describe('robot reducer - calibration', () => {
           error: new Error(),
         },
       },
-    }
+    } as any
 
-    const action = {
+    const action: Action = {
       type: 'robot:PICKUP_AND_HOME',
       payload: { mount: 'left', slot: '5' },
+      meta: {} as any,
     }
     expect(reducer(state, action).calibration).toEqual({
       deckPopulated: true,
@@ -114,7 +131,7 @@ describe('robot reducer - calibration', () => {
   })
 
   it('handles PICKUP_AND_HOME response actions', () => {
-    const state = {
+    const state: RobotState = {
       calibration: {
         calibrationRequest: {
           type: 'PICKUP_AND_HOME',
@@ -125,14 +142,14 @@ describe('robot reducer - calibration', () => {
         },
         tipOnByMount: { right: false },
       },
-    }
+    } as any
 
-    const success = {
+    const success: Action = {
       type: 'robot:PICKUP_AND_HOME_SUCCESS',
       payload: {},
     }
 
-    const failure = {
+    const failure: Action = {
       type: 'robot:PICKUP_AND_HOME_FAILURE',
       error: true,
       payload: new Error('AH'),
@@ -162,7 +179,7 @@ describe('robot reducer - calibration', () => {
   })
 
   it('handles DROP_TIP_AND_HOME action', () => {
-    const state = {
+    const state: RobotState = {
       calibration: {
         calibrationRequest: {
           type: '',
@@ -170,10 +187,11 @@ describe('robot reducer - calibration', () => {
           error: new Error('AH'),
         },
       },
-    }
-    const action = {
+    } as any
+    const action: Action = {
       type: 'robot:DROP_TIP_AND_HOME',
       payload: { mount: 'right', slot: '5' },
+      meta: {} as any,
     }
 
     expect(reducer(state, action).calibration).toEqual({
@@ -188,7 +206,7 @@ describe('robot reducer - calibration', () => {
   })
 
   it('handles DROP_TIP_AND_HOME response actions', () => {
-    const state = {
+    const state: RobotState = {
       calibration: {
         calibrationRequest: {
           type: 'DROP_TIP_AND_HOME',
@@ -199,14 +217,14 @@ describe('robot reducer - calibration', () => {
         },
         tipOnByMount: { left: false, right: true },
       },
-    }
+    } as any
 
-    const success = {
+    const success: Action = {
       type: 'robot:DROP_TIP_AND_HOME_SUCCESS',
       payload: {},
     }
 
-    const failure = {
+    const failure: Action = {
       type: 'robot:DROP_TIP_AND_HOME_FAILURE',
       error: true,
       payload: new Error('AH'),
@@ -236,7 +254,7 @@ describe('robot reducer - calibration', () => {
   })
 
   it('handles CONFIRM_TIPRACK action', () => {
-    const state = {
+    const state: RobotState = {
       calibration: {
         calibrationRequest: {
           type: '',
@@ -246,10 +264,11 @@ describe('robot reducer - calibration', () => {
           error: new Error('AH'),
         },
       },
-    }
-    const action = {
+    } as any
+    const action: Action = {
       type: 'robot:CONFIRM_TIPRACK',
       payload: { mount: 'right', slot: '5' },
+      meta: {} as any,
     }
 
     expect(reducer(state, action).calibration).toEqual({
@@ -264,7 +283,7 @@ describe('robot reducer - calibration', () => {
   })
 
   it('handles CONFIRM_TIPRACK response actions', () => {
-    const state = {
+    const state: RobotState = {
       calibration: {
         calibrationRequest: {
           type: 'CONFIRM_TIPRACK',
@@ -276,14 +295,14 @@ describe('robot reducer - calibration', () => {
         tipOnByMount: { right: true },
         confirmedBySlot: { 5: false },
       },
-    }
+    } as any
 
-    const success = {
+    const success: Action = {
       type: 'robot:CONFIRM_TIPRACK_SUCCESS',
       payload: { tipOn: false },
     }
 
-    const failure = {
+    const failure: Action = {
       type: 'robot:CONFIRM_TIPRACK_FAILURE',
       error: true,
       payload: new Error('AH'),
@@ -315,7 +334,7 @@ describe('robot reducer - calibration', () => {
   })
 
   it('handles MOVE_TO_FRONT action', () => {
-    const state = {
+    const state: RobotState = {
       calibration: {
         deckPopulated: true,
         modulesReviewed: true,
@@ -326,11 +345,11 @@ describe('robot reducer - calibration', () => {
           error: new Error(),
         },
       },
-    }
+    } as any
     const action = {
       type: actionTypes.MOVE_TO_FRONT,
       payload: { mount: 'left' },
-    }
+    } as any
 
     expect(reducer(state, action).calibration).toEqual({
       deckPopulated: false,
@@ -345,7 +364,7 @@ describe('robot reducer - calibration', () => {
   })
 
   it('handles MOVE_TO_FRONT_RESPONSE action', () => {
-    const state = {
+    const state: RobotState = {
       calibration: {
         calibrationRequest: {
           type: 'MOVE_TO_FRONT',
@@ -354,14 +373,17 @@ describe('robot reducer - calibration', () => {
           error: null,
         },
       },
-    }
+    } as any
 
-    const success = { type: actionTypes.MOVE_TO_FRONT_RESPONSE, error: false }
+    const success = {
+      type: actionTypes.MOVE_TO_FRONT_RESPONSE,
+      error: false,
+    } as any
     const failure = {
       type: actionTypes.MOVE_TO_FRONT_RESPONSE,
       error: true,
       payload: new Error('AH'),
-    }
+    } as any
 
     expect(reducer(state, success).calibration).toEqual({
       calibrationRequest: {
@@ -383,7 +405,7 @@ describe('robot reducer - calibration', () => {
   })
 
   it('handles PROBE_TIP action', () => {
-    const state = {
+    const state: RobotState = {
       calibration: {
         calibrationRequest: {
           type: '',
@@ -393,11 +415,11 @@ describe('robot reducer - calibration', () => {
         },
         probedByMount: { left: true, right: true },
       },
-    }
+    } as any
     const action = {
       type: actionTypes.PROBE_TIP,
       payload: { mount: 'left' },
-    }
+    } as any
 
     expect(reducer(state, action).calibration).toEqual({
       calibrationRequest: {
@@ -411,7 +433,7 @@ describe('robot reducer - calibration', () => {
   })
 
   it('handles PROBE_TIP_RESPONSE action', () => {
-    const state = {
+    const state: RobotState = {
       calibration: {
         calibrationRequest: {
           type: 'PROBE_TIP',
@@ -420,13 +442,16 @@ describe('robot reducer - calibration', () => {
           error: null,
         },
       },
-    }
-    const success = { type: actionTypes.PROBE_TIP_RESPONSE, error: false }
+    } as any
+    const success = {
+      type: actionTypes.PROBE_TIP_RESPONSE,
+      error: false,
+    } as any
     const failure = {
       type: actionTypes.PROBE_TIP_RESPONSE,
       error: true,
       payload: new Error('AH'),
-    }
+    } as any
 
     expect(reducer(state, success).calibration).toEqual({
       calibrationRequest: {
@@ -449,14 +474,15 @@ describe('robot reducer - calibration', () => {
   })
 
   it('handles CONFIRM_PROBED', () => {
-    const state = {
+    const state: RobotState = {
       calibration: {
         probedByMount: { left: false, right: true },
       },
-    }
-    const action = {
+    } as any
+    const action: Action = {
       type: 'robot:CONFIRM_PROBED',
       payload: 'left',
+      meta: {} as any,
     }
 
     expect(reducer(state, action).calibration).toEqual({
@@ -465,7 +491,7 @@ describe('robot reducer - calibration', () => {
   })
 
   it('handles MOVE_TO action', () => {
-    const state = {
+    const state: RobotState = {
       calibration: {
         deckPopulated: false,
         modulesReviewed: false,
@@ -475,10 +501,11 @@ describe('robot reducer - calibration', () => {
           error: new Error('AH'),
         },
       },
-    }
-    const action = {
+    } as any
+    const action: Action = {
       type: 'robot:MOVE_TO',
       payload: { mount: 'left', slot: '3' },
+      meta: {} as any,
     }
 
     expect(reducer(state, action).calibration).toEqual({
@@ -495,7 +522,7 @@ describe('robot reducer - calibration', () => {
   })
 
   it('handles MOVE_TO response actions', () => {
-    const state = {
+    const state: RobotState = {
       calibration: {
         calibrationRequest: {
           type: 'MOVE_TO',
@@ -505,10 +532,10 @@ describe('robot reducer - calibration', () => {
           slot: '5',
         },
       },
-    }
+    } as any
 
-    const success = { type: 'robot:MOVE_TO_SUCCESS', payload: {} }
-    const failure = {
+    const success: Action = { type: 'robot:MOVE_TO_SUCCESS', payload: {} }
+    const failure: Action = {
       type: 'robot:MOVE_TO_FAILURE',
       error: true,
       payload: new Error('AH'),
@@ -535,7 +562,7 @@ describe('robot reducer - calibration', () => {
   })
 
   it('handles JOG action', () => {
-    const state = {
+    const state: RobotState = {
       calibration: {
         calibrationRequest: {
           type: '',
@@ -543,9 +570,12 @@ describe('robot reducer - calibration', () => {
           error: new Error(),
         },
       },
+    } as any
+    const action: Action = {
+      type: 'robot:JOG',
+      payload: { mount: 'right' },
+      meta: {} as any,
     }
-    const action = { type: 'robot:JOG', payload: { mount: 'right' } }
-
     expect(reducer(state, action).calibration).toEqual({
       calibrationRequest: {
         type: 'JOG',
@@ -557,7 +587,7 @@ describe('robot reducer - calibration', () => {
   })
 
   it('handles JOG response actions', () => {
-    const state = {
+    const state: RobotState = {
       calibration: {
         calibrationRequest: {
           type: 'JOG',
@@ -566,12 +596,12 @@ describe('robot reducer - calibration', () => {
           mount: 'right',
         },
       },
-    }
-    const success = {
+    } as any
+    const success: Action = {
       type: 'robot:JOG_SUCCESS',
       payload: {},
     }
-    const failure = {
+    const failure: Action = {
       type: 'robot:JOG_FAILURE',
       error: true,
       payload: new Error('AH'),
@@ -596,7 +626,7 @@ describe('robot reducer - calibration', () => {
   })
 
   it('handles UPDATE_OFFSET action', () => {
-    const state = {
+    const state: RobotState = {
       calibration: {
         calibrationRequest: {
           type: '',
@@ -604,10 +634,11 @@ describe('robot reducer - calibration', () => {
           error: new Error(),
         },
       },
-    }
-    const action = {
+    } as any
+    const action: Action = {
       type: 'robot:UPDATE_OFFSET',
       payload: { mount: 'right', slot: '5' },
+      meta: {} as any,
     }
 
     expect(reducer(state, action).calibration).toEqual({
@@ -622,7 +653,7 @@ describe('robot reducer - calibration', () => {
   })
 
   it('handles UPDATE_OFFSET response actions', () => {
-    const state = {
+    const state: RobotState = {
       calibration: {
         calibrationRequest: {
           type: 'UPDATE_OFFSET',
@@ -633,13 +664,13 @@ describe('robot reducer - calibration', () => {
         },
         confirmedBySlot: {},
       },
-    }
+    } as any
 
-    const success = {
+    const success: Action = {
       type: 'robot:UPDATE_OFFSET_SUCCESS',
       payload: {},
     }
-    const failure = {
+    const failure: Action = {
       type: 'robot:UPDATE_OFFSET_FAILURE',
       error: true,
       payload: new Error('AH'),
@@ -668,15 +699,15 @@ describe('robot reducer - calibration', () => {
   })
 
   it('handles CONFIRM_LABWARE action', () => {
-    const state = {
+    const state: RobotState = {
       calibration: {
         confirmedBySlot: {},
       },
-    }
+    } as any
     const action = {
       type: actionTypes.CONFIRM_LABWARE,
       payload: { labware: '5' },
-    }
+    } as any
 
     expect(reducer(state, action).calibration).toEqual({
       confirmedBySlot: { 5: true },
@@ -684,7 +715,7 @@ describe('robot reducer - calibration', () => {
   })
 
   it('handles CLEAR_CALIBRATION_REQUEST and robot home actions', () => {
-    const state = {
+    const state: RobotState = {
       calibration: {
         calibrationRequest: {
           type: 'JOG',
@@ -693,21 +724,20 @@ describe('robot reducer - calibration', () => {
           mount: 'right',
         },
       },
-    }
-
-    const clearAction = { type: 'robot:CLEAR_CALIBRATION_REQUEST' }
+    } as any
+    const clearAction: Action = { type: 'robot:CLEAR_CALIBRATION_REQUEST' }
     expect(reducer(state, clearAction).calibration).toEqual({
       calibrationRequest: { type: '', inProgress: false, error: null },
     })
 
-    const homeAction = { type: HOME }
+    const homeAction = { type: HOME } as any
     expect(reducer(state, homeAction).calibration).toEqual({
       calibrationRequest: { type: '', inProgress: false, error: null },
     })
   })
 
   it('handles RETURN_TIP action', () => {
-    const state = {
+    const state: RobotState = {
       calibration: {
         calibrationRequest: {
           type: '',
@@ -715,11 +745,11 @@ describe('robot reducer - calibration', () => {
           error: new Error(),
         },
       },
-    }
+    } as any
     const action = {
       type: actionTypes.RETURN_TIP,
       payload: { mount: 'left' },
-    }
+    } as any
 
     expect(reducer(state, action).calibration).toEqual({
       calibrationRequest: {
@@ -732,7 +762,7 @@ describe('robot reducer - calibration', () => {
   })
 
   it('handles RETURN_TIP_RESPONSE success', () => {
-    const state = {
+    const state: RobotState = {
       calibration: {
         calibrationRequest: {
           type: 'RETURN_TIP',
@@ -744,10 +774,10 @@ describe('robot reducer - calibration', () => {
           left: true,
         },
       },
-    }
+    } as any
     const action = {
       type: actionTypes.RETURN_TIP_RESPONSE,
-    }
+    } as any
 
     expect(reducer(state, action).calibration).toEqual({
       calibrationRequest: {
@@ -763,7 +793,7 @@ describe('robot reducer - calibration', () => {
   })
 
   it('handles RETURN_TIP_RESPONSE failure', () => {
-    const state = {
+    const state: RobotState = {
       calibration: {
         calibrationRequest: {
           type: 'RETURN_TIP',
@@ -775,12 +805,12 @@ describe('robot reducer - calibration', () => {
           left: true,
         },
       },
-    }
+    } as any
     const action = {
       type: actionTypes.RETURN_TIP_RESPONSE,
       error: true,
       payload: { message: 'AH' },
-    }
+    } as any
 
     expect(reducer(state, action).calibration).toEqual({
       calibrationRequest: {
diff --git a/app/src/redux/robot/test/connection-reducer.test.ts b/app/src/redux/robot/test/connection-reducer.test.ts
index 9fd1f47376f..2a7cfec6866 100644
--- a/app/src/redux/robot/test/connection-reducer.test.ts
+++ b/app/src/redux/robot/test/connection-reducer.test.ts
@@ -1,11 +1,15 @@
 // connection reducer tests
 import { robotReducer as reducer } from '../'
 
-const getState = state => state.connection
+import type { Action } from '../../types'
+import type { RobotState } from '../reducer'
+import type { ConnectionState } from '../reducer/connection'
+
+const getState = (state: RobotState): ConnectionState => state.connection
 
 describe('robot reducer - connection', () => {
   it('initial state', () => {
-    const state = reducer(undefined, {})
+    const state = reducer(undefined, {} as any)
 
     expect(getState(state)).toEqual({
       connectedTo: null,
@@ -16,7 +20,7 @@ describe('robot reducer - connection', () => {
   })
 
   it('handles CONNECT action', () => {
-    const state = {
+    const state: RobotState = {
       connection: {
         connectedTo: null,
         connectRequest: {
@@ -25,10 +29,11 @@ describe('robot reducer - connection', () => {
           name: '',
         },
       },
-    }
-    const action = {
+    } as any
+    const action: Action = {
       type: 'robot:CONNECT',
       payload: { name: 'ot' },
+      meta: {} as any,
     }
 
     expect(getState(reducer(state, action))).toEqual({
@@ -38,7 +43,7 @@ describe('robot reducer - connection', () => {
   })
 
   it('handles CONNECT action if connect already in flight', () => {
-    const state = {
+    const state: RobotState = {
       connection: {
         connectedTo: null,
         connectRequest: {
@@ -47,10 +52,11 @@ describe('robot reducer - connection', () => {
           name: 'ot',
         },
       },
-    }
-    const action = {
+    } as any
+    const action: Action = {
       type: 'robot:CONNECT',
       payload: { name: 'someone-else' },
+      meta: {} as any,
     }
 
     expect(getState(reducer(state, action))).toEqual({
@@ -60,7 +66,7 @@ describe('robot reducer - connection', () => {
   })
 
   it('handles CONNECT_RESPONSE success', () => {
-    const state = {
+    const state: RobotState = {
       connection: {
         connectedTo: null,
         connectRequest: {
@@ -69,8 +75,11 @@ describe('robot reducer - connection', () => {
           name: 'ot',
         },
       },
+    } as any
+    const action: Action = {
+      type: 'robot:CONNECT_RESPONSE',
+      payload: {} as any,
     }
-    const action = { type: 'robot:CONNECT_RESPONSE', payload: {} }
 
     expect(getState(reducer(state, action))).toEqual({
       connectedTo: 'ot',
@@ -79,7 +88,7 @@ describe('robot reducer - connection', () => {
   })
 
   it('handles CONNECT_RESPONSE failure', () => {
-    const state = {
+    const state: RobotState = {
       connection: {
         connectedTo: null,
         connectRequest: {
@@ -88,10 +97,10 @@ describe('robot reducer - connection', () => {
           name: 'ot',
         },
       },
-    }
-    const action = {
+    } as any
+    const action: Action = {
       type: 'robot:CONNECT_RESPONSE',
-      payload: { error: new Error('AH') },
+      payload: { error: new Error('AH') } as any,
     }
 
     expect(getState(reducer(state, action))).toEqual({
@@ -105,7 +114,7 @@ describe('robot reducer - connection', () => {
   })
 
   it('handles CLEAR_CONNECT_RESPONSE action', () => {
-    const state = {
+    const state: RobotState = {
       connection: {
         connectedTo: null,
         connectRequest: {
@@ -114,9 +123,12 @@ describe('robot reducer - connection', () => {
           name: 'ot',
         },
       },
-    }
+    } as any
 
-    const action = { type: 'robot:CLEAR_CONNECT_RESPONSE', error: false }
+    const action: Action = {
+      type: 'robot:CLEAR_CONNECT_RESPONSE',
+      error: false,
+    }
 
     expect(getState(reducer(state, action))).toEqual({
       connectedTo: null,
@@ -125,7 +137,7 @@ describe('robot reducer - connection', () => {
   })
 
   it('handles DISCONNECT action', () => {
-    const state = {
+    const state: RobotState = {
       connection: {
         connectedTo: 'ot',
         disconnectRequest: {
@@ -134,8 +146,8 @@ describe('robot reducer - connection', () => {
           name: '',
         },
       },
-    }
-    const action = { type: 'robot:DISCONNECT' }
+    } as any
+    const action: Action = { type: 'robot:DISCONNECT', meta: {} as any }
 
     expect(getState(reducer(state, action))).toEqual({
       connectedTo: 'ot',
@@ -144,14 +156,14 @@ describe('robot reducer - connection', () => {
   })
 
   it('handles DISCONNECT_RESPONSE', () => {
-    const state = {
+    const state: RobotState = {
       connection: {
         connectedTo: 'ot',
         disconnectRequest: { inProgress: true, error: null },
         unexpectedDisconnect: true,
       },
-    }
-    const action = { type: 'robot:DISCONNECT_RESPONSE', payload: {} }
+    } as any
+    const action: Action = { type: 'robot:DISCONNECT_RESPONSE', payload: {} }
 
     expect(getState(reducer(state, action))).toEqual({
       connectedTo: null,
diff --git a/app/src/redux/robot/test/selectors.test.ts b/app/src/redux/robot/test/selectors.test.ts
index 314fc47f047..8a73583f2aa 100644
--- a/app/src/redux/robot/test/selectors.test.ts
+++ b/app/src/redux/robot/test/selectors.test.ts
@@ -3,41 +3,101 @@ import { format } from 'date-fns'
 import { setIn } from '@thi.ng/paths'
 import { selectors, constants } from '../'
 
-import { getLabwareDefBySlot } from '../../protocol/selectors'
-import { getCustomLabwareDefinitions } from '../../custom-labware/selectors'
+import * as protocolSelectors from '../../protocol/selectors'
+import * as customLwSelectors from '../../custom-labware/selectors'
+
+import type { State } from '../../types'
+import type { RobotState } from '../reducer'
+import type { SessionStatus } from '../types'
 
 jest.mock('../../protocol/selectors')
 jest.mock('../../custom-labware/selectors')
 
-const makeState = robotState => ({ robot: robotState })
-
-const {
-  getConnectedRobotName,
-  getConnectionStatus,
-  getSessionCapabilities,
-  getSessionLoadInProgress,
-  getUploadError,
-  getSessionIsLoaded,
-  getCommands,
-  getRunProgress,
-  getStartTime,
-  getIsReadyToRun,
-  getIsRunning,
-  getIsPaused,
-  getIsDone,
-  getRunTime,
-  getPipettes,
-  getCalibratorMount,
-  getPipettesCalibrated,
-  getLabware,
-  getUnconfirmedTipracks,
-  getUnconfirmedLabware,
-  getNextLabware,
-  getTipracksByMount,
-  getModulesBySlot,
-  getModules,
-  getDeckPopulated,
-} = selectors
+const makeState = (robotState: RobotState): State =>
+  ({ robot: robotState } as any)
+
+const getLabwareDefBySlot = protocolSelectors.getLabwareDefBySlot as jest.MockedFunction<
+  typeof protocolSelectors.getLabwareDefBySlot
+>
+const getCustomLabwareDefinitions = customLwSelectors.getCustomLabwareDefinitions as jest.MockedFunction<
+  typeof customLwSelectors.getCustomLabwareDefinitions
+>
+
+const getConnectedRobotName = selectors.getConnectedRobotName as jest.MockedFunction<
+  typeof selectors.getConnectedRobotName
+>
+const getConnectionStatus = selectors.getConnectionStatus as jest.MockedFunction<
+  typeof selectors.getConnectionStatus
+>
+const getSessionCapabilities = selectors.getSessionCapabilities as jest.MockedFunction<
+  typeof selectors.getSessionCapabilities
+>
+const getSessionLoadInProgress = selectors.getSessionLoadInProgress as jest.MockedFunction<
+  typeof selectors.getSessionLoadInProgress
+>
+const getUploadError = selectors.getUploadError as jest.MockedFunction<
+  typeof selectors.getUploadError
+>
+const getSessionIsLoaded = selectors.getSessionIsLoaded as jest.MockedFunction<
+  typeof selectors.getSessionIsLoaded
+>
+const getCommands = selectors.getCommands as jest.MockedFunction<
+  typeof selectors.getCommands
+>
+const getRunProgress = selectors.getRunProgress as jest.MockedFunction<
+  typeof selectors.getRunProgress
+>
+const getStartTime = selectors.getStartTime as jest.MockedFunction<
+  typeof selectors.getStartTime
+>
+const getIsReadyToRun = selectors.getIsReadyToRun as jest.MockedFunction<
+  typeof selectors.getIsReadyToRun
+>
+const getIsRunning = selectors.getIsRunning as jest.MockedFunction<
+  typeof selectors.getIsRunning
+>
+const getIsPaused = selectors.getIsPaused as jest.MockedFunction<
+  typeof selectors.getIsPaused
+>
+const getIsDone = selectors.getIsDone as jest.MockedFunction<
+  typeof selectors.getIsDone
+>
+const getRunTime = selectors.getRunTime as jest.MockedFunction<
+  typeof selectors.getRunTime
+>
+const getPipettes = selectors.getPipettes as jest.MockedFunction<
+  typeof selectors.getPipettes
+>
+const getCalibratorMount = selectors.getCalibratorMount as jest.MockedFunction<
+  typeof selectors.getCalibratorMount
+>
+const getPipettesCalibrated = selectors.getPipettesCalibrated as jest.MockedFunction<
+  typeof selectors.getPipettesCalibrated
+>
+const getLabware = selectors.getLabware as jest.MockedFunction<
+  typeof selectors.getLabware
+>
+const getUnconfirmedTipracks = selectors.getUnconfirmedTipracks as jest.MockedFunction<
+  typeof selectors.getUnconfirmedTipracks
+>
+const getUnconfirmedLabware = selectors.getUnconfirmedLabware as jest.MockedFunction<
+  typeof selectors.getUnconfirmedLabware
+>
+const getNextLabware = selectors.getNextLabware as jest.MockedFunction<
+  typeof selectors.getNextLabware
+>
+const getTipracksByMount = selectors.getTipracksByMount as jest.MockedFunction<
+  typeof selectors.getTipracksByMount
+>
+const getModulesBySlot = selectors.getModulesBySlot as jest.MockedFunction<
+  typeof selectors.getModulesBySlot
+>
+const getModules = selectors.getModules as jest.MockedFunction<
+  typeof selectors.getModules
+>
+const getDeckPopulated = selectors.getDeckPopulated as jest.MockedFunction<
+  typeof selectors.getDeckPopulated
+>
 
 describe('robot selectors', () => {
   beforeEach(() => {
@@ -50,12 +110,12 @@ describe('robot selectors', () => {
   })
 
   describe('robot list', () => {
-    let state
+    let state: State
 
     beforeEach(() => {
       state = {
         robot: { connection: { connectedTo: 'bar' } },
-      }
+      } as any
     })
 
     it('getConnectedRobotName', () => {
@@ -98,7 +158,7 @@ describe('robot selectors', () => {
   it('getSessionCapabilities', () => {
     const state = makeState({
       session: { capabilities: ['create', 'create_from_bundle'] },
-    })
+    } as any)
     expect(getSessionCapabilities(state)).toEqual([
       'create',
       'create_from_bundle',
@@ -106,33 +166,39 @@ describe('robot selectors', () => {
   })
 
   it('getSessionLoadInProgress', () => {
-    let state = makeState({ session: { sessionRequest: { inProgress: true } } })
+    let state = makeState({
+      session: { sessionRequest: { inProgress: true } },
+    } as any)
     expect(getSessionLoadInProgress(state)).toBe(true)
 
-    state = makeState({ session: { sessionRequest: { inProgress: false } } })
+    state = makeState({
+      session: { sessionRequest: { inProgress: false } },
+    } as any)
     expect(getSessionLoadInProgress(state)).toBe(false)
   })
 
   it('getUploadError', () => {
-    let state = makeState({ session: { sessionRequest: { error: null } } })
+    let state = makeState({
+      session: { sessionRequest: { error: null } },
+    } as any)
     expect(getUploadError(state)).toBe(null)
 
     state = makeState({
       session: { sessionRequest: { error: new Error('AH') } },
-    })
+    } as any)
     expect(getUploadError(state)).toEqual(new Error('AH'))
   })
 
   it('getSessionIsLoaded', () => {
-    let state = makeState({ session: { state: constants.LOADED } })
+    let state = makeState({ session: { state: constants.LOADED } } as any)
     expect(getSessionIsLoaded(state)).toBe(true)
 
-    state = makeState({ session: { state: '' } })
+    state = makeState({ session: { state: '' } } as any)
     expect(getSessionIsLoaded(state)).toBe(false)
   })
 
   it('getIsReadyToRun', () => {
-    const expectedStates = {
+    const expectedStates: { [sessionStatus in SessionStatus]?: boolean } = {
       loaded: true,
       running: false,
       error: false,
@@ -142,15 +208,15 @@ describe('robot selectors', () => {
     }
 
     Object.keys(expectedStates).forEach(sessionState => {
-      const state = makeState({ session: { state: sessionState } })
-      const expected = expectedStates[sessionState]
+      const state = makeState({ session: { state: sessionState } } as any)
+      const expected = expectedStates[sessionState as SessionStatus]
 
       expect(getIsReadyToRun(state)).toBe(expected)
     })
   })
 
   it('getIsRunning', () => {
-    const expectedStates = {
+    const expectedStates: { [sessionStatus in SessionStatus]?: boolean } = {
       loaded: false,
       running: true,
       error: false,
@@ -160,14 +226,14 @@ describe('robot selectors', () => {
     }
 
     Object.keys(expectedStates).forEach(sessionState => {
-      const state = makeState({ session: { state: sessionState } })
-      const expected = expectedStates[sessionState]
+      const state = makeState({ session: { state: sessionState } } as any)
+      const expected = expectedStates[sessionState as SessionStatus]
       expect(getIsRunning(state)).toBe(expected)
     })
   })
 
   it('getIsPaused', () => {
-    const expectedStates = {
+    const expectedStates: { [sessionStatus in SessionStatus]?: boolean } = {
       loaded: false,
       running: false,
       error: false,
@@ -177,14 +243,14 @@ describe('robot selectors', () => {
     }
 
     Object.keys(expectedStates).forEach(sessionState => {
-      const state = makeState({ session: { state: sessionState } })
-      const expected = expectedStates[sessionState]
+      const state = makeState({ session: { state: sessionState } } as any)
+      const expected = expectedStates[sessionState as SessionStatus]
       expect(getIsPaused(state)).toBe(expected)
     })
   })
 
   it('getIsDone', () => {
-    const expectedStates = {
+    const expectedStates: { [sessionStatus in SessionStatus]?: boolean } = {
       loaded: false,
       running: false,
       error: true,
@@ -194,8 +260,8 @@ describe('robot selectors', () => {
     }
 
     Object.keys(expectedStates).forEach(sessionState => {
-      const state = makeState({ session: { state: sessionState } })
-      const expected = expectedStates[sessionState]
+      const state = makeState({ session: { state: sessionState } } as any)
+      const expected = expectedStates[sessionState as SessionStatus]
       expect(getIsDone(state)).toBe(expected)
     })
   })
@@ -203,32 +269,32 @@ describe('robot selectors', () => {
   it('getStartTime with no start time returns null', () => {
     const state = makeState({
       session: { startTime: null },
-    })
+    } as any)
     expect(getStartTime(state)).toBe(null)
   })
 
   it('getStartTime returns local formatted time', () => {
     const state = makeState({
       session: { startTime: 1582926000, remoteTimeCompensation: -6000 },
-    })
+    } as any)
     expect(getStartTime(state)).toBe(format(1582920000, 'pp'))
   })
 
   it('getRunTime with no startTime', () => {
-    const state = {
+    const state: State = {
       robot: {
         session: {
           startTime: null,
           runTime: 42,
         },
       },
-    }
+    } as any
 
     expect(getRunTime(state)).toEqual('00:00:00')
   })
 
   it('getRunTime with no remoteTimeCompensation', () => {
-    const state = {
+    const state: State = {
       robot: {
         session: {
           remoteTimeCompensation: null,
@@ -236,14 +302,14 @@ describe('robot selectors', () => {
           runTime: 42,
         },
       },
-    }
+    } as any
 
     expect(getRunTime(state)).toEqual('00:00:00')
   })
 
   it('getRunTime', () => {
-    const testGetRunTime = (seconds, expected) => {
-      const stateWithRunTime = {
+    const testGetRunTime = (seconds: number, expected: string): void => {
+      const stateWithRunTime: State = {
         robot: {
           session: {
             remoteTimeCompensation: 0,
@@ -251,7 +317,7 @@ describe('robot selectors', () => {
             runTime: 42 + 1000 * seconds,
           },
         },
-      }
+      } as any
 
       expect(getRunTime(stateWithRunTime)).toEqual(expected)
     }
@@ -303,7 +369,7 @@ describe('robot selectors', () => {
           },
         },
       },
-    })
+    } as any)
 
     it('getRunProgress', () => {
       // leaves: 2, 3, 4; processed: 2
@@ -313,7 +379,7 @@ describe('robot selectors', () => {
     it('getRunProgress with no commands', () => {
       const state = makeState({
         session: { protocolCommands: [], protocolCommandsById: {} },
-      })
+      } as any)
 
       expect(getRunProgress(state)).toEqual(0)
     })
@@ -367,7 +433,7 @@ describe('robot selectors', () => {
   })
 
   describe('instrument selectors', () => {
-    let state
+    let state: State
 
     beforeEach(() => {
       state = makeState({
@@ -385,7 +451,7 @@ describe('robot selectors', () => {
             right: true,
           },
         },
-      })
+      } as any)
     })
 
     // TODO(mc: 2018-01-10): rethink the instrument level "calibration" prop
@@ -428,7 +494,7 @@ describe('robot selectors', () => {
         probedByMount: {},
         tipOnByMount: { left: true },
       },
-    })
+    } as any)
 
     const rightState = makeState({
       session: {
@@ -442,7 +508,7 @@ describe('robot selectors', () => {
         probedByMount: {},
         tipOnByMount: { right: true },
       },
-    })
+    } as any)
 
     expect(getCalibratorMount(leftState)).toBe('left')
     expect(getCalibratorMount(rightState)).toBe('right')
@@ -461,7 +527,7 @@ describe('robot selectors', () => {
         probedByMount: { left: true, right: true },
         tipOnByMount: {},
       },
-    })
+    } as any)
 
     const twoPipettesNotCalibrated = makeState({
       session: {
@@ -475,7 +541,7 @@ describe('robot selectors', () => {
         probedByMount: { left: false, right: false },
         tipOnByMount: {},
       },
-    })
+    } as any)
 
     const onePipetteCalibrated = makeState({
       session: {
@@ -488,7 +554,7 @@ describe('robot selectors', () => {
         probedByMount: { right: true },
         tipOnByMount: {},
       },
-    })
+    } as any)
 
     expect(getPipettesCalibrated(twoPipettesCalibrated)).toBe(true)
     expect(getPipettesCalibrated(twoPipettesNotCalibrated)).toBe(false)
@@ -496,7 +562,7 @@ describe('robot selectors', () => {
   })
 
   describe('module selectors', () => {
-    let state
+    let state: State
 
     beforeEach(() => {
       state = makeState({
@@ -509,7 +575,7 @@ describe('robot selectors', () => {
             },
           },
         },
-      })
+      } as any)
     })
 
     it('get modules by slot', () => {
@@ -534,7 +600,7 @@ describe('robot selectors', () => {
   })
 
   describe('labware selectors', () => {
-    let state
+    let state: State
 
     beforeEach(() => {
       state = makeState({
@@ -602,7 +668,7 @@ describe('robot selectors', () => {
           probedByMount: {},
           tipOnByMount: { right: true },
         },
-      })
+      } as any)
     })
 
     it('get labware', () => {
@@ -814,7 +880,7 @@ describe('robot selectors', () => {
         definition: null,
       })
 
-      const nextState = {
+      const nextState: State = {
         robot: {
           ...state.robot,
           calibration: {
@@ -826,7 +892,7 @@ describe('robot selectors', () => {
             },
           },
         },
-      }
+      } as any
 
       expect(getNextLabware(nextState)).toEqual({
         slot: '3',
@@ -916,7 +982,7 @@ describe('robot selectors', () => {
           probedByMount: {},
           tipOnByMount: {},
         },
-      })
+      } as any)
 
       expect(getTipracksByMount(state)).toEqual({
         left: [
@@ -964,9 +1030,9 @@ describe('robot selectors', () => {
   })
 
   it('getDeckPopulated', () => {
-    let state = makeState({ calibration: { deckPopulated: null } })
+    let state = makeState({ calibration: { deckPopulated: null } } as any)
     expect(getDeckPopulated(state)).toEqual(null)
-    state = makeState({ calibration: { deckPopulated: false } })
+    state = makeState({ calibration: { deckPopulated: false } } as any)
     expect(getDeckPopulated(state)).toEqual(false)
   })
 })
diff --git a/app/src/redux/robot/test/session-reducer.test.ts b/app/src/redux/robot/test/session-reducer.test.ts
index 169285c2dbe..a9ef322bbff 100644
--- a/app/src/redux/robot/test/session-reducer.test.ts
+++ b/app/src/redux/robot/test/session-reducer.test.ts
@@ -1,6 +1,9 @@
 // session reducer tests
 import { robotReducer as reducer, actionTypes } from '../'
 
+import type { RobotState } from '../reducer'
+import type { Action } from '../../types'
+
 describe('robot reducer - session', () => {
   const now = Date.now()
   const _nowFn = Date.now
@@ -10,7 +13,7 @@ describe('robot reducer - session', () => {
   afterAll(() => (Date.now = _nowFn))
 
   it('initial state', () => {
-    const state = reducer(undefined, {})
+    const state = reducer(undefined, {} as any)
 
     expect(state.session).toEqual({
       // loading a protocol
@@ -48,10 +51,10 @@ describe('robot reducer - session', () => {
 
   it('handles CONNECT_RESPONSE success', () => {
     const expected = { capabilities: ['create'] }
-    const state = { session: { capabilities: [] } }
-    const action = {
+    const state: RobotState = { session: { capabilities: [] } } as any
+    const action: Action = {
       type: 'robot:CONNECT_RESPONSE',
-      payload: { sessionCapabilities: ['create'] },
+      payload: { sessionCapabilities: ['create'] } as any,
     }
 
     expect(reducer(state, action).session).toEqual(expected)
@@ -59,8 +62,8 @@ describe('robot reducer - session', () => {
 
   it('handles CONNECT_RESPONSE failure', () => {
     const expected = { capabilities: ['create'] }
-    const state = { session: { capabilities: ['create'] } }
-    const action = {
+    const state: RobotState = { session: { capabilities: ['create'] } } as any
+    const action: Action = {
       type: 'robot:CONNECT_RESPONSE',
       payload: { error: new Error('AH'), sessionCapabilities: [] },
     }
@@ -69,26 +72,27 @@ describe('robot reducer - session', () => {
   })
 
   it('handles DISCONNECT_RESPONSE success', () => {
-    const expected = reducer(undefined, {}).session
-    const state = { session: { dummy: 'state' } }
-    const action = { type: 'robot:DISCONNECT_RESPONSE', payload: {} }
+    const expected = reducer(undefined, {} as any).session
+    const state: RobotState = { session: { dummy: 'state' } } as any
+    const action: Action = { type: 'robot:DISCONNECT_RESPONSE', payload: {} }
 
     expect(reducer(state, action).session).toEqual(expected)
   })
 
   it('handles protocol:UPLOAD action', () => {
-    const initialState = reducer(undefined, {}).session
-    const state = {
+    const initialState = reducer(undefined, {} as any).session
+    const state: RobotState = {
       session: {
         capabilities: ['create'],
         sessionRequest: { inProgress: false, error: new Error('AH') },
         startTime: 40,
         runTime: 42,
       },
-    }
-    const action = {
+    } as any
+    const action: Action = {
       type: 'protocol:UPLOAD',
-      payload: {},
+      payload: {} as any,
+      meta: {} as any,
     }
 
     expect(reducer(state, action).session).toEqual({
@@ -99,14 +103,14 @@ describe('robot reducer - session', () => {
   })
 
   it('handles robot:REFRESH_SESSION action', () => {
-    const state = {
+    const state: RobotState = {
       session: {
         sessionRequest: { inProgress: false, error: null },
         startTime: 40,
         runTime: 42,
       },
-    }
-    const action = { type: 'robot:REFRESH_SESSION' }
+    } as any
+    const action: Action = { type: 'robot:REFRESH_SESSION', meta: {} as any }
 
     expect(reducer(state, action).session).toEqual({
       sessionRequest: { inProgress: true, error: null },
@@ -117,12 +121,12 @@ describe('robot reducer - session', () => {
   })
 
   it('handles SESSION_RESPONSE', () => {
-    const state = {
+    const state: RobotState = {
       session: {
         sessionRequest: { inProgress: true, error: null },
       },
-    }
-    const action = {
+    } as any
+    const action: Action = {
       type: 'robot:SESSION_RESPONSE',
       payload: {
         name: '/path/to/foo.py',
@@ -131,7 +135,8 @@ describe('robot reducer - session', () => {
         errors: [],
         protocolCommands: [],
         protocolCommandsById: {},
-      },
+      } as any,
+      meta: {} as any,
     }
 
     expect(reducer(state, action).session).toEqual({
@@ -144,14 +149,15 @@ describe('robot reducer - session', () => {
   })
 
   it('handles SESSION_ERROR', () => {
-    const state = {
+    const state: RobotState = {
       session: {
         sessionRequest: { inProgress: true, error: null },
       },
-    }
-    const action = {
+    } as any
+    const action: Action = {
       type: 'robot:SESSION_ERROR',
       payload: { error: new Error('AH') },
+      meta: {} as any,
     }
 
     expect(reducer(state, action).session).toEqual({
@@ -160,7 +166,7 @@ describe('robot reducer - session', () => {
   })
 
   it('handles SESSION_UPDATE action', () => {
-    const state = {
+    const state: RobotState = {
       session: {
         state: 'loaded',
         startTime: null,
@@ -170,14 +176,14 @@ describe('robot reducer - session', () => {
           0: { id: 0, handledAt: 2 },
         },
       },
-    }
-    const action = {
+    } as any
+    const action: Action = {
       type: 'robot:SESSION_UPDATE',
       payload: {
         state: 'running',
         startTime: 1,
         lastCommand: { id: 1, handledAt: 3 },
-      },
+      } as any,
       meta: {
         now: 6,
       },
@@ -196,13 +202,13 @@ describe('robot reducer - session', () => {
   })
 
   it('handles RUN action', () => {
-    const state = {
+    const state: RobotState = {
       session: {
         runTime: now,
         runRequest: { inProgress: false, error: new Error('AH') },
       },
-    }
-    const action = { type: actionTypes.RUN }
+    } as any
+    const action: Action = { type: actionTypes.RUN } as any
 
     expect(reducer(state, action).session).toEqual({
       runRequest: { inProgress: true, error: null },
@@ -211,8 +217,13 @@ describe('robot reducer - session', () => {
   })
 
   it('handles RUN_RESPONSE success', () => {
-    const state = { session: { runRequest: { inProgress: true, error: null } } }
-    const action = { type: actionTypes.RUN_RESPONSE, error: false }
+    const state: RobotState = {
+      session: { runRequest: { inProgress: true, error: null } },
+    } as any
+    const action: Action = {
+      type: actionTypes.RUN_RESPONSE,
+      error: false,
+    } as any
 
     expect(reducer(state, action).session).toEqual({
       runRequest: { inProgress: false, error: null },
@@ -220,12 +231,14 @@ describe('robot reducer - session', () => {
   })
 
   it('handles RUN_RESPONSE failure', () => {
-    const state = { session: { runRequest: { inProgress: true, error: null } } }
-    const action = {
+    const state: RobotState = {
+      session: { runRequest: { inProgress: true, error: null } },
+    } as any
+    const action: Action = {
       type: actionTypes.RUN_RESPONSE,
       error: true,
       payload: new Error('AH'),
-    }
+    } as any
 
     expect(reducer(state, action).session).toEqual({
       runRequest: { inProgress: false, error: new Error('AH') },
@@ -233,19 +246,19 @@ describe('robot reducer - session', () => {
   })
 
   it('handles TICK_RUN_TIME', () => {
-    const state = { session: { runTime: 0 } }
-    const action = { type: actionTypes.TICK_RUN_TIME }
+    const state: RobotState = { session: { runTime: 0 } } as any
+    const action: Action = { type: actionTypes.TICK_RUN_TIME } as any
 
     expect(reducer(state, action).session).toEqual({ runTime: now })
   })
 
   it('handles PAUSE action', () => {
-    const state = {
+    const state: RobotState = {
       session: {
         pauseRequest: { inProgress: false, error: new Error('AH') },
       },
-    }
-    const action = { type: actionTypes.PAUSE }
+    } as any
+    const action: Action = { type: actionTypes.PAUSE } as any
 
     expect(reducer(state, action).session).toEqual({
       pauseRequest: { inProgress: true, error: null },
@@ -253,10 +266,13 @@ describe('robot reducer - session', () => {
   })
 
   it('handles PAUSE_RESPONSE success', () => {
-    const state = {
+    const state: RobotState = {
       session: { pauseRequest: { inProgress: true, error: null } },
-    }
-    const action = { type: actionTypes.PAUSE_RESPONSE, error: false }
+    } as any
+    const action: Action = {
+      type: actionTypes.PAUSE_RESPONSE,
+      error: false,
+    } as any
 
     expect(reducer(state, action).session).toEqual({
       pauseRequest: { inProgress: false, error: null },
@@ -264,14 +280,14 @@ describe('robot reducer - session', () => {
   })
 
   it('handles PAUSE_RESPONSE failure', () => {
-    const state = {
+    const state: RobotState = {
       session: { pauseRequest: { inProgress: true, error: null } },
-    }
-    const action = {
+    } as any
+    const action: Action = {
       type: actionTypes.PAUSE_RESPONSE,
       payload: new Error('AH'),
       error: true,
-    }
+    } as any
 
     expect(reducer(state, action).session).toEqual({
       pauseRequest: { inProgress: false, error: new Error('AH') },
@@ -279,12 +295,12 @@ describe('robot reducer - session', () => {
   })
 
   it('handles RESUME action', () => {
-    const state = {
+    const state: RobotState = {
       session: {
         resumeRequest: { inProgress: false, error: new Error('AH') },
       },
-    }
-    const action = { type: actionTypes.RESUME }
+    } as any
+    const action: Action = { type: actionTypes.RESUME } as any
 
     expect(reducer(state, action).session).toEqual({
       resumeRequest: { inProgress: true, error: null },
@@ -292,10 +308,13 @@ describe('robot reducer - session', () => {
   })
 
   it('handles RESUME_RESPONSE success', () => {
-    const state = {
+    const state: RobotState = {
       session: { resumeRequest: { inProgress: true, error: null } },
-    }
-    const action = { type: actionTypes.RESUME_RESPONSE, error: false }
+    } as any
+    const action: Action = {
+      type: actionTypes.RESUME_RESPONSE,
+      error: false,
+    } as any
 
     expect(reducer(state, action).session).toEqual({
       resumeRequest: { inProgress: false, error: null },
@@ -303,14 +322,14 @@ describe('robot reducer - session', () => {
   })
 
   it('handles RESUME_RESPONSE failure', () => {
-    const state = {
+    const state: RobotState = {
       session: { resumeRequest: { inProgress: true, error: null } },
-    }
-    const action = {
+    } as any
+    const action: Action = {
       type: actionTypes.RESUME_RESPONSE,
       payload: new Error('AH'),
       error: true,
-    }
+    } as any
 
     expect(reducer(state, action).session).toEqual({
       resumeRequest: { inProgress: false, error: new Error('AH') },
@@ -318,12 +337,12 @@ describe('robot reducer - session', () => {
   })
 
   it('handles CANCEL action', () => {
-    const state = {
+    const state: RobotState = {
       session: {
         cancelRequest: { inProgress: false, error: new Error('AH') },
       },
-    }
-    const action = { type: actionTypes.CANCEL }
+    } as any
+    const action: Action = { type: actionTypes.CANCEL } as any
 
     expect(reducer(state, action).session).toEqual({
       cancelRequest: { inProgress: true, error: null },
@@ -331,10 +350,13 @@ describe('robot reducer - session', () => {
   })
 
   it('handles CANCEL_RESPONSE success', () => {
-    const state = {
+    const state: RobotState = {
       session: { cancelRequest: { inProgress: true, error: null } },
-    }
-    const action = { type: actionTypes.CANCEL_RESPONSE, error: false }
+    } as any
+    const action: Action = {
+      type: actionTypes.CANCEL_RESPONSE,
+      error: false,
+    } as any
 
     expect(reducer(state, action).session).toEqual({
       cancelRequest: { inProgress: false, error: null },
@@ -342,14 +364,14 @@ describe('robot reducer - session', () => {
   })
 
   it('handles CANCEL_RESPONSE failure', () => {
-    const state = {
+    const state: RobotState = {
       session: { cancelRequest: { inProgress: true, error: null } },
-    }
-    const action = {
+    } as any
+    const action: Action = {
       type: actionTypes.CANCEL_RESPONSE,
       payload: new Error('AH'),
       error: true,
-    }
+    } as any
 
     expect(reducer(state, action).session).toEqual({
       cancelRequest: { inProgress: false, error: new Error('AH') },
diff --git a/app/src/redux/robot/types.ts b/app/src/redux/robot/types.ts
index 0d99187a4f3..4b5d68b5e36 100644
--- a/app/src/redux/robot/types.ts
+++ b/app/src/redux/robot/types.ts
@@ -1,4 +1,3 @@
-// @flow
 // common robot types
 
 import type {
@@ -9,7 +8,7 @@ import type {
 
 import type { Mount } from '@opentrons/components'
 
-import typeof {
+import {
   DISCONNECTED,
   CONNECTING,
   CONNECTED,
@@ -49,158 +48,158 @@ export type Direction = -1 | 1
 
 // TODO(mc, 2018-10-09): deprecate this type?
 // minimum robot for actions/reducers/middleware to work
-export type BaseRobot = {
-  name: string,
+export interface BaseRobot {
+  name: string
 }
 
 // TODO(mc, 2018-10-09): deprecate this type
 // robot MDNS service for connectivity
-export type RobotService = {
-  ...$Exact<BaseRobot>,
-  ip: string,
-  port: number,
+export interface RobotService extends BaseRobot {
+  ip: string
+  port: number
 }
 
 export type LabwareCalibrationStatus =
-  | UNCONFIRMED
-  | MOVING_TO_SLOT
-  | JOGGING
-  | DROPPING_TIP
-  | OVER_SLOT
-  | PICKING_UP
-  | PICKED_UP
-  | CONFIRMING
-  | CONFIRMED
+  | typeof UNCONFIRMED
+  | typeof MOVING_TO_SLOT
+  | typeof JOGGING
+  | typeof DROPPING_TIP
+  | typeof OVER_SLOT
+  | typeof PICKING_UP
+  | typeof PICKED_UP
+  | typeof CONFIRMING
+  | typeof CONFIRMED
 
 // protocol command as returned by the API
-export type Command = {
+export interface Command {
   // command identifier
-  id: number,
+  id: number
   // user readable description of the command
-  description: string,
+  description: string
   // timestamp of when the command was handled by the robot during a run
-  handledAt: ?number,
+  handledAt: number | null | undefined
   // subcommands
-  children: number[],
-  ...
+  children: number[]
+  [key: string]: unknown
 }
 
 // protocol command graph node
 // contructed from Command
-export type CommandNode = {|
-  id: number,
-  description: string,
-  handledAt: ?number,
-  isCurrent: boolean,
-  isLast: boolean,
-  children: Array<CommandNode>,
-|}
+export interface CommandNode {
+  id: number
+  description: string
+  handledAt: number | null | undefined
+  isCurrent: boolean
+  isLast: boolean
+  children: CommandNode[]
+}
 
 // instrument as stored in redux state
-export type StatePipette = {|
+export interface StatePipette {
   // resource ID
-  _id: number,
+  _id: number
   // robot mount instrument is installed on
-  mount: Mount,
+  mount: Mount
   // number of liquid channels
-  channels: Channels,
+  channels: Channels
   // user-given name of the instrument
   // TODO: Ian + Mike 2018-11-06 This `name` is not what we now call the `name`,
   // rather it is the full versioned `model` of the pipette, as placed in the
   // Python Pipette's `name` field by the pipette factory functions.
   // TLDR: this `name` needs to be renamed in a future PR to `model`
-  name: string,
+  name: string
   // tipracks the pipette uses during the protocol
   // array of RPC object IDs corresponding to `_id` field in StateLabware
-  tipRacks: Array<number>,
+  tipRacks: number[]
   // string specified in protocol to load pipette
-  requestedAs?: ?string,
-|}
+  requestedAs?: string | null | undefined
+}
 
-export type Pipette = {|
-  ...StatePipette,
-  probed: boolean,
-  tipOn: boolean,
-  modelSpecs: PipetteModelSpecs | null,
-|}
+export interface Pipette extends StatePipette {
+  probed: boolean
+  tipOn: boolean
+  modelSpecs: PipetteModelSpecs | null
+}
 
 // labware as stored in redux state
-export type StateLabware = {|
+export interface StateLabware {
   // resource ID
-  _id: number,
+  _id: number
   // slot labware is installed in
-  slot: ApiTypes.Slot,
+  slot: ApiTypes.Slot
   // deck coordinates of la<bware when not in slot
-  position: ?Array<number>,
+  position: number[] | null | undefined
   // unique type of the labware
-  type: string,
+  type: string
   // user defined name of the labware
-  name: string,
+  name: string
   // whether or not the labware is a tiprack (implied from type)
-  isTiprack: boolean,
+  isTiprack: boolean
   // whether or not the labware is a legacy labware (labwareSchemaVersion === 1)
-  isLegacy: boolean,
+  isLegacy: boolean
   // instrument mount to use as the calibrator if isTiprack is true
-  calibratorMount: ?Mount,
+  calibratorMount: Mount | null | undefined
   // string identity of a labware; combines all definition properties that would effect a run
   // will be null if old RPC version or old labware version
-  definitionHash: string | null,
-|}
+  definitionHash: string | null
+}
 
-export type Labware = {|
-  ...StateLabware,
-  calibration: LabwareCalibrationStatus,
-  confirmed: boolean,
-  isMoving: boolean,
-  definition: LabwareDefinition2 | null,
-|}
+export interface Labware extends StateLabware {
+  calibration: LabwareCalibrationStatus
+  confirmed: boolean
+  isMoving: boolean
+  definition: LabwareDefinition2 | null
+}
 
 export type LabwareType = 'tiprack' | 'labware'
 
-export type SessionModule = $Diff<ApiTypes.ApiSessionModule, {| name: mixed |}>
+export type SessionModule = Omit<ApiTypes.ApiSessionModule, 'name'>
 
 export type SessionStatus =
   | ''
-  | LOADED
-  | RUNNING
-  | FINISHED
-  | STOPPED
-  | PAUSED
-  | ERROR
+  | typeof LOADED
+  | typeof RUNNING
+  | typeof FINISHED
+  | typeof STOPPED
+  | typeof PAUSED
+  | typeof ERROR
 
 export type ConnectionStatus =
-  | DISCONNECTED
-  | CONNECTING
-  | CONNECTED
-  | DISCONNECTING
-
-export type SessionStatusInfo = {|
-  message: string | null,
-  changedAt: number | null,
-  estimatedDuration: number | null,
-  userMessage: string | null,
-|}
-
-export type DoorState = null | DOOR_OPEN | DOOR_CLOSED
-
-export type SessionUpdate = {|
-  state: SessionStatus,
-  statusInfo: SessionStatusInfo,
-  startTime: ?number,
-  doorState: DoorState,
-  blocked: boolean,
-  lastCommand: ?{|
-    id: number,
-    handledAt: number,
-  |},
-|}
-
-export type TipracksByMountMap = {|
-  left: Array<Labware>,
-  right: Array<Labware>,
-|}
-
-export type NextTiprackPipetteInfo = {|
-  mount: Mount,
-  tiprack: Labware,
-|}
+  | typeof DISCONNECTED
+  | typeof CONNECTING
+  | typeof CONNECTED
+  | typeof DISCONNECTING
+
+export interface SessionStatusInfo {
+  message: string | null
+  changedAt: number | null
+  estimatedDuration: number | null
+  userMessage: string | null
+}
+
+export type DoorState = null | typeof DOOR_OPEN | typeof DOOR_CLOSED
+
+export interface SessionUpdate {
+  state: SessionStatus
+  statusInfo: SessionStatusInfo
+  startTime: number | null | undefined
+  doorState: DoorState
+  blocked: boolean
+  lastCommand:
+    | {
+        id: number
+        handledAt: number
+      }
+    | null
+    | undefined
+}
+
+export interface TipracksByMountMap {
+  left: Labware[]
+  right: Labware[]
+}
+
+export interface NextTiprackPipetteInfo {
+  mount: Mount
+  tiprack: Labware
+}
diff --git a/app/src/redux/sessions/__fixtures__/calibration-check.ts b/app/src/redux/sessions/__fixtures__/calibration-check.ts
index 56bc7a4fa5f..c17738c02fd 100644
--- a/app/src/redux/sessions/__fixtures__/calibration-check.ts
+++ b/app/src/redux/sessions/__fixtures__/calibration-check.ts
@@ -1,4 +1,3 @@
-// @flow
 import type {
   CheckCalibrationSessionDetails,
   CalibrationCheckComparisonsPerCalibration,
@@ -8,7 +7,7 @@ import type {
   CalibrationLabware,
 } from '../types'
 
-import tipRackFixture from '@opentrons/shared-data/labware/fixtures/2/fixture_tiprack_300_ul'
+import tipRackFixture from '@opentrons/shared-data/labware/fixtures/2/fixture_tiprack_300_ul.json'
 import {
   CHECK_STEP_COMPARING_HEIGHT,
   CHECK_STEP_COMPARING_POINT_ONE,
@@ -23,7 +22,7 @@ export const mockCalibrationCheckLabware: CalibrationLabware = {
   namespace: 'opentrons',
   version: 1,
   isTiprack: true,
-  definition: tipRackFixture,
+  definition: tipRackFixture as CalibrationLabware['definition'],
 }
 
 export const badZComparison: CalibrationCheckComparison = {
@@ -50,27 +49,27 @@ export const goodXYComparison: CalibrationCheckComparison = {
 export const badTipLengthCalibration: CalibrationCheckComparisonMap = {
   status: 'OUTSIDE_THRESHOLD',
   [CHECK_STEP_COMPARING_TIP]: badZComparison,
-}
+} as any
 export const badPipetteOffsetCalibration: CalibrationCheckComparisonMap = {
   status: 'OUTSIDE_THRESHOLD',
   [CHECK_STEP_COMPARING_HEIGHT]: badZComparison,
   [CHECK_STEP_COMPARING_POINT_ONE]: badXYComparison,
-}
+} as any
 export const goodTipLengthCalibration: CalibrationCheckComparisonMap = {
   status: 'IN_THRESHOLD',
   [CHECK_STEP_COMPARING_TIP]: goodZComparison,
-}
+} as any
 export const goodPipetteOffsetCalibration: CalibrationCheckComparisonMap = {
   status: 'IN_THRESHOLD',
   [CHECK_STEP_COMPARING_HEIGHT]: goodZComparison,
   [CHECK_STEP_COMPARING_POINT_ONE]: goodXYComparison,
-}
+} as any
 export const goodDeckCalibration: CalibrationCheckComparisonMap = {
   status: 'IN_THRESHOLD',
   [CHECK_STEP_COMPARING_POINT_ONE]: goodXYComparison,
   [CHECK_STEP_COMPARING_POINT_TWO]: goodXYComparison,
   [CHECK_STEP_COMPARING_POINT_THREE]: goodXYComparison,
-}
+} as any
 
 export const mockSecondPipetteHealthCheckCalibration: CalibrationCheckComparisonsPerCalibration = {
   tipLength: badTipLengthCalibration,
@@ -85,7 +84,7 @@ export const mockFirstPipettteHealthCheckPerCalibration: CalibrationCheckCompari
 export const mockRobotCalibrationCheckSessionDetails: CheckCalibrationSessionDetails = {
   instruments: [
     {
-      model: 'fake_pipette_model',
+      model: 'fake_pipette_model' as any,
       name: 'fake_pipette_name',
       tipLength: 42,
       mount: 'left',
@@ -97,7 +96,7 @@ export const mockRobotCalibrationCheckSessionDetails: CheckCalibrationSessionDet
       defaultTipracks: [],
     },
     {
-      model: 'fake_pipette_model',
+      model: 'fake_pipette_model' as any,
       name: 'fake_pipette_name',
       tipLength: 42,
       mount: 'right',
@@ -116,7 +115,7 @@ export const mockRobotCalibrationCheckSessionDetails: CheckCalibrationSessionDet
   },
   labware: [mockCalibrationCheckLabware],
   activePipette: {
-    model: 'fake_pipette_model',
+    model: 'fake_pipette_model' as any,
     name: 'fake_pipette_name',
     tipLength: 42,
     mount: 'left',
diff --git a/app/src/redux/sessions/__fixtures__/deck-calibration.ts b/app/src/redux/sessions/__fixtures__/deck-calibration.ts
index 35008e1c258..814c4268f22 100644
--- a/app/src/redux/sessions/__fixtures__/deck-calibration.ts
+++ b/app/src/redux/sessions/__fixtures__/deck-calibration.ts
@@ -1,5 +1,4 @@
-// @flow
-import tipRackFixture from '@opentrons/shared-data/labware/fixtures/2/fixture_tiprack_300_ul'
+import tipRackFixture from '@opentrons/shared-data/labware/fixtures/2/fixture_tiprack_300_ul.json'
 import type {
   DeckCalibrationSessionDetails,
   CalibrationLabware,
@@ -11,12 +10,12 @@ export const mockDeckCalTipRack: CalibrationLabware = {
   namespace: 'opentrons',
   version: 1,
   isTiprack: true,
-  definition: tipRackFixture,
+  definition: tipRackFixture as CalibrationLabware['definition'],
 }
 
 export const mockDeckCalibrationSessionDetails: DeckCalibrationSessionDetails = {
   instrument: {
-    model: 'fake_pipette_model',
+    model: 'fake_pipette_model' as any,
     name: 'fake_pipette_name',
     tipLength: 42,
     mount: 'right',
diff --git a/app/src/redux/sessions/__fixtures__/index.ts b/app/src/redux/sessions/__fixtures__/index.ts
index a62802e0dc1..5f5e338f94d 100644
--- a/app/src/redux/sessions/__fixtures__/index.ts
+++ b/app/src/redux/sessions/__fixtures__/index.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import { POST, DELETE, GET } from '../../robot-api'
 import {
   makeResponseFixtures,
diff --git a/app/src/redux/sessions/__fixtures__/pipette-offset-calibration.ts b/app/src/redux/sessions/__fixtures__/pipette-offset-calibration.ts
index 787390be594..b3755841d24 100644
--- a/app/src/redux/sessions/__fixtures__/pipette-offset-calibration.ts
+++ b/app/src/redux/sessions/__fixtures__/pipette-offset-calibration.ts
@@ -1,5 +1,4 @@
-// @flow
-import tipRackFixture from '@opentrons/shared-data/labware/fixtures/2/fixture_tiprack_300_ul'
+import tipRackFixture from '@opentrons/shared-data/labware/fixtures/2/fixture_tiprack_300_ul.json'
 import type {
   PipetteOffsetCalibrationSessionDetails,
   CalibrationLabware,
@@ -12,12 +11,12 @@ export const mockPipetteOffsetTipRack: CalibrationLabware = {
   namespace: 'opentrons',
   version: 1,
   isTiprack: true,
-  definition: tipRackFixture,
+  definition: tipRackFixture as CalibrationLabware['definition'],
 }
 
 export const mockPipetteOffsetCalibrationSessionDetails: PipetteOffsetCalibrationSessionDetails = {
   instrument: {
-    model: 'fake_pipette_model',
+    model: 'fake_pipette_model' as any,
     name: 'fake_pipette_name',
     tipLength: 42,
     mount: 'right',
diff --git a/app/src/redux/sessions/__fixtures__/tip-length-calibration.ts b/app/src/redux/sessions/__fixtures__/tip-length-calibration.ts
index a9781baf762..8877b9f1c69 100644
--- a/app/src/redux/sessions/__fixtures__/tip-length-calibration.ts
+++ b/app/src/redux/sessions/__fixtures__/tip-length-calibration.ts
@@ -1,6 +1,5 @@
-// @flow
-import tipRackFixture from '@opentrons/shared-data/labware/fixtures/2/fixture_tiprack_300_ul'
-import calBlockFixture from '@opentrons/shared-data/labware/definitions/2/opentrons_calibrationblock_short_side_left/1'
+import tipRackFixture from '@opentrons/shared-data/labware/fixtures/2/fixture_tiprack_300_ul.json'
+import calBlockFixture from '@opentrons/shared-data/labware/definitions/2/opentrons_calibrationblock_short_side_left/1.json'
 import type {
   TipLengthCalibrationSessionDetails,
   CalibrationLabware,
@@ -13,7 +12,7 @@ export const mockTipLengthTipRack: CalibrationLabware = {
   namespace: 'opentrons',
   version: 1,
   isTiprack: true,
-  definition: tipRackFixture,
+  definition: tipRackFixture as CalibrationLabware['definition'],
 }
 
 export const mockTipLengthCalBlock: CalibrationLabware = {
@@ -22,12 +21,12 @@ export const mockTipLengthCalBlock: CalibrationLabware = {
   namespace: 'opentrons',
   version: 1,
   isTiprack: false,
-  definition: calBlockFixture,
+  definition: calBlockFixture as CalibrationLabware['definition'],
 }
 
 export const mockTipLengthCalibrationSessionDetails: TipLengthCalibrationSessionDetails = {
   instrument: {
-    model: 'fake_pipette_model',
+    model: 'fake_pipette_model' as any,
     name: 'fake_pipette_name',
     tipLength: 42,
     mount: 'right',
@@ -41,5 +40,5 @@ export const mockTipLengthCalibrationSessionDetails: TipLengthCalibrationSession
 export const mockTipLengthCalibrationSessionParams: TipLengthCalibrationSessionParams = {
   mount: 'left',
   hasCalibrationBlock: true,
-  tipRackDefinition: tipRackFixture,
+  tipRackDefinition: tipRackFixture as CalibrationLabware['definition'],
 }
diff --git a/app/src/redux/sessions/__tests__/actions.test.ts b/app/src/redux/sessions/__tests__/actions.test.ts
index 14df79faa2e..b891ce1e901 100644
--- a/app/src/redux/sessions/__tests__/actions.test.ts
+++ b/app/src/redux/sessions/__tests__/actions.test.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import * as Actions from '../actions'
 import * as Fixtures from '../__fixtures__'
 
@@ -7,15 +5,15 @@ import type { SessionsAction } from '../types'
 
 import { mockV2ErrorResponse } from '../../robot-api/__fixtures__'
 
-type ActionSpec = {|
-  name: string,
-  creator: (...Array<any>) => mixed,
-  args: Array<mixed>,
-  expected: SessionsAction,
-|}
+interface ActionSpec {
+  name: string
+  creator: (...args: any[]) => unknown
+  args: unknown[]
+  expected: SessionsAction
+}
 
 describe('robot session check actions', () => {
-  const SPECS: Array<ActionSpec> = [
+  const SPECS: ActionSpec[] = [
     {
       name: 'sessions:CREATE_SESSION',
       creator: Actions.createSession,
@@ -27,7 +25,7 @@ describe('robot session check actions', () => {
           sessionType: 'calibrationCheck',
           params: {},
         },
-        meta: {},
+        meta: {} as any,
       },
     },
     {
@@ -40,7 +38,7 @@ describe('robot session check actions', () => {
           robotName: 'robot-name',
           ...Fixtures.mockSessionResponse,
         },
-        meta: { requestId: 'abc' },
+        meta: { requestId: 'abc' } as any,
       },
     },
     {
@@ -50,7 +48,7 @@ describe('robot session check actions', () => {
       expected: {
         type: 'sessions:CREATE_SESSION_FAILURE',
         payload: { robotName: 'robot-name', error: mockV2ErrorResponse },
-        meta: { requestId: 'abc' },
+        meta: { requestId: 'abc' } as any,
       },
     },
     {
@@ -60,7 +58,7 @@ describe('robot session check actions', () => {
       expected: {
         type: 'sessions:DELETE_SESSION',
         payload: { robotName: 'robot-name', sessionId: '1234' },
-        meta: {},
+        meta: {} as any,
       },
     },
     {
@@ -73,7 +71,7 @@ describe('robot session check actions', () => {
           robotName: 'robot-name',
           ...Fixtures.mockSessionResponse,
         },
-        meta: { requestId: 'abc' },
+        meta: { requestId: 'abc' } as any,
       },
     },
     {
@@ -87,7 +85,7 @@ describe('robot session check actions', () => {
           sessionId: '1234',
           error: mockV2ErrorResponse,
         },
-        meta: { requestId: 'abc' },
+        meta: { requestId: 'abc' } as any,
       },
     },
     {
@@ -97,7 +95,7 @@ describe('robot session check actions', () => {
       expected: {
         type: 'sessions:FETCH_SESSION',
         payload: { robotName: 'robot-name', sessionId: '1234' },
-        meta: {},
+        meta: {} as any,
       },
     },
     {
@@ -110,7 +108,7 @@ describe('robot session check actions', () => {
           robotName: 'robot-name',
           ...Fixtures.mockSessionResponse,
         },
-        meta: { requestId: 'abc' },
+        meta: { requestId: 'abc' } as any,
       },
     },
     {
@@ -124,7 +122,7 @@ describe('robot session check actions', () => {
           sessionId: '1234',
           error: mockV2ErrorResponse,
         },
-        meta: { requestId: 'abc' },
+        meta: { requestId: 'abc' } as any,
       },
     },
     {
@@ -138,7 +136,7 @@ describe('robot session check actions', () => {
           sessionId: '1234',
           command: Fixtures.mockSessionCommand,
         },
-        meta: {},
+        meta: {} as any,
       },
     },
     {
@@ -157,7 +155,7 @@ describe('robot session check actions', () => {
           sessionId: '1234',
           ...Fixtures.mockSessionResponse,
         },
-        meta: { requestId: 'abc' },
+        meta: { requestId: 'abc' } as any,
       },
     },
     {
@@ -171,7 +169,7 @@ describe('robot session check actions', () => {
           sessionId: '1234',
           error: mockV2ErrorResponse,
         },
-        meta: { requestId: 'abc' },
+        meta: { requestId: 'abc' } as any,
       },
     },
     {
@@ -185,7 +183,7 @@ describe('robot session check actions', () => {
           sessionType: 'calibrationCheck',
           params: {},
         },
-        meta: {},
+        meta: {} as any,
       },
     },
     {
diff --git a/app/src/redux/sessions/__tests__/reducer.test.ts b/app/src/redux/sessions/__tests__/reducer.test.ts
index 73e569bae61..f1ac6f72059 100644
--- a/app/src/redux/sessions/__tests__/reducer.test.ts
+++ b/app/src/redux/sessions/__tests__/reducer.test.ts
@@ -1,4 +1,3 @@
-// @flow
 import * as Fixtures from '../__fixtures__'
 import * as Actions from '../actions'
 import { sessionReducer } from '../reducer'
@@ -7,14 +6,14 @@ import { mockV2ErrorResponse } from '../../robot-api/__fixtures__'
 import type { Action } from '../../types'
 import type { SessionState } from '../types'
 
-type ReducerSpec = {|
-  name: string,
-  state: SessionState,
-  action: Action,
-  expected: SessionState,
-|}
+interface ReducerSpec {
+  name: string
+  state: SessionState
+  action: Action
+  expected: SessionState
+}
 
-const SPECS: Array<ReducerSpec> = [
+const SPECS: ReducerSpec[] = [
   {
     name: 'handles sessions:CREATE_SESSION_SUCCESS',
     action: {
@@ -23,7 +22,7 @@ const SPECS: Array<ReducerSpec> = [
         robotName: 'eggplant-parm',
         ...Fixtures.mockSessionResponse,
       },
-      meta: {},
+      meta: {} as any,
     },
     state: {
       'eggplant-parm': {
@@ -49,7 +48,7 @@ const SPECS: Array<ReducerSpec> = [
         robotName: 'eggplant-parm',
         ...Fixtures.mockSessionResponse,
       },
-      meta: {},
+      meta: {} as any,
     },
     state: {
       'eggplant-parm': {
@@ -84,7 +83,7 @@ const SPECS: Array<ReducerSpec> = [
         robotName: 'eggplant-parm',
         ...Fixtures.mockSessionResponse,
       },
-      meta: {},
+      meta: {} as any,
     },
     state: {
       'eggplant-parm': {},
@@ -108,7 +107,7 @@ const SPECS: Array<ReducerSpec> = [
         robotName: 'eggplant-parm',
         ...Fixtures.mockSessionResponse,
       },
-      meta: {},
+      meta: {} as any,
     },
     state: {
       'eggplant-parm': {
@@ -141,7 +140,7 @@ const SPECS: Array<ReducerSpec> = [
       'eggplant-parm',
       Fixtures.mockSessionId,
       Fixtures.mockSessionResponse,
-      {}
+      {} as any
     ),
     state: {
       'eggplant-parm': {
@@ -176,7 +175,7 @@ const SPECS: Array<ReducerSpec> = [
         robotName: 'rock-lobster',
         sessions: Fixtures.mockMultiSessionResponse.data,
       },
-      meta: {},
+      meta: {} as any,
     },
     state: {
       'rock-lobster': {},
@@ -205,7 +204,7 @@ const SPECS: Array<ReducerSpec> = [
         robotName: 'rock-lobster',
         sessions: Fixtures.mockMultiSessionResponse.data,
       },
-      meta: {},
+      meta: {} as any,
     },
     state: {
       'rock-lobster': {
@@ -240,7 +239,7 @@ const SPECS: Array<ReducerSpec> = [
         robotName: 'eggplant-parm',
         ...Fixtures.mockSessionResponse,
       },
-      meta: {},
+      meta: {} as any,
     },
     state: {
       'eggplant-parm': {
@@ -278,7 +277,7 @@ const SPECS: Array<ReducerSpec> = [
       },
       meta: {
         response: { ...Fixtures.mockDeleteSessionFailureMeta, status: 404 },
-      },
+      } as any,
     },
     state: {
       'frumious-bandersnatch': {
@@ -316,7 +315,7 @@ const SPECS: Array<ReducerSpec> = [
       },
       meta: {
         response: { ...Fixtures.mockFetchSessionFailureMeta, status: 404 },
-      },
+      } as any,
     },
     state: {
       'detestable-moss': {
diff --git a/app/src/redux/sessions/actions.ts b/app/src/redux/sessions/actions.ts
index 734f1c3d252..754b88db019 100644
--- a/app/src/redux/sessions/actions.ts
+++ b/app/src/redux/sessions/actions.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import * as Types from './types'
 import * as Constants from './constants'
 import type {
@@ -14,7 +12,8 @@ export const createSession = (
 ): Types.CreateSessionAction => ({
   type: Constants.CREATE_SESSION,
   payload: { robotName, sessionType, params },
-  meta: {},
+  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+  meta: {} as RobotApiRequestMeta,
 })
 
 export const createSessionSuccess = (
@@ -43,7 +42,8 @@ export const deleteSession = (
 ): Types.DeleteSessionAction => ({
   type: Constants.DELETE_SESSION,
   payload: { robotName, sessionId },
-  meta: {},
+  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+  meta: {} as RobotApiRequestMeta,
 })
 
 export const deleteSessionSuccess = (
@@ -73,7 +73,8 @@ export const fetchSession = (
 ): Types.FetchSessionAction => ({
   type: Constants.FETCH_SESSION,
   payload: { robotName, sessionId },
-  meta: {},
+  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+  meta: {} as RobotApiRequestMeta,
 })
 
 export const fetchSessionSuccess = (
@@ -102,7 +103,8 @@ export const fetchAllSessions = (
 ): Types.FetchAllSessionsAction => ({
   type: Constants.FETCH_ALL_SESSIONS,
   payload: { robotName },
-  meta: {},
+  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+  meta: {} as RobotApiRequestMeta,
 })
 
 export const fetchAllSessionsSuccess = (
@@ -132,7 +134,8 @@ export const createSessionCommand = (
 ): Types.CreateSessionCommandAction => ({
   type: Constants.CREATE_SESSION_COMMAND,
   payload: { robotName, sessionId, command },
-  meta: {},
+  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+  meta: {} as RobotApiRequestMeta,
 })
 
 export const createSessionCommandSuccess = (
@@ -164,7 +167,8 @@ export const ensureSession = (
 ): Types.EnsureSessionAction => ({
   type: Constants.ENSURE_SESSION,
   payload: { robotName, sessionType, params },
-  meta: {},
+  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+  meta: {} as RobotApiRequestMeta,
 })
 
 export const clearAllSessions = (
diff --git a/app/src/redux/sessions/calibration-check/constants.ts b/app/src/redux/sessions/calibration-check/constants.ts
index 415773717e7..0231fff9248 100644
--- a/app/src/redux/sessions/calibration-check/constants.ts
+++ b/app/src/redux/sessions/calibration-check/constants.ts
@@ -1,4 +1,3 @@
-// @flow
 // calibration check session contants
 
 import { sharedCalCommands } from '../common-calibration/constants'
diff --git a/app/src/redux/sessions/calibration-check/selectors.ts b/app/src/redux/sessions/calibration-check/selectors.ts
index f4f59a87b15..0fd305b00ed 100644
--- a/app/src/redux/sessions/calibration-check/selectors.ts
+++ b/app/src/redux/sessions/calibration-check/selectors.ts
@@ -1,4 +1,3 @@
-// @flow
 import type { State } from '../../types'
 import { SESSION_TYPE_CALIBRATION_HEALTH_CHECK } from '../constants'
 import type { Session, CalibrationCheckSession } from '../types'
diff --git a/app/src/redux/sessions/calibration-check/types.ts b/app/src/redux/sessions/calibration-check/types.ts
index 3a520d1242c..450cf9bbe0a 100644
--- a/app/src/redux/sessions/calibration-check/types.ts
+++ b/app/src/redux/sessions/calibration-check/types.ts
@@ -1,11 +1,10 @@
-// @flow
 import type { CalibrationLabware } from '../types'
 import type { Mount } from '../../pipettes/types'
-import type { LabwareDefinition2 } from '@opentrons/shared-data'
+import type { LabwareDefinition2, PipetteModel } from '@opentrons/shared-data'
 
 // calibration check session types
 
-import typeof {
+import {
   CHECK_STEP_SESSION_STARTED,
   CHECK_STEP_LABWARE_LOADED,
   CHECK_STEP_INSPECTING_TIP,
@@ -29,74 +28,78 @@ import typeof {
 /* Robot Calibration Check Types */
 
 export type RobotCalibrationCheckStep =
-  | CHECK_STEP_SESSION_STARTED
-  | CHECK_STEP_LABWARE_LOADED
-  | CHECK_STEP_INSPECTING_TIP
-  | CHECK_STEP_PREPARING_PIPETTE
-  | CHECK_STEP_COMPARING_NOZZLE
-  | CHECK_STEP_COMPARING_TIP
-  | CHECK_STEP_COMPARING_HEIGHT
-  | CHECK_STEP_COMPARING_POINT_ONE
-  | CHECK_STEP_COMPARING_POINT_TWO
-  | CHECK_STEP_COMPARING_POINT_THREE
-  | CHECK_STEP_RETURNING_TIP
-  | CHECK_STEP_RESULTS_SUMMARY
-  | CHECK_STEP_SESSION_EXITED
-  | CHECK_STEP_CHECK_COMPLETE
+  | typeof CHECK_STEP_SESSION_STARTED
+  | typeof CHECK_STEP_LABWARE_LOADED
+  | typeof CHECK_STEP_INSPECTING_TIP
+  | typeof CHECK_STEP_PREPARING_PIPETTE
+  | typeof CHECK_STEP_COMPARING_NOZZLE
+  | typeof CHECK_STEP_COMPARING_TIP
+  | typeof CHECK_STEP_COMPARING_HEIGHT
+  | typeof CHECK_STEP_COMPARING_POINT_ONE
+  | typeof CHECK_STEP_COMPARING_POINT_TWO
+  | typeof CHECK_STEP_COMPARING_POINT_THREE
+  | typeof CHECK_STEP_RETURNING_TIP
+  | typeof CHECK_STEP_RESULTS_SUMMARY
+  | typeof CHECK_STEP_SESSION_EXITED
+  | typeof CHECK_STEP_CHECK_COMPLETE
 
 export type RobotCalibrationCheckPipetteRank =
-  | CHECK_PIPETTE_RANK_FIRST
-  | CHECK_PIPETTE_RANK_SECOND
+  | typeof CHECK_PIPETTE_RANK_FIRST
+  | typeof CHECK_PIPETTE_RANK_SECOND
 
 export type RobotCalibrationCheckStatus =
-  | CHECK_STATUS_IN_THRESHOLD
-  | CHECK_STATUS_OUTSIDE_THRESHOLD
+  | typeof CHECK_STATUS_IN_THRESHOLD
+  | typeof CHECK_STATUS_OUTSIDE_THRESHOLD
 
-export type CalibrationCheckInstrument = {|
-  model: string,
-  name: string,
-  tipLength: number,
-  mount: Mount,
-  rank: RobotCalibrationCheckPipetteRank,
-  tipRackLoadName: string,
-  tipRackDisplay: string,
-  tipRackUri: string,
-  serial: string,
-  defaultTipracks: Array<LabwareDefinition2>,
-|}
+export interface CalibrationCheckInstrument {
+  model: PipetteModel
+  name: string
+  tipLength: number
+  mount: Mount
+  rank: RobotCalibrationCheckPipetteRank
+  tipRackLoadName: string
+  tipRackDisplay: string
+  tipRackUri: string
+  serial: string
+  defaultTipracks: LabwareDefinition2[]
+}
 
-export type CalibrationCheckComparison = {|
-  differenceVector: [number, number, number],
-  thresholdVector: [number, number, number],
-  exceedsThreshold: boolean,
-|}
+export interface CalibrationCheckComparison {
+  differenceVector: [number, number, number]
+  thresholdVector: [number, number, number]
+  exceedsThreshold: boolean
+}
 
-export type CalibrationCheckComparisonMap = {
-  status: RobotCalibrationCheckStatus,
-  [RobotCalibrationCheckStep]: CalibrationCheckComparison,
+type CalibrationCheckComparisonByStep = Record<
+  RobotCalibrationCheckStep,
+  CalibrationCheckComparison
+>
+export interface CalibrationCheckComparisonMap
+  extends CalibrationCheckComparisonByStep {
+  status: RobotCalibrationCheckStatus
 }
 
-export type CalibrationCheckComparisonsPerCalibration = {
-  tipLength?: CalibrationCheckComparisonMap,
-  pipetteOffset?: CalibrationCheckComparisonMap,
-  deck?: CalibrationCheckComparisonMap,
+export interface CalibrationCheckComparisonsPerCalibration {
+  tipLength?: CalibrationCheckComparisonMap
+  pipetteOffset?: CalibrationCheckComparisonMap
+  deck?: CalibrationCheckComparisonMap
 }
 
-export type CalibrationCheckComparisonByPipette = {
-  first: CalibrationCheckComparisonsPerCalibration,
-  second: CalibrationCheckComparisonsPerCalibration,
+export interface CalibrationCheckComparisonByPipette {
+  [CHECK_PIPETTE_RANK_FIRST]: CalibrationCheckComparisonsPerCalibration
+  [CHECK_PIPETTE_RANK_SECOND]: CalibrationCheckComparisonsPerCalibration
 }
 
-export type CheckCalibrationSessionDetails = {|
-  instruments: Array<CalibrationCheckInstrument>,
-  currentStep: RobotCalibrationCheckStep,
-  comparisonsByPipette: CalibrationCheckComparisonByPipette,
-  labware: Array<CalibrationLabware>,
-  activePipette: CalibrationCheckInstrument,
-  activeTipRack: CalibrationLabware,
-|}
+export interface CheckCalibrationSessionDetails {
+  instruments: CalibrationCheckInstrument[]
+  currentStep: RobotCalibrationCheckStep
+  comparisonsByPipette: CalibrationCheckComparisonByPipette
+  labware: CalibrationLabware[]
+  activePipette: CalibrationCheckInstrument
+  activeTipRack: CalibrationLabware
+}
 
-export type CheckCalibrationSessionParams = {|
-  hasCalibrationBlock: boolean,
-  tipRacks: Array<CalibrationLabware>,
-|}
+export interface CheckCalibrationSessionParams {
+  hasCalibrationBlock: boolean
+  tipRacks: CalibrationLabware[]
+}
diff --git a/app/src/redux/sessions/common-calibration/constants.ts b/app/src/redux/sessions/common-calibration/constants.ts
index 76b38bf8566..b91f3101a65 100644
--- a/app/src/redux/sessions/common-calibration/constants.ts
+++ b/app/src/redux/sessions/common-calibration/constants.ts
@@ -1,5 +1,3 @@
-// @flow
-
 const LOAD_LABWARE: 'calibration.loadLabware' = 'calibration.loadLabware'
 const JOG: 'calibration.jog' = 'calibration.jog'
 const PICK_UP_TIP: 'calibration.pickUpTip' = 'calibration.pickUpTip'
diff --git a/app/src/redux/sessions/constants.ts b/app/src/redux/sessions/constants.ts
index 1e1c1cc28f2..fb4e249bc9b 100644
--- a/app/src/redux/sessions/constants.ts
+++ b/app/src/redux/sessions/constants.ts
@@ -1,5 +1,3 @@
-// @flow
-
 export * from './calibration-check/constants'
 export * from './tip-length-calibration/constants'
 export * from './deck-calibration/constants'
diff --git a/app/src/redux/sessions/deck-calibration/constants.ts b/app/src/redux/sessions/deck-calibration/constants.ts
index a9ab9759c05..f6e8f26f215 100644
--- a/app/src/redux/sessions/deck-calibration/constants.ts
+++ b/app/src/redux/sessions/deck-calibration/constants.ts
@@ -1,4 +1,3 @@
-// @flow
 // deck calibration sessioin constants
 
 import { sharedCalCommands } from '../common-calibration/constants'
diff --git a/app/src/redux/sessions/deck-calibration/selectors.ts b/app/src/redux/sessions/deck-calibration/selectors.ts
index 5a7680c728b..27d193bb0fe 100644
--- a/app/src/redux/sessions/deck-calibration/selectors.ts
+++ b/app/src/redux/sessions/deck-calibration/selectors.ts
@@ -1,4 +1,3 @@
-// @flow
 import type { State } from '../../types'
 import { SESSION_TYPE_DECK_CALIBRATION } from '../constants'
 import type { Session, DeckCalibrationSession } from '../types'
diff --git a/app/src/redux/sessions/deck-calibration/types.ts b/app/src/redux/sessions/deck-calibration/types.ts
index b67eab2705f..44dd1b7f473 100644
--- a/app/src/redux/sessions/deck-calibration/types.ts
+++ b/app/src/redux/sessions/deck-calibration/types.ts
@@ -1,7 +1,6 @@
-// @flow
 // deck calibration types
 
-import typeof {
+import {
   DECK_STEP_SESSION_STARTED,
   DECK_STEP_LABWARE_LOADED,
   DECK_STEP_PREPARING_PIPETTE,
@@ -13,31 +12,31 @@ import typeof {
   DECK_STEP_CALIBRATION_COMPLETE,
 } from '../constants'
 import type { CalibrationLabware, SessionCommandString } from '../types'
-import type { LabwareDefinition2 } from '@opentrons/shared-data'
+import type { LabwareDefinition2, PipetteModel } from '@opentrons/shared-data'
 
 export type DeckCalibrationStep =
-  | DECK_STEP_SESSION_STARTED
-  | DECK_STEP_LABWARE_LOADED
-  | DECK_STEP_PREPARING_PIPETTE
-  | DECK_STEP_INSPECTING_TIP
-  | DECK_STEP_JOGGING_TO_DECK
-  | DECK_STEP_SAVING_POINT_ONE
-  | DECK_STEP_SAVING_POINT_TWO
-  | DECK_STEP_SAVING_POINT_THREE
-  | DECK_STEP_CALIBRATION_COMPLETE
+  | typeof DECK_STEP_SESSION_STARTED
+  | typeof DECK_STEP_LABWARE_LOADED
+  | typeof DECK_STEP_PREPARING_PIPETTE
+  | typeof DECK_STEP_INSPECTING_TIP
+  | typeof DECK_STEP_JOGGING_TO_DECK
+  | typeof DECK_STEP_SAVING_POINT_ONE
+  | typeof DECK_STEP_SAVING_POINT_TWO
+  | typeof DECK_STEP_SAVING_POINT_THREE
+  | typeof DECK_STEP_CALIBRATION_COMPLETE
 
-export type DeckCalibrationInstrument = {|
-  model: string,
-  name: string,
-  tipLength: number,
-  mount: string,
-  serial: string,
-  defaultTipracks: Array<LabwareDefinition2>,
-|}
+export interface DeckCalibrationInstrument {
+  model: PipetteModel
+  name: string
+  tipLength: number
+  mount: string
+  serial: string
+  defaultTipracks: LabwareDefinition2[]
+}
 
-export type DeckCalibrationSessionDetails = {|
-  instrument: DeckCalibrationInstrument,
-  currentStep: DeckCalibrationStep,
-  labware: Array<CalibrationLabware>,
-  supportedCommands: Array<SessionCommandString>,
-|}
+export interface DeckCalibrationSessionDetails {
+  instrument: DeckCalibrationInstrument
+  currentStep: DeckCalibrationStep
+  labware: CalibrationLabware[]
+  supportedCommands: SessionCommandString[]
+}
diff --git a/app/src/redux/sessions/epic/__tests__/clearAllSessionsOnDisconnectEpic.test.ts b/app/src/redux/sessions/epic/__tests__/clearAllSessionsOnDisconnectEpic.test.ts
index ca1e8b89f9d..d8292c7bf35 100644
--- a/app/src/redux/sessions/epic/__tests__/clearAllSessionsOnDisconnectEpic.test.ts
+++ b/app/src/redux/sessions/epic/__tests__/clearAllSessionsOnDisconnectEpic.test.ts
@@ -1,4 +1,3 @@
-// @flow
 import { TestScheduler } from 'rxjs/testing'
 
 import * as DiscoverySelectors from '../../../discovery/selectors'
@@ -8,22 +7,26 @@ import { mockRobot } from '../../../robot-api/__fixtures__'
 import * as Actions from '../../actions'
 import { sessionsEpic } from '../../epic'
 
+import type { Action, State } from '../../../types'
+
 jest.mock('../../../discovery/selectors')
 jest.mock('../../../robot/selectors')
 
 const mockState = { state: true }
 
-const mockGetRobotByName: JestMockFn<[any, string], mixed> =
-  DiscoverySelectors.getRobotByName
+const mockGetRobotByName = DiscoverySelectors.getRobotByName as jest.MockedFunction<
+  typeof DiscoverySelectors.getRobotByName
+>
 
-const mockGetConnectedRobotName: JestMockFn<[any], ?string> =
-  RobotSelectors.getConnectedRobotName
+const mockGetConnectedRobotName = RobotSelectors.getConnectedRobotName as jest.MockedFunction<
+  typeof RobotSelectors.getConnectedRobotName
+>
 
 describe('clearAllSessionsOnDisconnectEpic', () => {
-  let testScheduler
+  let testScheduler: TestScheduler
 
   beforeEach(() => {
-    mockGetRobotByName.mockReturnValue(mockRobot)
+    mockGetRobotByName.mockReturnValue(mockRobot as any)
     mockGetConnectedRobotName.mockReturnValue(mockRobot.name)
 
     testScheduler = new TestScheduler((actual, expected) => {
@@ -36,14 +39,14 @@ describe('clearAllSessionsOnDisconnectEpic', () => {
   })
 
   it('dispatches CLEAR_ALL_SESSIONS on robot:DISCONNECT', () => {
-    const action = {
+    const action: Action = {
       type: 'robot:DISCONNECT',
       payload: {},
-    }
+    } as any
 
     testScheduler.run(({ hot, cold, expectObservable, flush }) => {
-      const action$ = hot('--a', { a: action })
-      const state$ = hot('a--', { a: mockState })
+      const action$ = hot<Action>('--a', { a: action })
+      const state$ = hot<State>('a--', { a: mockState } as any)
       const output$ = sessionsEpic(action$, state$)
 
       expectObservable(output$).toBe('--a', {
@@ -53,14 +56,14 @@ describe('clearAllSessionsOnDisconnectEpic', () => {
   })
 
   it('dispatches CLEAR_ALL_SESSIONS on robot:UNEXPECTED_DISCONNECT', () => {
-    const action = {
+    const action: Action = {
       type: 'robot:UNEXPECTED_DISCONNECT',
       payload: {},
-    }
+    } as any
 
     testScheduler.run(({ hot, cold, expectObservable, flush }) => {
-      const action$ = hot('--a', { a: action })
-      const state$ = hot('a--', { a: mockState })
+      const action$ = hot<Action>('--a', { a: action })
+      const state$ = hot<State>('a--', { a: mockState } as any)
       const output$ = sessionsEpic(action$, state$)
 
       expectObservable(output$).toBe('--a', {
diff --git a/app/src/redux/sessions/epic/__tests__/createSessionCommandEpic.test.ts b/app/src/redux/sessions/epic/__tests__/createSessionCommandEpic.test.ts
index bcbd642679b..c886f26997d 100644
--- a/app/src/redux/sessions/epic/__tests__/createSessionCommandEpic.test.ts
+++ b/app/src/redux/sessions/epic/__tests__/createSessionCommandEpic.test.ts
@@ -1,4 +1,3 @@
-// @flow
 import { setupEpicTestMocks, runEpicTest } from '../../../robot-api/__utils__'
 import * as RobotApiHttp from '../../../robot-api/http'
 
@@ -6,19 +5,16 @@ import * as Fixtures from '../../__fixtures__'
 import * as Actions from '../../actions'
 import { sessionsEpic } from '..'
 
-import type {
-  RobotHost,
-  RobotApiRequestOptions,
-} from '../../../robot-api/types'
+import type { Action } from '../../../types'
+import { CreateSessionCommandAction } from '../../types'
 
 jest.mock('../../../robot-api/http')
 
-const fetchRobotApi: JestMockFn<
-  [RobotHost, RobotApiRequestOptions],
-  $Call<typeof RobotApiHttp.fetchRobotApi, RobotHost, RobotApiRequestOptions>
-> = RobotApiHttp.fetchRobotApi
+const fetchRobotApi = RobotApiHttp.fetchRobotApi as jest.MockedFunction<
+  typeof RobotApiHttp.fetchRobotApi
+>
 
-const makeTriggerAction = robotName =>
+const makeTriggerAction = (robotName: string): CreateSessionCommandAction =>
   Actions.createSessionCommand(robotName, '1234', Fixtures.mockSessionCommand)
 
 describe('createSessionCommandEpic', () => {
@@ -47,7 +43,7 @@ describe('createSessionCommandEpic', () => {
   it('calls POST /sessions/1234/commands/execute and then GET /sessions/1234', () => {
     const mocks = setupEpicTestMocks(makeTriggerAction)
 
-    runEpicTest(mocks, ({ hot, cold, expectObservable, flush }) => {
+    runEpicTest<Action>(mocks, ({ hot, cold, expectObservable, flush }) => {
       fetchRobotApi.mockReturnValueOnce(
         cold('r', { r: Fixtures.mockSessionCommandsSuccess })
       )
@@ -79,7 +75,7 @@ describe('createSessionCommandEpic', () => {
   it('call does not GET /sessions/1234 if POST fails', () => {
     const mocks = setupEpicTestMocks(makeTriggerAction)
 
-    runEpicTest(mocks, ({ hot, cold, expectObservable, flush }) => {
+    runEpicTest<Action>(mocks, ({ hot, cold, expectObservable, flush }) => {
       fetchRobotApi.mockReturnValueOnce(
         cold('r', { r: Fixtures.mockSessionCommandsFailure })
       )
@@ -98,7 +94,7 @@ describe('createSessionCommandEpic', () => {
   it('maps successful response to CREATE_SESSION_COMMAND_SUCCESS', () => {
     const mocks = setupEpicTestMocks(makeTriggerAction)
 
-    runEpicTest(mocks, ({ hot, cold, expectObservable, flush }) => {
+    runEpicTest<Action>(mocks, ({ hot, cold, expectObservable, flush }) => {
       fetchRobotApi.mockReturnValueOnce(
         cold('-r', { r: Fixtures.mockSessionCommandsSuccess })
       )
@@ -127,7 +123,7 @@ describe('createSessionCommandEpic', () => {
       Fixtures.mockSessionCommandsFailure
     )
 
-    runEpicTest(mocks, ({ hot, expectObservable, flush }) => {
+    runEpicTest<Action>(mocks, ({ hot, expectObservable, flush }) => {
       const action$ = hot('--a', { a: mocks.action })
       const state$ = hot('a-a', { a: mocks.state })
       const output$ = sessionsEpic(action$, state$)
@@ -146,7 +142,7 @@ describe('createSessionCommandEpic', () => {
   it('maps failed GET response to CREATE_SESSION_COMMAND_FAILURE', () => {
     const mocks = setupEpicTestMocks(makeTriggerAction)
 
-    runEpicTest(mocks, ({ hot, cold, expectObservable, flush }) => {
+    runEpicTest<Action>(mocks, ({ hot, cold, expectObservable, flush }) => {
       fetchRobotApi.mockReturnValueOnce(
         cold('-r', { r: Fixtures.mockSessionCommandsSuccess })
       )
diff --git a/app/src/redux/sessions/epic/__tests__/createSessionEpic.test.ts b/app/src/redux/sessions/epic/__tests__/createSessionEpic.test.ts
index 70bbbead8c6..f4ef93f3f8f 100644
--- a/app/src/redux/sessions/epic/__tests__/createSessionEpic.test.ts
+++ b/app/src/redux/sessions/epic/__tests__/createSessionEpic.test.ts
@@ -1,11 +1,12 @@
-// @flow
 import { setupEpicTestMocks, runEpicTest } from '../../../robot-api/__utils__'
 
 import * as Fixtures from '../../__fixtures__'
 import * as Actions from '../../actions'
 import { sessionsEpic } from '..'
 
-const makeTriggerAction = robotName =>
+import type { Action } from '../../../types'
+
+const makeTriggerAction = (robotName: string) =>
   Actions.createSession(robotName, 'calibrationCheck')
 
 describe('createSessionEpic', () => {
@@ -30,7 +31,7 @@ describe('createSessionEpic', () => {
       Fixtures.mockCreateSessionSuccess
     )
 
-    runEpicTest(mocks, ({ hot, expectObservable, flush }) => {
+    runEpicTest<Action>(mocks, ({ hot, expectObservable, flush }) => {
       const action$ = hot('--a', { a: mocks.action })
       const state$ = hot('a-a', { a: mocks.state })
       const output$ = sessionsEpic(action$, state$)
@@ -51,7 +52,7 @@ describe('createSessionEpic', () => {
       Fixtures.mockCreateSessionSuccess
     )
 
-    runEpicTest(mocks, ({ hot, expectObservable, flush }) => {
+    runEpicTest<Action>(mocks, ({ hot, expectObservable, flush }) => {
       const action$ = hot('--a', { a: mocks.action })
       const state$ = hot('s-s', { s: mocks.state })
       const output$ = sessionsEpic(action$, state$)
@@ -72,7 +73,7 @@ describe('createSessionEpic', () => {
       Fixtures.mockCreateSessionFailure
     )
 
-    runEpicTest(mocks, ({ hot, expectObservable, flush }) => {
+    runEpicTest<Action>(mocks, ({ hot, expectObservable, flush }) => {
       const action$ = hot('--a', { a: mocks.action })
       const state$ = hot('s-s', { s: mocks.state })
       const output$ = sessionsEpic(action$, state$)
diff --git a/app/src/redux/sessions/epic/__tests__/deleteSessionEpic.test.ts b/app/src/redux/sessions/epic/__tests__/deleteSessionEpic.test.ts
index 551d4e4cdbc..2d17eccef67 100644
--- a/app/src/redux/sessions/epic/__tests__/deleteSessionEpic.test.ts
+++ b/app/src/redux/sessions/epic/__tests__/deleteSessionEpic.test.ts
@@ -1,11 +1,12 @@
-// @flow
 import { setupEpicTestMocks, runEpicTest } from '../../../robot-api/__utils__'
 
 import * as Fixtures from '../../__fixtures__'
 import * as Actions from '../../actions'
 import { sessionsEpic } from '..'
 
-const makeTriggerAction = robotName =>
+import type { Action } from '../../../types'
+
+const makeTriggerAction = (robotName: string) =>
   Actions.deleteSession(robotName, Fixtures.mockSessionId)
 
 describe('deleteSessionEpic', () => {
@@ -24,7 +25,7 @@ describe('deleteSessionEpic', () => {
       Fixtures.mockDeleteSessionSuccess
     )
 
-    runEpicTest(mocks, ({ hot, expectObservable, flush }) => {
+    runEpicTest<Action>(mocks, ({ hot, expectObservable, flush }) => {
       const action$ = hot('--a', { a: mocks.action })
       const state$ = hot('s-s', { s: mocks.state })
       const output$ = sessionsEpic(action$, state$)
diff --git a/app/src/redux/sessions/epic/__tests__/ensureSessionEpic.test.ts b/app/src/redux/sessions/epic/__tests__/ensureSessionEpic.test.ts
index 0e87ccfb3df..fdaea35ea9a 100644
--- a/app/src/redux/sessions/epic/__tests__/ensureSessionEpic.test.ts
+++ b/app/src/redux/sessions/epic/__tests__/ensureSessionEpic.test.ts
@@ -1,4 +1,3 @@
-// @flow
 import { setupEpicTestMocks, runEpicTest } from '../../../robot-api/__utils__'
 import * as RobotApiHttp from '../../../robot-api/http'
 
@@ -6,19 +5,15 @@ import * as Fixtures from '../../__fixtures__'
 import * as Actions from '../../actions'
 import { sessionsEpic } from '..'
 
-import type {
-  RobotHost,
-  RobotApiRequestOptions,
-} from '../../../robot-api/types'
+import type { Action } from '../../../types'
 
 jest.mock('../../../robot-api/http')
 
-const fetchRobotApi: JestMockFn<
-  [RobotHost, RobotApiRequestOptions],
-  $Call<typeof RobotApiHttp.fetchRobotApi, RobotHost, RobotApiRequestOptions>
-> = RobotApiHttp.fetchRobotApi
+const fetchRobotApi = RobotApiHttp.fetchRobotApi as jest.MockedFunction<
+  typeof RobotApiHttp.fetchRobotApi
+>
 
-const makeTriggerAction = robotName =>
+const makeTriggerAction = (robotName: string): Action =>
   Actions.ensureSession(robotName, 'calibrationCheck', {
     hasCalibrationBlock: true,
     tipRacks: [],
@@ -59,7 +54,7 @@ describe('ensureSessionEpic', () => {
       Fixtures.mockFetchAllSessionsSuccess
     )
 
-    runEpicTest(mocks, ({ hot, expectObservable, flush }) => {
+    runEpicTest<Action>(mocks, ({ hot, expectObservable, flush }) => {
       const action$ = hot('--a', { a: mocks.action })
       const state$ = hot('a-a', { a: mocks.state })
       const output$ = sessionsEpic(action$, state$)
@@ -80,7 +75,7 @@ describe('ensureSessionEpic', () => {
       Fixtures.mockFetchAllSessionsSuccess
     )
 
-    runEpicTest(mocks, ({ hot, expectObservable, flush }) => {
+    runEpicTest<Action>(mocks, ({ hot, expectObservable, flush }) => {
       const action$ = hot('--a', { a: mocks.action })
       const state$ = hot('s-s', { s: mocks.state })
       const output$ = sessionsEpic(action$, state$)
@@ -101,7 +96,7 @@ describe('ensureSessionEpic', () => {
       Fixtures.mockFetchAllSessionsFailure
     )
 
-    runEpicTest(mocks, ({ hot, expectObservable, flush }) => {
+    runEpicTest<Action>(mocks, ({ hot, expectObservable, flush }) => {
       const action$ = hot('--a', { a: mocks.action })
       const state$ = hot('s-s', { s: mocks.state })
       const output$ = sessionsEpic(action$, state$)
@@ -119,7 +114,7 @@ describe('ensureSessionEpic', () => {
   it('calls POST /sessions if fetch all comes back without session', () => {
     const mocks = setupEpicTestMocks(makeTriggerAction)
 
-    runEpicTest(mocks, ({ hot, cold, expectObservable, flush }) => {
+    runEpicTest<Action>(mocks, ({ hot, cold, expectObservable, flush }) => {
       fetchRobotApi.mockReturnValueOnce(
         cold('r', { r: mockEmptyFetchAllSuccess })
       )
@@ -146,7 +141,7 @@ describe('ensureSessionEpic', () => {
   it('maps failed create response to CREATE_SESSION_FAILURE', () => {
     const mocks = setupEpicTestMocks(makeTriggerAction)
 
-    runEpicTest(mocks, ({ hot, cold, expectObservable }) => {
+    runEpicTest<Action>(mocks, ({ hot, cold, expectObservable }) => {
       fetchRobotApi.mockReturnValueOnce(
         cold('r', { r: mockEmptyFetchAllSuccess })
       )
diff --git a/app/src/redux/sessions/epic/__tests__/fetchAllSessionsEpic.test.ts b/app/src/redux/sessions/epic/__tests__/fetchAllSessionsEpic.test.ts
index 1809dd85c5f..2a27faf1c3c 100644
--- a/app/src/redux/sessions/epic/__tests__/fetchAllSessionsEpic.test.ts
+++ b/app/src/redux/sessions/epic/__tests__/fetchAllSessionsEpic.test.ts
@@ -1,4 +1,3 @@
-// @flow
 import { setupEpicTestMocks, runEpicTest } from '../../../robot-api/__utils__'
 
 import * as Fixtures from '../../__fixtures__'
@@ -6,7 +5,10 @@ import * as Actions from '../../actions'
 import { sessionsEpic } from '..'
 import { mockRobot } from '../../../robot-api/__fixtures__'
 
-const makeTriggerAction = robotName => Actions.fetchAllSessions(robotName)
+import type { Action } from '../../../types'
+
+const makeTriggerAction = (robotName: string) =>
+  Actions.fetchAllSessions(robotName)
 
 describe('fetchAllSessionsEpic', () => {
   afterEach(() => {
@@ -24,7 +26,7 @@ describe('fetchAllSessionsEpic', () => {
       Fixtures.mockFetchAllSessionsSuccess
     )
 
-    runEpicTest(mocks, ({ hot, cold, expectObservable, flush }) => {
+    runEpicTest<Action>(mocks, ({ hot, cold, expectObservable, flush }) => {
       const action$ = hot('--a', { a: mocks.action })
       const state$ = hot('s-s', { s: mocks.state })
       const output$ = sessionsEpic(action$, state$)
@@ -45,7 +47,7 @@ describe('fetchAllSessionsEpic', () => {
       Fixtures.mockFetchAllSessionsSuccess
     )
 
-    runEpicTest(mocks, ({ hot, expectObservable, flush }) => {
+    runEpicTest<Action>(mocks, ({ hot, expectObservable, flush }) => {
       const action$ = hot('--a', { a: mocks.action })
       const state$ = hot('s-s', { s: mocks.state })
       const output$ = sessionsEpic(action$, state$)
@@ -66,7 +68,7 @@ describe('fetchAllSessionsEpic', () => {
       Fixtures.mockFetchAllSessionsFailure
     )
 
-    runEpicTest(mocks, ({ hot, expectObservable, flush }) => {
+    runEpicTest<Action>(mocks, ({ hot, expectObservable, flush }) => {
       const action$ = hot('--a', { a: mocks.action })
       const state$ = hot('s-s', { s: mocks.state })
       const output$ = sessionsEpic(action$, state$)
diff --git a/app/src/redux/sessions/epic/__tests__/fetchAllSessionsOnConnectEpic.test.ts b/app/src/redux/sessions/epic/__tests__/fetchAllSessionsOnConnectEpic.test.ts
index 187e20cf967..59d4bebb0d8 100644
--- a/app/src/redux/sessions/epic/__tests__/fetchAllSessionsOnConnectEpic.test.ts
+++ b/app/src/redux/sessions/epic/__tests__/fetchAllSessionsOnConnectEpic.test.ts
@@ -1,4 +1,3 @@
-// @flow
 import { TestScheduler } from 'rxjs/testing'
 
 import * as DiscoverySelectors from '../../../discovery/selectors'
@@ -8,22 +7,26 @@ import { mockRobot } from '../../../robot-api/__fixtures__'
 import * as Actions from '../../actions'
 import { sessionsEpic } from '../../epic'
 
+import type { Action, State } from '../../../types'
+
 jest.mock('../../../discovery/selectors')
 jest.mock('../../../robot/selectors')
 
-const mockState = { state: true }
+const mockState: State = { state: true } as any
 
-const mockGetRobotByName: JestMockFn<[any, string], mixed> =
-  DiscoverySelectors.getRobotByName
+const mockGetRobotByName = DiscoverySelectors.getRobotByName as jest.MockedFunction<
+  typeof DiscoverySelectors.getRobotByName
+>
 
-const mockGetConnectedRobotName: JestMockFn<[any], ?string> =
-  RobotSelectors.getConnectedRobotName
+const mockGetConnectedRobotName = RobotSelectors.getConnectedRobotName as jest.MockedFunction<
+  typeof RobotSelectors.getConnectedRobotName
+>
 
 describe('fetchAllSessionsOnConnectEpic', () => {
-  let testScheduler
+  let testScheduler: TestScheduler
 
   beforeEach(() => {
-    mockGetRobotByName.mockReturnValue(mockRobot)
+    mockGetRobotByName.mockReturnValue(mockRobot as any)
 
     testScheduler = new TestScheduler((actual, expected) => {
       expect(actual).toEqual(expected)
@@ -35,16 +38,16 @@ describe('fetchAllSessionsOnConnectEpic', () => {
   })
 
   it('dispatches nothing robot:CONNECT_RESPONSE failure', () => {
-    const action = {
+    const action: Action = {
       type: 'robot:CONNECT_RESPONSE',
       payload: { error: { message: 'AH' } },
-    }
+    } as any
 
     mockGetConnectedRobotName.mockReturnValue(null)
 
     testScheduler.run(({ hot, cold, expectObservable, flush }) => {
-      const action$ = hot('--a', { a: action })
-      const state$ = hot('a--', { a: mockState })
+      const action$ = hot<Action>('--a', { a: action })
+      const state$ = hot<State>('a--', { a: mockState })
       const output$ = sessionsEpic(action$, state$)
 
       expectObservable(output$).toBe('---')
@@ -52,16 +55,16 @@ describe('fetchAllSessionsOnConnectEpic', () => {
   })
 
   it('dispatches FETCH_ALL_SESSIONS on robot:CONNECT_RESPONSE success', () => {
-    const action = {
+    const action: Action = {
       type: 'robot:CONNECT_RESPONSE',
       payload: {},
-    }
+    } as any
 
     mockGetConnectedRobotName.mockReturnValue(mockRobot.name)
 
     testScheduler.run(({ hot, cold, expectObservable, flush }) => {
-      const action$ = hot('--a', { a: action })
-      const state$ = hot('a--', { a: mockState })
+      const action$ = hot<Action>('--a', { a: action })
+      const state$ = hot<State>('a--', { a: mockState })
       const output$ = sessionsEpic(action$, state$)
 
       expectObservable(output$).toBe('--a', {
diff --git a/app/src/redux/sessions/epic/__tests__/fetchSessionEpic.test.ts b/app/src/redux/sessions/epic/__tests__/fetchSessionEpic.test.ts
index ab281cec2fd..63c3cd4226f 100644
--- a/app/src/redux/sessions/epic/__tests__/fetchSessionEpic.test.ts
+++ b/app/src/redux/sessions/epic/__tests__/fetchSessionEpic.test.ts
@@ -1,4 +1,3 @@
-// @flow
 import { setupEpicTestMocks, runEpicTest } from '../../../robot-api/__utils__'
 
 import * as Fixtures from '../../__fixtures__'
@@ -6,7 +5,9 @@ import * as Actions from '../../actions'
 import { sessionsEpic } from '..'
 import { mockRobot } from '../../../robot-api/__fixtures__'
 
-const makeTriggerAction = robotName =>
+import type { Action } from '../../../types'
+
+const makeTriggerAction = (robotName: string) =>
   Actions.fetchSession(robotName, Fixtures.mockSessionId)
 
 describe('fetchSessionEpic', () => {
@@ -25,7 +26,7 @@ describe('fetchSessionEpic', () => {
       Fixtures.mockFetchSessionSuccess
     )
 
-    runEpicTest(mocks, ({ hot, cold, expectObservable, flush }) => {
+    runEpicTest<Action>(mocks, ({ hot, cold, expectObservable, flush }) => {
       const action$ = hot('--a', { a: mocks.action })
       const state$ = hot('s-s', { s: mocks.state })
       const output$ = sessionsEpic(action$, state$)
diff --git a/app/src/redux/sessions/epic/clearAllSessionsOnDisconnectEpic.ts b/app/src/redux/sessions/epic/clearAllSessionsOnDisconnectEpic.ts
index f8ae49d3720..b5bd1ef2413 100644
--- a/app/src/redux/sessions/epic/clearAllSessionsOnDisconnectEpic.ts
+++ b/app/src/redux/sessions/epic/clearAllSessionsOnDisconnectEpic.ts
@@ -1,4 +1,3 @@
-// @flow
 import { of } from 'rxjs'
 import { filter, switchMap, withLatestFrom } from 'rxjs/operators'
 import { ofType } from 'redux-observable'
@@ -6,7 +5,11 @@ import { ofType } from 'redux-observable'
 import { getConnectedRobotName } from '../../robot/selectors'
 import * as Actions from '../actions'
 
-import type { Epic } from '../../types'
+import type { Action, Epic } from '../../types'
+import type {
+  DisconnectAction,
+  UnexpectedDisconnectAction,
+} from '../../robot/actions'
 
 // NOTE: this epic is responsible for clearing out the (only) redux state of the sessions
 // that belong to the connected robot as soon as it is disconnected. This is doing the
@@ -17,10 +20,12 @@ import type { Epic } from '../../types'
 
 export const clearAllSessionsOnDisconnectEpic: Epic = (action$, state$) => {
   return action$.pipe(
-    ofType('robot:DISCONNECT', 'robot:UNEXPECTED_DISCONNECT'),
+    ofType<Action, DisconnectAction | UnexpectedDisconnectAction>(
+      'robot:DISCONNECT',
+      'robot:UNEXPECTED_DISCONNECT'
+    ),
     withLatestFrom(state$, (_a, s) => getConnectedRobotName(s)),
-    filter(robotName => {
-      console.log(robotName)
+    filter((robotName): robotName is string => {
       return robotName != null
     }),
     switchMap(robotName => of(Actions.clearAllSessions(robotName)))
diff --git a/app/src/redux/sessions/epic/createSessionCommandEpic.ts b/app/src/redux/sessions/epic/createSessionCommandEpic.ts
index f281f81c9f0..4f4d62a8e06 100644
--- a/app/src/redux/sessions/epic/createSessionCommandEpic.ts
+++ b/app/src/redux/sessions/epic/createSessionCommandEpic.ts
@@ -1,4 +1,3 @@
-// @flow
 import { ofType } from 'redux-observable'
 import { of } from 'rxjs'
 import { map, switchMap } from 'rxjs/operators'
@@ -10,13 +9,18 @@ import * as Actions from '../actions'
 import * as Constants from '../constants'
 import { mapActionToRequest as mapActionToFetchSessionRequest } from './fetchSessionEpic'
 
-import type { State, Epic } from '../../types'
+import type { Observable } from 'rxjs'
+import type { State, Action, Epic } from '../../types'
 import type {
   RobotApiRequestOptions,
   RobotHost,
   RobotApiResponse,
 } from '../../robot-api/types'
-import type { CreateSessionCommandAction } from '../types'
+import type {
+  CreateSessionCommandAction,
+  CreateSessionCommandFailureAction,
+  CreateSessionCommandSuccessAction,
+} from '../types'
 
 const mapActionToRequest = (
   action: CreateSessionCommandAction
@@ -36,7 +40,7 @@ const mapActionToRequest = (
 const mapResponseToAction = (
   response: RobotApiResponse,
   originalAction: CreateSessionCommandAction
-) => {
+): CreateSessionCommandFailureAction | CreateSessionCommandSuccessAction => {
   const { host, body, ...responseMeta } = response
   const meta = { ...originalAction.meta, response: responseMeta }
 
@@ -57,22 +61,25 @@ const mapResponseToAction = (
 
 export const createSessionCommandEpic: Epic = (action$, state$) => {
   return action$.pipe(
-    ofType(Constants.CREATE_SESSION_COMMAND),
+    ofType<Action, CreateSessionCommandAction>(
+      Constants.CREATE_SESSION_COMMAND
+    ),
     withRobotHost(state$, a => a.payload.robotName),
-    switchMap<[CreateSessionCommandAction, State, RobotHost], _, _>(
-      ([originalAction, state, host]) => {
-        const commandRequest = mapActionToRequest(originalAction)
-        const fetchRequest = mapActionToFetchSessionRequest(originalAction)
+    switchMap<
+      [CreateSessionCommandAction, State, RobotHost],
+      Observable<Action>
+    >(([originalAction, _state, host]) => {
+      const commandRequest = mapActionToRequest(originalAction)
+      const fetchRequest = mapActionToFetchSessionRequest(originalAction)
 
-        return fetchRobotApi(host, commandRequest).pipe(
-          switchMap(response =>
-            response.ok ? fetchRobotApi(host, fetchRequest) : of(response)
-          ),
-          // NOTE(mc, 2020-06-15): both command execution and session fetch
-          // failure will trigger a failure action
-          map(response => mapResponseToAction(response, originalAction))
-        )
-      }
-    )
+      return fetchRobotApi(host, commandRequest).pipe(
+        switchMap(response =>
+          response.ok ? fetchRobotApi(host, fetchRequest) : of(response)
+        ),
+        // NOTE(mc, 2020-06-15): both command execution and session fetch
+        // failure will trigger a failure action
+        map(response => mapResponseToAction(response, originalAction))
+      )
+    })
   )
 }
diff --git a/app/src/redux/sessions/epic/createSessionEpic.ts b/app/src/redux/sessions/epic/createSessionEpic.ts
index 55e50bd0121..ae8f1719a1b 100644
--- a/app/src/redux/sessions/epic/createSessionEpic.ts
+++ b/app/src/redux/sessions/epic/createSessionEpic.ts
@@ -1,4 +1,3 @@
-// @flow
 import { ofType } from 'redux-observable'
 
 import { POST } from '../../robot-api/constants'
@@ -41,7 +40,7 @@ export const mapResponseToAction = (
 
 export const createSessionEpic: Epic = (action$, state$) => {
   return action$.pipe(
-    ofType(Constants.CREATE_SESSION),
+    ofType<Action, CreateSessionAction>(Constants.CREATE_SESSION),
     mapToRobotApiRequest(
       state$,
       a => a.payload.robotName,
diff --git a/app/src/redux/sessions/epic/deleteSessionEpic.ts b/app/src/redux/sessions/epic/deleteSessionEpic.ts
index 2f3f4ea26fa..40a405c2263 100644
--- a/app/src/redux/sessions/epic/deleteSessionEpic.ts
+++ b/app/src/redux/sessions/epic/deleteSessionEpic.ts
@@ -1,4 +1,3 @@
-// @flow
 import { ofType } from 'redux-observable'
 
 import { DELETE } from '../../robot-api/constants'
@@ -7,7 +6,7 @@ import { mapToRobotApiRequest } from '../../robot-api/operators'
 import * as Actions from '../actions'
 import * as Constants from '../constants'
 
-import type { Epic } from '../../types'
+import type { Action, Epic } from '../../types'
 
 import type {
   ActionToRequestMapper,
@@ -40,7 +39,7 @@ const mapResponseToAction: ResponseToActionMapper<DeleteSessionAction> = (
 
 export const deleteSessionEpic: Epic = (action$, state$) => {
   return action$.pipe(
-    ofType(Constants.DELETE_SESSION),
+    ofType<Action, DeleteSessionAction>(Constants.DELETE_SESSION),
     mapToRobotApiRequest(
       state$,
       a => a.payload.robotName,
diff --git a/app/src/redux/sessions/epic/ensureSessionEpic.ts b/app/src/redux/sessions/epic/ensureSessionEpic.ts
index b0d25d98d6d..a22f4e6b621 100644
--- a/app/src/redux/sessions/epic/ensureSessionEpic.ts
+++ b/app/src/redux/sessions/epic/ensureSessionEpic.ts
@@ -1,4 +1,3 @@
-// @flow
 import { ofType } from 'redux-observable'
 import { of } from 'rxjs'
 import { map, switchMap } from 'rxjs/operators'
@@ -9,7 +8,8 @@ import { withRobotHost } from '../../robot-api/operators'
 
 import * as Constants from '../constants'
 
-import type { State, Epic } from '../../types'
+import type { Observable } from 'rxjs'
+import type { Action, State, Epic } from '../../types'
 import type { RobotHost } from '../../robot-api/types'
 
 import {
@@ -22,7 +22,7 @@ import {
   mapResponseToAction as mapCreateResponseToAction,
 } from './createSessionEpic'
 
-import type { EnsureSessionAction } from '../types'
+import type { EnsureSessionAction, SessionResponseAttributes } from '../types'
 
 // this epic exists to ensure that a session of a given type exists in state
 // it will fetch all sessions and, if the correct session type doesn't already
@@ -30,9 +30,9 @@ import type { EnsureSessionAction } from '../types'
 // actions of fetchAllSessionsEpic and createSessionEpic
 export const ensureSessionEpic: Epic = (action$, state$) => {
   return action$.pipe(
-    ofType(Constants.ENSURE_SESSION),
+    ofType<Action, EnsureSessionAction>(Constants.ENSURE_SESSION),
     withRobotHost<EnsureSessionAction>(state$, a => a.payload.robotName),
-    switchMap<[EnsureSessionAction, State, RobotHost], _, _>(
+    switchMap<[EnsureSessionAction, State, RobotHost], Observable<Action>>(
       ([originalAction, state, host]) => {
         const { sessionType, params } = originalAction.payload
         const fetchAllRequest = mapActionToFetchAllRequest()
@@ -46,7 +46,7 @@ export const ensureSessionEpic: Epic = (action$, state$) => {
             if (
               !ok ||
               body.data.some(
-                s =>
+                (s: SessionResponseAttributes) =>
                   s.sessionType === sessionType &&
                   isEqual(s.createParams, params)
               )
diff --git a/app/src/redux/sessions/epic/fetchAllSessionsEpic.ts b/app/src/redux/sessions/epic/fetchAllSessionsEpic.ts
index 23d50f7a595..133435df99b 100644
--- a/app/src/redux/sessions/epic/fetchAllSessionsEpic.ts
+++ b/app/src/redux/sessions/epic/fetchAllSessionsEpic.ts
@@ -1,4 +1,3 @@
-// @flow
 import { ofType } from 'redux-observable'
 
 import { GET } from '../../robot-api/constants'
@@ -34,7 +33,7 @@ export const mapResponseToAction = (
 
 export const fetchAllSessionsEpic: Epic = (action$, state$) => {
   return action$.pipe(
-    ofType(Constants.FETCH_ALL_SESSIONS),
+    ofType<Action, FetchAllSessionsAction>(Constants.FETCH_ALL_SESSIONS),
     mapToRobotApiRequest(
       state$,
       a => a.payload.robotName,
diff --git a/app/src/redux/sessions/epic/fetchAllSessionsOnConnectEpic.ts b/app/src/redux/sessions/epic/fetchAllSessionsOnConnectEpic.ts
index 85b458fc6c3..1034dce1c9c 100644
--- a/app/src/redux/sessions/epic/fetchAllSessionsOnConnectEpic.ts
+++ b/app/src/redux/sessions/epic/fetchAllSessionsOnConnectEpic.ts
@@ -1,4 +1,3 @@
-// @flow
 import { of } from 'rxjs'
 import { filter, switchMap, withLatestFrom } from 'rxjs/operators'
 import { ofType } from 'redux-observable'
@@ -6,13 +5,16 @@ import { ofType } from 'redux-observable'
 import { getConnectedRobotName } from '../../robot/selectors'
 import * as Actions from '../actions'
 
-import type { Epic } from '../../types'
+import type { Action, Epic } from '../../types'
 
 export const fetchAllSessionsOnConnectEpic: Epic = (action$, state$) => {
   return action$.pipe(
     ofType('robot:CONNECT_RESPONSE'),
     withLatestFrom(state$, (a, s) => [a, getConnectedRobotName(s)]),
-    filter(([action, robotName]) => robotName != null),
+    filter((args): args is [Action, string] => {
+      const [, robotName] = args
+      return robotName != null
+    }),
     switchMap(([action, robotName]) => of(Actions.fetchAllSessions(robotName)))
   )
 }
diff --git a/app/src/redux/sessions/epic/fetchSessionEpic.ts b/app/src/redux/sessions/epic/fetchSessionEpic.ts
index c99604a85b7..b935929e71d 100644
--- a/app/src/redux/sessions/epic/fetchSessionEpic.ts
+++ b/app/src/redux/sessions/epic/fetchSessionEpic.ts
@@ -1,4 +1,3 @@
-// @flow
 import { ofType } from 'redux-observable'
 
 import { GET } from '../../robot-api/constants'
@@ -7,7 +6,7 @@ import { mapToRobotApiRequest } from '../../robot-api/operators'
 import * as Actions from '../actions'
 import * as Constants from '../constants'
 
-import type { Epic } from '../../types'
+import type { Action, Epic } from '../../types'
 
 import type { ResponseToActionMapper } from '../../robot-api/operators'
 import type { RobotApiRequestOptions } from '../../robot-api/types'
@@ -40,7 +39,7 @@ const mapResponseToAction: ResponseToActionMapper<FetchSessionAction> = (
 
 export const fetchSessionEpic: Epic = (action$, state$) => {
   return action$.pipe(
-    ofType(Constants.FETCH_SESSION),
+    ofType<Action, FetchSessionAction>(Constants.FETCH_SESSION),
     mapToRobotApiRequest(
       state$,
       a => a.payload.robotName,
diff --git a/app/src/redux/sessions/epic/index.ts b/app/src/redux/sessions/epic/index.ts
index 7571c545679..a2d8503b5c7 100644
--- a/app/src/redux/sessions/epic/index.ts
+++ b/app/src/redux/sessions/epic/index.ts
@@ -1,4 +1,3 @@
-// @flow
 import { combineEpics } from 'redux-observable'
 import { createSessionEpic } from './createSessionEpic'
 import { ensureSessionEpic } from './ensureSessionEpic'
@@ -11,7 +10,7 @@ import { clearAllSessionsOnDisconnectEpic } from './clearAllSessionsOnDisconnect
 
 import type { Epic } from '../../types'
 
-export const sessionsEpic: Epic = combineEpics(
+export const sessionsEpic: Epic = combineEpics<Epic>(
   createSessionEpic,
   ensureSessionEpic,
   fetchSessionEpic,
diff --git a/app/src/redux/sessions/index.ts b/app/src/redux/sessions/index.ts
index 4e8a4dc5509..0acdbb19291 100644
--- a/app/src/redux/sessions/index.ts
+++ b/app/src/redux/sessions/index.ts
@@ -1,4 +1,3 @@
-// @flow
 // sessions constants, actions, selectors, and types
 import type {
   Session,
diff --git a/app/src/redux/sessions/pipette-offset-calibration/constants.ts b/app/src/redux/sessions/pipette-offset-calibration/constants.ts
index 7400db7e028..1ab347f4c50 100644
--- a/app/src/redux/sessions/pipette-offset-calibration/constants.ts
+++ b/app/src/redux/sessions/pipette-offset-calibration/constants.ts
@@ -1,4 +1,3 @@
-// @flow
 // pipette offset calibration session constants
 import { sharedCalCommands } from '../common-calibration/constants'
 
diff --git a/app/src/redux/sessions/pipette-offset-calibration/selectors.ts b/app/src/redux/sessions/pipette-offset-calibration/selectors.ts
index c16a79d7e5b..7449f80328b 100644
--- a/app/src/redux/sessions/pipette-offset-calibration/selectors.ts
+++ b/app/src/redux/sessions/pipette-offset-calibration/selectors.ts
@@ -1,4 +1,3 @@
-// @flow
 import type { State } from '../../types'
 import { SESSION_TYPE_PIPETTE_OFFSET_CALIBRATION } from '../constants'
 import type { Session, PipetteOffsetCalibrationSession } from '../types'
diff --git a/app/src/redux/sessions/pipette-offset-calibration/types.ts b/app/src/redux/sessions/pipette-offset-calibration/types.ts
index e01b0479869..1817801f6de 100644
--- a/app/src/redux/sessions/pipette-offset-calibration/types.ts
+++ b/app/src/redux/sessions/pipette-offset-calibration/types.ts
@@ -1,6 +1,5 @@
-// @flow
 // pipette offset calibration types
-import typeof {
+import {
   PIP_OFFSET_STEP_SESSION_STARTED,
   PIP_OFFSET_STEP_LABWARE_LOADED,
   PIP_OFFSET_STEP_PREPARING_PIPETTE,
@@ -12,39 +11,39 @@ import typeof {
   PIP_OFFSET_STEP_SESSION_EXITED,
 } from '../constants'
 import type { CalibrationLabware, SessionCommandString } from '../types'
-import type { LabwareDefinition2 } from '@opentrons/shared-data'
+import type { LabwareDefinition2, PipetteModel } from '@opentrons/shared-data'
 
 export type PipetteOffsetCalibrationStep =
-  | PIP_OFFSET_STEP_SESSION_STARTED
-  | PIP_OFFSET_STEP_LABWARE_LOADED
-  | PIP_OFFSET_STEP_PREPARING_PIPETTE
-  | PIP_OFFSET_STEP_INSPECTING_TIP
-  | PIP_OFFSET_STEP_TIP_LENGTH_COMPLETE
-  | PIP_OFFSET_STEP_JOGGING_TO_DECK
-  | PIP_OFFSET_STEP_SAVING_POINT_ONE
-  | PIP_OFFSET_STEP_CALIBRATION_COMPLETE
-  | PIP_OFFSET_STEP_SESSION_EXITED
+  | typeof PIP_OFFSET_STEP_SESSION_STARTED
+  | typeof PIP_OFFSET_STEP_LABWARE_LOADED
+  | typeof PIP_OFFSET_STEP_PREPARING_PIPETTE
+  | typeof PIP_OFFSET_STEP_INSPECTING_TIP
+  | typeof PIP_OFFSET_STEP_TIP_LENGTH_COMPLETE
+  | typeof PIP_OFFSET_STEP_JOGGING_TO_DECK
+  | typeof PIP_OFFSET_STEP_SAVING_POINT_ONE
+  | typeof PIP_OFFSET_STEP_CALIBRATION_COMPLETE
+  | typeof PIP_OFFSET_STEP_SESSION_EXITED
 
-export type PipetteOffsetCalibrationInstrument = {|
-  model: string,
-  name: string,
-  tipLength: number,
-  mount: string,
-  serial: string,
-  defaultTipracks: Array<LabwareDefinition2>,
-|}
+export interface PipetteOffsetCalibrationInstrument {
+  model: PipetteModel
+  name: string
+  tipLength: number
+  mount: string
+  serial: string
+  defaultTipracks: LabwareDefinition2[]
+}
 
-export type PipetteOffsetCalibrationSessionParams = {|
-  mount: string,
-  shouldRecalibrateTipLength: boolean,
-  hasCalibrationBlock: boolean,
-  tipRackDefinition: LabwareDefinition2 | null,
-|}
+export interface PipetteOffsetCalibrationSessionParams {
+  mount: string
+  shouldRecalibrateTipLength: boolean
+  hasCalibrationBlock: boolean
+  tipRackDefinition: LabwareDefinition2 | null
+}
 
-export type PipetteOffsetCalibrationSessionDetails = {|
-  instrument: PipetteOffsetCalibrationInstrument,
-  currentStep: PipetteOffsetCalibrationStep,
-  labware: Array<CalibrationLabware>,
-  shouldPerformTipLength: boolean,
-  supportedCommands: Array<SessionCommandString>,
-|}
+export interface PipetteOffsetCalibrationSessionDetails {
+  instrument: PipetteOffsetCalibrationInstrument
+  currentStep: PipetteOffsetCalibrationStep
+  labware: CalibrationLabware[]
+  shouldPerformTipLength: boolean
+  supportedCommands: SessionCommandString[]
+}
diff --git a/app/src/redux/sessions/reducer.ts b/app/src/redux/sessions/reducer.ts
index 2d9dd6257fc..c910d0e0029 100644
--- a/app/src/redux/sessions/reducer.ts
+++ b/app/src/redux/sessions/reducer.ts
@@ -1,10 +1,10 @@
-// @flow
 import omit from 'lodash/omit'
 
 import * as Constants from './constants'
 
 import type { Action } from '../types'
 
+import type { Reducer } from 'redux'
 import type { SessionState, PerRobotSessionState } from './types'
 
 const INITIAL_STATE: SessionState = {}
@@ -13,10 +13,10 @@ const INITIAL_PER_ROBOT_STATE: PerRobotSessionState = {
   robotSessions: null,
 }
 
-export function sessionReducer(
-  state: SessionState = INITIAL_STATE,
-  action: Action
-): SessionState {
+export const sessionReducer: Reducer<SessionState, Action> = (
+  state = INITIAL_STATE,
+  action
+) => {
   switch (action.type) {
     case Constants.CREATE_SESSION_SUCCESS:
     case Constants.FETCH_SESSION_SUCCESS:
diff --git a/app/src/redux/sessions/selectors.ts b/app/src/redux/sessions/selectors.ts
index f53dff84896..150580e2dce 100644
--- a/app/src/redux/sessions/selectors.ts
+++ b/app/src/redux/sessions/selectors.ts
@@ -1,4 +1,3 @@
-// @flow
 import type { State } from '../types'
 import * as Types from './types'
 
diff --git a/app/src/redux/sessions/tip-length-calibration/constants.ts b/app/src/redux/sessions/tip-length-calibration/constants.ts
index ae600465ceb..7a773f8f18c 100644
--- a/app/src/redux/sessions/tip-length-calibration/constants.ts
+++ b/app/src/redux/sessions/tip-length-calibration/constants.ts
@@ -1,4 +1,3 @@
-// @flow
 // tip length calibration session constants
 import { sharedCalCommands } from '../common-calibration/constants'
 
diff --git a/app/src/redux/sessions/tip-length-calibration/selectors.ts b/app/src/redux/sessions/tip-length-calibration/selectors.ts
index 9d4e68b3104..cf9783e77d1 100644
--- a/app/src/redux/sessions/tip-length-calibration/selectors.ts
+++ b/app/src/redux/sessions/tip-length-calibration/selectors.ts
@@ -1,4 +1,3 @@
-// @flow
 import type { State } from '../../types'
 import { SESSION_TYPE_TIP_LENGTH_CALIBRATION } from '../constants'
 import type { Session, TipLengthCalibrationSession } from '../types'
diff --git a/app/src/redux/sessions/tip-length-calibration/types.ts b/app/src/redux/sessions/tip-length-calibration/types.ts
index 7a00b1db4e6..7e9980d6af7 100644
--- a/app/src/redux/sessions/tip-length-calibration/types.ts
+++ b/app/src/redux/sessions/tip-length-calibration/types.ts
@@ -1,6 +1,5 @@
-// @flow
 // tip length calibration types
-import typeof {
+import {
   TIP_LENGTH_STEP_SESSION_STARTED,
   TIP_LENGTH_STEP_LABWARE_LOADED,
   TIP_LENGTH_STEP_MEASURING_NOZZLE_OFFSET,
@@ -11,34 +10,34 @@ import typeof {
 } from '../constants'
 import type { CalibrationLabware } from '../types'
 
-import type { LabwareDefinition2 } from '@opentrons/shared-data'
+import type { LabwareDefinition2, PipetteModel } from '@opentrons/shared-data'
 
 export type TipLengthCalibrationStep =
-  | TIP_LENGTH_STEP_SESSION_STARTED
-  | TIP_LENGTH_STEP_LABWARE_LOADED
-  | TIP_LENGTH_STEP_MEASURING_NOZZLE_OFFSET
-  | TIP_LENGTH_STEP_PREPARING_PIPETTE
-  | TIP_LENGTH_STEP_INSPECTING_TIP
-  | TIP_LENGTH_STEP_MEASURING_TIP_OFFSET
-  | TIP_LENGTH_STEP_CALIBRATION_COMPLETE
+  | typeof TIP_LENGTH_STEP_SESSION_STARTED
+  | typeof TIP_LENGTH_STEP_LABWARE_LOADED
+  | typeof TIP_LENGTH_STEP_MEASURING_NOZZLE_OFFSET
+  | typeof TIP_LENGTH_STEP_PREPARING_PIPETTE
+  | typeof TIP_LENGTH_STEP_INSPECTING_TIP
+  | typeof TIP_LENGTH_STEP_MEASURING_TIP_OFFSET
+  | typeof TIP_LENGTH_STEP_CALIBRATION_COMPLETE
 
-export type TipLengthCalibrationInstrument = {|
-  model: string,
-  name: string,
-  tipLength: number,
-  mount: string,
-  serial: string,
-  defaultTipracks: Array<LabwareDefinition2>,
-|}
+export interface TipLengthCalibrationInstrument {
+  model: PipetteModel
+  name: string
+  tipLength: number
+  mount: string
+  serial: string
+  defaultTipracks: LabwareDefinition2[]
+}
 
-export type TipLengthCalibrationSessionParams = {|
-  mount: string,
-  hasCalibrationBlock: boolean,
-  tipRackDefinition: LabwareDefinition2,
-|}
+export interface TipLengthCalibrationSessionParams {
+  mount: string
+  hasCalibrationBlock: boolean
+  tipRackDefinition: LabwareDefinition2
+}
 
-export type TipLengthCalibrationSessionDetails = {|
-  instrument: TipLengthCalibrationInstrument,
-  currentStep: TipLengthCalibrationStep,
-  labware: Array<CalibrationLabware>,
-|}
+export interface TipLengthCalibrationSessionDetails {
+  instrument: TipLengthCalibrationInstrument
+  currentStep: TipLengthCalibrationStep
+  labware: CalibrationLabware[]
+}
diff --git a/app/src/redux/sessions/types.ts b/app/src/redux/sessions/types.ts
index 46f5991b083..be9ce194ca4 100644
--- a/app/src/redux/sessions/types.ts
+++ b/app/src/redux/sessions/types.ts
@@ -1,8 +1,6 @@
-// @flow
-
 import type { LabwareDefinition2 } from '@opentrons/shared-data'
 
-import typeof {
+import {
   CREATE_SESSION,
   CREATE_SESSION_SUCCESS,
   CREATE_SESSION_FAILURE,
@@ -42,30 +40,32 @@ import * as DeckCalConstants from './deck-calibration/constants'
 import * as PipOffsetCalConstants from './pipette-offset-calibration/constants'
 import * as CommonCalConstants from './common-calibration/constants'
 
-export type * from './calibration-check/types'
-export type * from './tip-length-calibration/types'
-export type * from './deck-calibration/types'
-export type * from './pipette-offset-calibration/types'
+export * from './calibration-check/types'
+export * from './tip-length-calibration/types'
+export * from './deck-calibration/types'
+export * from './pipette-offset-calibration/types'
 
 // The available session types
 export type SessionType =
-  | SESSION_TYPE_CALIBRATION_HEALTH_CHECK
-  | SESSION_TYPE_TIP_LENGTH_CALIBRATION
-  | SESSION_TYPE_DECK_CALIBRATION
-  | SESSION_TYPE_PIPETTE_OFFSET_CALIBRATION
+  | typeof SESSION_TYPE_CALIBRATION_HEALTH_CHECK
+  | typeof SESSION_TYPE_TIP_LENGTH_CALIBRATION
+  | typeof SESSION_TYPE_DECK_CALIBRATION
+  | typeof SESSION_TYPE_PIPETTE_OFFSET_CALIBRATION
 
 export type SessionParams =
-  | {||}
+  | {}
   | TipLengthCalTypes.TipLengthCalibrationSessionParams
   | PipOffsetCalTypes.PipetteOffsetCalibrationSessionParams
   | CalCheckTypes.CheckCalibrationSessionParams
 
+type Values<O> = O[keyof O]
+
 export type SessionCommandString =
-  | $Values<typeof CalCheckConstants.checkCommands>
-  | $Values<typeof TipCalConstants.tipCalCommands>
-  | $Values<typeof DeckCalConstants.deckCalCommands>
-  | $Values<typeof PipOffsetCalConstants.pipOffsetCalCommands>
-  | $Values<typeof CommonCalConstants.sharedCalCommands>
+  | Values<typeof CalCheckConstants.checkCommands>
+  | Values<typeof TipCalConstants.tipCalCommands>
+  | Values<typeof DeckCalConstants.deckCalCommands>
+  | Values<typeof PipOffsetCalConstants.pipOffsetCalCommands>
+  | Values<typeof CommonCalConstants.sharedCalCommands>
 
 export type CalibrationSessionStep =
   | CalCheckTypes.RobotCalibrationCheckStep
@@ -76,38 +76,38 @@ export type CalibrationSessionStep =
 export type VectorTuple = [number, number, number]
 
 export type SessionCommandData =
-  | {| vector: VectorTuple |}
-  | {| hasBlock: boolean |}
-  | {| tiprackDefinition: LabwareDefinition2 |}
-  | {||}
-
-export type SessionCommandParams = {
-  command: SessionCommandString,
-  data?: SessionCommandData,
+  | { vector: VectorTuple }
+  | { hasBlock: boolean }
+  | { tiprackDefinition: LabwareDefinition2 }
+  | {}
+
+export interface SessionCommandParams {
+  command: SessionCommandString
+  data?: SessionCommandData
+}
+
+export interface CalibrationCheckSessionResponseAttributes {
+  sessionType: typeof SESSION_TYPE_CALIBRATION_HEALTH_CHECK
+  details: CalCheckTypes.CheckCalibrationSessionDetails
+  createParams: CalCheckTypes.CheckCalibrationSessionParams
 }
 
-export type CalibrationCheckSessionResponseAttributes = {|
-  sessionType: SESSION_TYPE_CALIBRATION_HEALTH_CHECK,
-  details: CalCheckTypes.CheckCalibrationSessionDetails,
-  createParams: CalCheckTypes.CheckCalibrationSessionParams,
-|}
-
-export type TipLengthCalibrationSessionResponseAttributes = {|
-  sessionType: SESSION_TYPE_TIP_LENGTH_CALIBRATION,
-  details: TipLengthCalTypes.TipLengthCalibrationSessionDetails,
-  createParams: TipLengthCalTypes.TipLengthCalibrationSessionParams,
-|}
-
-export type DeckCalibrationSessionResponseAttributes = {|
-  sessionType: SESSION_TYPE_DECK_CALIBRATION,
-  details: DeckCalTypes.DeckCalibrationSessionDetails,
-  createParams: {},
-|}
-export type PipetteOffsetCalibrationSessionResponseAttributes = {|
-  sessionType: SESSION_TYPE_PIPETTE_OFFSET_CALIBRATION,
-  details: PipOffsetCalTypes.PipetteOffsetCalibrationSessionDetails,
-  createParams: PipOffsetCalTypes.PipetteOffsetCalibrationSessionParams,
-|}
+export interface TipLengthCalibrationSessionResponseAttributes {
+  sessionType: typeof SESSION_TYPE_TIP_LENGTH_CALIBRATION
+  details: TipLengthCalTypes.TipLengthCalibrationSessionDetails
+  createParams: TipLengthCalTypes.TipLengthCalibrationSessionParams
+}
+
+export interface DeckCalibrationSessionResponseAttributes {
+  sessionType: typeof SESSION_TYPE_DECK_CALIBRATION
+  details: DeckCalTypes.DeckCalibrationSessionDetails
+  createParams: {}
+}
+export interface PipetteOffsetCalibrationSessionResponseAttributes {
+  sessionType: typeof SESSION_TYPE_PIPETTE_OFFSET_CALIBRATION
+  details: PipOffsetCalTypes.PipetteOffsetCalibrationSessionDetails
+  createParams: PipOffsetCalTypes.PipetteOffsetCalibrationSessionParams
+}
 
 export type SessionResponseAttributes =
   | CalibrationCheckSessionResponseAttributes
@@ -115,25 +115,25 @@ export type SessionResponseAttributes =
   | DeckCalibrationSessionResponseAttributes
   | PipetteOffsetCalibrationSessionResponseAttributes
 
-export type CalibrationCheckSession = {|
-  ...CalibrationCheckSessionResponseAttributes,
-  id: string,
-|}
+export interface CalibrationCheckSession
+  extends CalibrationCheckSessionResponseAttributes {
+  id: string
+}
 
-export type TipLengthCalibrationSession = {|
-  ...TipLengthCalibrationSessionResponseAttributes,
-  id: string,
-|}
+export interface TipLengthCalibrationSession
+  extends TipLengthCalibrationSessionResponseAttributes {
+  id: string
+}
 
-export type DeckCalibrationSession = {|
-  ...DeckCalibrationSessionResponseAttributes,
-  id: string,
-|}
+export interface DeckCalibrationSession
+  extends DeckCalibrationSessionResponseAttributes {
+  id: string
+}
 
-export type PipetteOffsetCalibrationSession = {|
-  ...PipetteOffsetCalibrationSessionResponseAttributes,
-  id: string,
-|}
+export interface PipetteOffsetCalibrationSession
+  extends PipetteOffsetCalibrationSessionResponseAttributes {
+  id: string
+}
 
 export type Session =
   | CalibrationCheckSession
@@ -141,157 +141,156 @@ export type Session =
   | DeckCalibrationSession
   | PipetteOffsetCalibrationSession
 
-export type SessionCommandAttributes = {|
-  command: SessionCommandString,
-  data: SessionCommandData,
-|}
+export interface SessionCommandAttributes {
+  command: SessionCommandString
+  data: SessionCommandData
+}
 
 export type SessionResponseModel = Session
 
-export type SessionCommandResponseModel = {|
-  ...SessionCommandAttributes,
-  id: string,
-  status?: string,
-|}
+export interface SessionCommandResponseModel extends SessionCommandAttributes {
+  id: string
+  status?: string
+}
 
 export type SessionResponse = RobotApiV2ResponseBody<SessionResponseModel>
+
 export type MultiSessionResponse = RobotApiV2ResponseBody<
-  $ReadOnlyArray<SessionResponseModel>
+  SessionResponseModel[]
 >
 
 export type SessionCommandResponse = RobotApiV2ResponseBody<SessionCommandResponseModel>
 
-export type CreateSessionAction = {|
-  type: CREATE_SESSION,
-  payload: {|
-    robotName: string,
-    sessionType: SessionType,
-    params: SessionParams,
-  |},
-  meta: RobotApiRequestMeta,
-|}
-
-export type CreateSessionSuccessAction = {|
-  type: CREATE_SESSION_SUCCESS,
-  payload: {| robotName: string, ...SessionResponse |},
-  meta: RobotApiRequestMeta,
-|}
-
-export type CreateSessionFailureAction = {|
-  type: CREATE_SESSION_FAILURE,
-  payload: {| robotName: string, error: RobotApiV2ErrorResponseBody |},
-  meta: RobotApiRequestMeta,
-|}
-
-export type DeleteSessionAction = {|
-  type: DELETE_SESSION,
-  payload: {| robotName: string, sessionId: string |},
-  meta: RobotApiRequestMeta,
-|}
-
-export type DeleteSessionSuccessAction = {|
-  type: DELETE_SESSION_SUCCESS,
-  payload: {| robotName: string, ...SessionResponse |},
-  meta: RobotApiRequestMeta,
-|}
-
-export type DeleteSessionFailureAction = {|
-  type: DELETE_SESSION_FAILURE,
-  payload: {|
-    robotName: string,
-    sessionId: string,
-    error: RobotApiV2ErrorResponseBody,
-  |},
-  meta: RobotApiRequestMeta,
-|}
-
-export type FetchSessionAction = {|
-  type: FETCH_SESSION,
-  payload: {| robotName: string, sessionId: string |},
-  meta: RobotApiRequestMeta,
-|}
-
-export type FetchSessionSuccessAction = {|
-  type: FETCH_SESSION_SUCCESS,
-  payload: {| robotName: string, ...SessionResponse |},
-  meta: RobotApiRequestMeta,
-|}
-
-export type FetchSessionFailureAction = {|
-  type: FETCH_SESSION_FAILURE,
-  payload: {|
-    robotName: string,
-    sessionId: string,
-    error: RobotApiV2ErrorResponseBody,
-  |},
-  meta: RobotApiRequestMeta,
-|}
-
-export type FetchAllSessionsAction = {|
-  type: FETCH_ALL_SESSIONS,
-  payload: {| robotName: string |},
-  meta: RobotApiRequestMeta,
-|}
-
-export type FetchAllSessionsSuccessAction = {|
-  type: FETCH_ALL_SESSIONS_SUCCESS,
-  payload: {|
-    robotName: string,
-    sessions: $ReadOnlyArray<SessionResponseModel>,
-  |},
-  meta: RobotApiRequestMeta,
-|}
-
-export type FetchAllSessionsFailureAction = {|
-  type: FETCH_ALL_SESSIONS_FAILURE,
-  payload: {| robotName: string, error: RobotApiV2ErrorResponseBody |},
-  meta: RobotApiRequestMeta,
-|}
-
-export type EnsureSessionAction = {|
-  type: ENSURE_SESSION,
-  payload: {|
-    robotName: string,
-    sessionType: SessionType,
-    params: SessionParams,
-  |},
-  meta: RobotApiRequestMeta,
-|}
-
-export type CreateSessionCommandAction = {|
-  type: CREATE_SESSION_COMMAND,
-  payload: {|
-    robotName: string,
-    sessionId: string,
-    command: SessionCommandAttributes,
-  |},
-  meta: RobotApiRequestMeta,
-|}
-
-export type CreateSessionCommandSuccessAction = {|
-  type: CREATE_SESSION_COMMAND_SUCCESS,
-  payload: {|
-    robotName: string,
-    sessionId: string,
-    ...SessionResponse,
-  |},
-  meta: RobotApiRequestMeta,
-|}
-
-export type CreateSessionCommandFailureAction = {|
-  type: CREATE_SESSION_COMMAND_FAILURE,
-  payload: {|
-    robotName: string,
-    sessionId: string,
-    error: RobotApiV2ErrorResponseBody,
-  |},
-  meta: RobotApiRequestMeta,
-|}
-
-export type ClearAllSessionsAction = {|
-  type: CLEAR_ALL_SESSIONS,
-  payload: {| robotName: string |},
-|}
+export interface CreateSessionAction {
+  type: typeof CREATE_SESSION
+  payload: {
+    robotName: string
+    sessionType: SessionType
+    params: SessionParams
+  }
+  meta: RobotApiRequestMeta | {}
+}
+
+export interface CreateSessionSuccessAction {
+  type: typeof CREATE_SESSION_SUCCESS
+  payload: { robotName: string } & SessionResponse
+  meta: RobotApiRequestMeta
+}
+
+export interface CreateSessionFailureAction {
+  type: typeof CREATE_SESSION_FAILURE
+  payload: { robotName: string; error: RobotApiV2ErrorResponseBody }
+  meta: RobotApiRequestMeta
+}
+
+export interface DeleteSessionAction {
+  type: typeof DELETE_SESSION
+  payload: { robotName: string; sessionId: string }
+  meta: RobotApiRequestMeta | {}
+}
+
+export interface DeleteSessionSuccessAction {
+  type: typeof DELETE_SESSION_SUCCESS
+  payload: { robotName: string } & SessionResponse
+  meta: RobotApiRequestMeta
+}
+
+export interface DeleteSessionFailureAction {
+  type: typeof DELETE_SESSION_FAILURE
+  payload: {
+    robotName: string
+    sessionId: string
+    error: RobotApiV2ErrorResponseBody
+  }
+  meta: RobotApiRequestMeta
+}
+
+export interface FetchSessionAction {
+  type: typeof FETCH_SESSION
+  payload: { robotName: string; sessionId: string }
+  meta: RobotApiRequestMeta | {}
+}
+
+export interface FetchSessionSuccessAction {
+  type: typeof FETCH_SESSION_SUCCESS
+  payload: { robotName: string } & SessionResponse
+  meta: RobotApiRequestMeta
+}
+
+export interface FetchSessionFailureAction {
+  type: typeof FETCH_SESSION_FAILURE
+  payload: {
+    robotName: string
+    sessionId: string
+    error: RobotApiV2ErrorResponseBody
+  }
+  meta: RobotApiRequestMeta
+}
+
+export interface FetchAllSessionsAction {
+  type: typeof FETCH_ALL_SESSIONS
+  payload: { robotName: string }
+  meta: RobotApiRequestMeta | {}
+}
+
+export interface FetchAllSessionsSuccessAction {
+  type: typeof FETCH_ALL_SESSIONS_SUCCESS
+  payload: {
+    robotName: string
+    readonly sessions: SessionResponseModel[]
+  }
+  meta: RobotApiRequestMeta
+}
+
+export interface FetchAllSessionsFailureAction {
+  type: typeof FETCH_ALL_SESSIONS_FAILURE
+  payload: { robotName: string; error: RobotApiV2ErrorResponseBody }
+  meta: RobotApiRequestMeta
+}
+
+export interface EnsureSessionAction {
+  type: typeof ENSURE_SESSION
+  payload: {
+    robotName: string
+    sessionType: SessionType
+    params: SessionParams
+  }
+  meta: RobotApiRequestMeta | {}
+}
+
+export interface CreateSessionCommandAction {
+  type: typeof CREATE_SESSION_COMMAND
+  payload: {
+    robotName: string
+    sessionId: string
+    command: SessionCommandAttributes
+  }
+  meta: RobotApiRequestMeta | {}
+}
+
+export interface CreateSessionCommandSuccessAction {
+  type: typeof CREATE_SESSION_COMMAND_SUCCESS
+  payload: {
+    robotName: string
+    sessionId: string
+  } & SessionResponse
+  meta: RobotApiRequestMeta
+}
+
+export interface CreateSessionCommandFailureAction {
+  type: typeof CREATE_SESSION_COMMAND_FAILURE
+  payload: {
+    robotName: string
+    sessionId: string
+    error: RobotApiV2ErrorResponseBody
+  }
+  meta: RobotApiRequestMeta
+}
+
+export interface ClearAllSessionsAction {
+  type: typeof CLEAR_ALL_SESSIONS
+  payload: { robotName: string }
+}
 
 export type SessionsAction =
   | CreateSessionAction
@@ -312,27 +311,23 @@ export type SessionsAction =
   | EnsureSessionAction
   | ClearAllSessionsAction
 
-export type SessionsById = $Shape<{|
-  [id: string]: Session,
-|}>
-
-export type PerRobotSessionState = $Shape<
-  $ReadOnly<{|
-    robotSessions: SessionsById | null,
-  |}>
->
-
-export type SessionState = $Shape<
-  $ReadOnly<{|
-    [robotName: string]: void | PerRobotSessionState,
-  |}>
->
+export interface SessionsById {
+  [id: string]: Session
+}
 
-export type CalibrationLabware = {|
-  slot: string,
-  loadName: string,
-  namespace: string,
-  version: number,
-  isTiprack: boolean,
-  definition: LabwareDefinition2,
-|}
+export type PerRobotSessionState = Partial<{
+  readonly robotSessions: SessionsById | null
+}>
+
+export type SessionState = Partial<{
+  readonly [robotName: string]: undefined | PerRobotSessionState
+}>
+
+export interface CalibrationLabware {
+  slot: string
+  loadName: string
+  namespace: string
+  version: number
+  isTiprack: boolean
+  definition: LabwareDefinition2
+}
diff --git a/app/src/redux/shell/__tests__/actions.test.ts b/app/src/redux/shell/__tests__/actions.test.ts
index 55f0c9a6abd..84d748a58f8 100644
--- a/app/src/redux/shell/__tests__/actions.test.ts
+++ b/app/src/redux/shell/__tests__/actions.test.ts
@@ -1,4 +1,3 @@
-// @flow
 import { uiInitialized } from '../actions'
 
 describe('shell actions', () => {
diff --git a/app/src/redux/shell/__tests__/epics.test.ts b/app/src/redux/shell/__tests__/epics.test.ts
index e8589153f97..2056a30c7dc 100644
--- a/app/src/redux/shell/__tests__/epics.test.ts
+++ b/app/src/redux/shell/__tests__/epics.test.ts
@@ -1,4 +1,3 @@
-// @flow
 // tests for the shell module
 import { EMPTY } from 'rxjs'
 import { TestScheduler } from 'rxjs/testing'
@@ -10,8 +9,7 @@ import * as ShellUpdate from '../update'
 import { remote as mockRemote } from '../remote'
 import { shellEpic } from '../epic'
 
-import type { State } from '../../types'
-import type { UpdateChannel } from '../../config/types'
+import type { Action, State } from '../../types'
 
 const { ipcRenderer: mockIpc } = mockRemote
 
@@ -20,18 +18,20 @@ jest.mock('../../config')
 // TODO(mc, 2020-10-08): this is a partial mock because shell/update
 // needs some reorg to split actions and selectors
 jest.mock('../update', () => ({
-  ...jest.requireActual('../update'),
+  ...jest.requireActual<{}>('../update'),
   getAvailableShellUpdate: jest.fn(),
 }))
 
-const getUpdateChannel: JestMockFn<[State], UpdateChannel> =
-  Config.getUpdateChannel
+const getUpdateChannel = Config.getUpdateChannel as jest.MockedFunction<
+  typeof Config.getUpdateChannel
+>
 
-const getAvailableShellUpdate: JestMockFn<[State], string | null> =
-  ShellUpdate.getAvailableShellUpdate
+const getAvailableShellUpdate = ShellUpdate.getAvailableShellUpdate as jest.MockedFunction<
+  typeof ShellUpdate.getAvailableShellUpdate
+>
 
 describe('shell epics', () => {
-  let testScheduler
+  let testScheduler: TestScheduler
 
   beforeEach(() => {
     testScheduler = new TestScheduler((actual, expected) => {
@@ -44,10 +44,10 @@ describe('shell epics', () => {
   })
 
   it('"dispatches" actions to IPC if meta.shell', () => {
-    const shellAction = { type: 'foo', meta: { shell: true } }
+    const shellAction: Action = { type: 'foo', meta: { shell: true } } as any
 
     testScheduler.run(({ hot, expectObservable }) => {
-      const action$ = hot('-a', { a: shellAction })
+      const action$ = hot<Action>('-a', { a: shellAction })
       const output$ = shellEpic(action$, EMPTY)
 
       expectObservable(output$).toBe('--')
@@ -64,20 +64,20 @@ describe('shell epics', () => {
     const shellAction = { type: 'bar' }
     const result = shellEpic(EMPTY, EMPTY).pipe(take(1)).toPromise()
 
-    ;(mockIpc: any).emit('dispatch', {}, shellAction)
+    ;(mockIpc as any).emit('dispatch', {}, shellAction)
 
     return expect(result).resolves.toEqual(shellAction)
   })
 
   it('triggers an appUpdateAvailable alert if an app update becomes available', () => {
-    const mockState: State = ({ mockState: true }: any)
+    const mockState: State = { mockState: true } as any
 
     getAvailableShellUpdate.mockReturnValueOnce(null)
     getAvailableShellUpdate.mockReturnValue('1.2.3')
 
     testScheduler.run(({ hot, expectObservable }) => {
-      const action$ = hot('----')
-      const state$ = hot('-a-a-a', { a: mockState })
+      const action$ = hot<Action>('----')
+      const state$ = hot<State>('-a-a-a', { a: mockState })
       const output$ = shellEpic(action$, state$)
 
       // we only expect the alert to be triggered when state goes from null
@@ -89,14 +89,14 @@ describe('shell epics', () => {
   })
 
   it('should trigger a shell:CHECK_UPDATE action if the update channel changes', () => {
-    const mockState: State = ({ mockState: true }: any)
+    const mockState: State = { mockState: true } as any
 
     getUpdateChannel.mockReturnValueOnce('latest')
     getUpdateChannel.mockReturnValue('beta')
 
     testScheduler.run(({ hot, expectObservable }) => {
-      const action$ = hot('------')
-      const state$ = hot('-a-a-a', { a: mockState })
+      const action$ = hot<Action>('------')
+      const state$ = hot<State>('-a-a-a', { a: mockState })
       const output$ = shellEpic(action$, state$)
 
       // we only expect the alert to be triggered when state changes
diff --git a/app/src/redux/shell/__tests__/update.test.ts b/app/src/redux/shell/__tests__/update.test.ts
index b50fc35691e..1d7916830b5 100644
--- a/app/src/redux/shell/__tests__/update.test.ts
+++ b/app/src/redux/shell/__tests__/update.test.ts
@@ -2,10 +2,17 @@
 
 import * as ShellUpdate from '../update'
 import { shellUpdateReducer } from '../reducer'
+import type { ShellUpdateState, ShellUpdateAction } from '../types'
+import type { State } from '../../types'
 
 describe('shell/update', () => {
   describe('action creators', () => {
-    const SPECS = [
+    const SPECS: Array<{
+      name: string
+      creator: (...args: any[]) => ShellUpdateAction
+      args: any[]
+      expected: any
+    }> = [
       {
         name: 'shell:CHECK_UPDATE',
         creator: ShellUpdate.checkShellUpdate,
@@ -33,20 +40,25 @@ describe('shell/update', () => {
   })
 
   describe('reducer', () => {
-    const SPECS = [
+    const SPECS: Array<{
+      name: string
+      action: ShellUpdateAction
+      initialState: ShellUpdateState
+      expected: any
+    }> = [
       {
         name: 'handles shell:CHECK_UPDATE',
-        action: { type: 'shell:CHECK_UPDATE' },
-        initialState: { checking: false, error: { message: 'AH' } },
+        action: { type: 'shell:CHECK_UPDATE' } as any,
+        initialState: { checking: false, error: { message: 'AH' } } as any,
         expected: { checking: true, error: null },
       },
       {
         name: 'handles shell:CHECK_UPDATE_RESULT with info',
         action: {
           type: 'shell:CHECK_UPDATE_RESULT',
-          payload: { available: true, info: { version: '1.0.0' } },
+          payload: { available: true, info: { version: '1.0.0' } } as any,
         },
-        initialState: { checking: true, available: false, info: null },
+        initialState: { checking: true, available: false, info: null } as any,
         expected: {
           checking: false,
           available: true,
@@ -59,13 +71,13 @@ describe('shell/update', () => {
           type: 'shell:CHECK_UPDATE_RESULT',
           payload: { error: { message: 'AH' } },
         },
-        initialState: { checking: true, error: null },
+        initialState: { checking: true, error: null } as any,
         expected: { checking: false, error: { message: 'AH' } },
       },
       {
         name: 'handles shell:DOWNLOAD_UPDATE',
-        action: { type: 'shell:DOWNLOAD_UPDATE' },
-        initialState: { downloading: false, error: { message: 'AH' } },
+        action: { type: 'shell:DOWNLOAD_UPDATE' } as any,
+        initialState: { downloading: false, error: { message: 'AH' } } as any,
         expected: { downloading: true, error: null },
       },
       {
@@ -74,7 +86,7 @@ describe('shell/update', () => {
           type: 'shell:DOWNLOAD_UPDATE_RESULT',
           payload: {},
         },
-        initialState: { downloading: true, error: null },
+        initialState: { downloading: true, error: null } as any,
         expected: { downloading: false, downloaded: true, error: null },
       },
       {
@@ -83,7 +95,7 @@ describe('shell/update', () => {
           type: 'shell:DOWNLOAD_UPDATE_RESULT',
           payload: { error: { message: 'AH' } },
         },
-        initialState: { downloading: true, error: null },
+        initialState: { downloading: true, error: null } as any,
         expected: {
           downloading: false,
           downloaded: false,
@@ -101,13 +113,18 @@ describe('shell/update', () => {
   })
 
   describe('selectors', () => {
-    const SPECS = [
+    const SPECS: Array<{
+      name: string
+      selector: (state: State) => any
+      state: State
+      expected: unknown
+    }> = [
       {
         name: 'getAvailableShellUpdate with nothing available',
         selector: ShellUpdate.getAvailableShellUpdate,
         state: {
           shell: { update: { available: false, info: { version: '1.0.0' } } },
-        },
+        } as any,
         expected: null,
       },
       {
@@ -115,7 +132,7 @@ describe('shell/update', () => {
         selector: ShellUpdate.getAvailableShellUpdate,
         state: {
           shell: { update: { available: true, info: { version: '1.0.0' } } },
-        },
+        } as any,
         expected: '1.0.0',
       },
     ]
diff --git a/app/src/redux/shell/actions.ts b/app/src/redux/shell/actions.ts
index e924136e129..a4bab6b57aa 100644
--- a/app/src/redux/shell/actions.ts
+++ b/app/src/redux/shell/actions.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import type { UiInitializedAction } from './types'
 
 export const UI_INITIALIZED: 'shell:UI_INITIALIZED' = 'shell:UI_INITIALIZED'
diff --git a/app/src/redux/shell/epic.ts b/app/src/redux/shell/epic.ts
index 066f006db5e..25d9a7f8b83 100644
--- a/app/src/redux/shell/epic.ts
+++ b/app/src/redux/shell/epic.ts
@@ -1,4 +1,3 @@
-// @flow
 import { combineEpics } from 'redux-observable'
 import { fromEvent } from 'rxjs'
 import {
@@ -24,6 +23,7 @@ const log = createLogger(__filename)
 
 const sendActionToShellEpic: Epic = action$ =>
   action$.pipe(
+    // @ts-expect-error protect against absent meta key on action
     filter<Action>(a => a.meta != null && a.meta.shell != null && a.meta.shell),
     tap<Action>((shellAction: Action) =>
       ipcRenderer.send('dispatch', shellAction)
@@ -35,9 +35,10 @@ const receiveActionFromShellEpic: Epic = () =>
   // IPC event listener: (IpcRendererEvent, ...args) => void
   // our action is the only argument, so pluck it out from index 1
   fromEvent<Action>(
+    // @ts-expect-error TODO: fromEvent type expects ArrayLike though ipcRenderer doesn't match that type, don't use fromEvent it's deprecated
     ipcRenderer,
     'dispatch',
-    (_: mixed, incoming: Action) => incoming
+    (_: unknown, incoming: Action) => incoming
   ).pipe<Action>(
     tap(incoming => {
       log.debug('Received action from main via IPC', {
@@ -64,7 +65,7 @@ const checkForUpdateAfterChannelChangeEpic: Epic = (action$, state$) => {
   )
 }
 
-export const shellEpic: Epic = combineEpics(
+export const shellEpic: Epic = combineEpics<Epic>(
   sendActionToShellEpic,
   receiveActionFromShellEpic,
   appUpdateAvailableAlertEpic,
diff --git a/app/src/redux/shell/index.ts b/app/src/redux/shell/index.ts
index 8a332e5198e..465902e915c 100644
--- a/app/src/redux/shell/index.ts
+++ b/app/src/redux/shell/index.ts
@@ -1,11 +1,8 @@
-// @flow
 // desktop shell module
 
-import pkg from '../../../package.json'
-
 export * from './actions'
 export * from './update'
 export * from './robot-logs/actions'
 export * from './robot-logs/selectors'
 
-export const CURRENT_VERSION: string = pkg.version
+export const CURRENT_VERSION: string = _PKG_VERSION_
diff --git a/app/src/redux/shell/reducer.ts b/app/src/redux/shell/reducer.ts
index 298557baa73..9a8a918450d 100644
--- a/app/src/redux/shell/reducer.ts
+++ b/app/src/redux/shell/reducer.ts
@@ -1,11 +1,9 @@
-// @flow
 import { combineReducers } from 'redux'
 
 import { robotLogsReducer } from './robot-logs/reducer'
 
-import type { Reducer } from 'redux'
 import type { Action } from '../types'
-import type { ShellState, ShellUpdateState } from './types'
+import type { ShellUpdateState } from './types'
 
 const INITIAL_STATE: ShellUpdateState = {
   checking: false,
@@ -46,11 +44,8 @@ export function shellUpdateReducer(
 
   return state
 }
-
-export const shellReducer: Reducer<ShellState, Action> = combineReducers<
-  _,
-  Action
->({
+// TODO: (sa 2021-15-18: remove any typed state in combineReducers)
+export const shellReducer = combineReducers<any, Action>({
   update: shellUpdateReducer,
   robotLogs: robotLogsReducer,
 })
diff --git a/app/src/redux/shell/remote.ts b/app/src/redux/shell/remote.ts
index c60e85e7f99..af356e1fcaf 100644
--- a/app/src/redux/shell/remote.ts
+++ b/app/src/redux/shell/remote.ts
@@ -1,11 +1,12 @@
-// @flow
 // access main process remote modules via attachments to `global`
 import assert from 'assert'
 
 import type { Remote } from './types'
 
-export const remote: Remote = new Proxy((({}: any): Remote), {
-  get(target, propName) {
+const emptyRemote: Remote = {} as any
+
+export const remote: Remote = new Proxy(emptyRemote, {
+  get(_target, propName: string): unknown {
     assert(
       global.APP_SHELL_REMOTE,
       'Expected APP_SHELL_REMOTE to be attached to global scope; is app-shell/src/preload.js properly configured?'
@@ -15,7 +16,7 @@ export const remote: Remote = new Proxy((({}: any): Remote), {
       propName in global.APP_SHELL_REMOTE,
       `Expected APP_SHELL_REMOTE.${propName} to exist, is app-shell/src/preload.js properly configured?`
     )
-
-    return global.APP_SHELL_REMOTE[propName]
+    // @ts-expect-error TODO we know that propName is 'ipcRenderer' but TS can't narrow it down
+    return global.APP_SHELL_REMOTE[propName] as Remote
   },
 })
diff --git a/app/src/redux/shell/robot-logs/actions.ts b/app/src/redux/shell/robot-logs/actions.ts
index 98c2482d5ee..12f5ea47959 100644
--- a/app/src/redux/shell/robot-logs/actions.ts
+++ b/app/src/redux/shell/robot-logs/actions.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import type { ThunkAction } from '../../types'
 import type { ViewableRobot } from '../../discovery/types'
 
diff --git a/app/src/redux/shell/robot-logs/reducer.ts b/app/src/redux/shell/robot-logs/reducer.ts
index ce04a0f27e5..c5a5294fd2f 100644
--- a/app/src/redux/shell/robot-logs/reducer.ts
+++ b/app/src/redux/shell/robot-logs/reducer.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import type { Action } from '../../types'
 import type { RobotLogsState } from './types'
 
diff --git a/app/src/redux/shell/robot-logs/selectors.ts b/app/src/redux/shell/robot-logs/selectors.ts
index f83c0a7d9eb..3ce85180c0e 100644
--- a/app/src/redux/shell/robot-logs/selectors.ts
+++ b/app/src/redux/shell/robot-logs/selectors.ts
@@ -1,4 +1,3 @@
-// @flow
 import type { State } from '../../types'
 
 export function getRobotLogsDownloading(state: State): boolean {
diff --git a/app/src/redux/shell/robot-logs/types.ts b/app/src/redux/shell/robot-logs/types.ts
index abb36d53544..c17bbaa91ab 100644
--- a/app/src/redux/shell/robot-logs/types.ts
+++ b/app/src/redux/shell/robot-logs/types.ts
@@ -1,13 +1,11 @@
-// @flow
-
-export type RobotLogsState = $ReadOnly<{|
-  downloading: boolean,
-|}>
+export type RobotLogsState = Readonly<{
+  downloading: boolean
+}>
 
 export type RobotLogsAction =
-  | {|
-      type: 'shell:DOWNLOAD_LOGS',
-      payload: {| logUrls: Array<string> |},
-      meta: {| shell: true |},
-    |}
-  | {| type: 'shell:DOWNLOAD_LOGS_DONE' |}
+  | {
+      type: 'shell:DOWNLOAD_LOGS'
+      payload: { logUrls: string[] }
+      meta: { shell: true }
+    }
+  | { type: 'shell:DOWNLOAD_LOGS_DONE' }
diff --git a/app/src/redux/shell/types.ts b/app/src/redux/shell/types.ts
index dda9754d322..63b1e93ca13 100644
--- a/app/src/redux/shell/types.ts
+++ b/app/src/redux/shell/types.ts
@@ -1,46 +1,50 @@
-// @flow
 import type { Error } from '../types'
 import type { RobotLogsState, RobotLogsAction } from './robot-logs/types'
 
-export type Remote = {|
-  ipcRenderer: {| send: (string, ...args: Array<mixed>) => void |},
-|}
+export interface Remote {
+  ipcRenderer: { send: (s: string, ...args: unknown[]) => void }
+}
 
-export type UpdateInfo = {
-  version: string,
-  files: Array<{ sha512: string, url: string, ... }>,
-  releaseDate: string,
-  releaseNotes?: string,
+interface File {
+  sha512: string
+  url: string
+  [key: string]: unknown
+}
+export interface UpdateInfo {
+  version: string
+  files: File[]
+  releaseDate: string
+  releaseNotes?: string
 }
 
-export type ShellUpdateState = {|
-  checking: boolean,
-  downloading: boolean,
-  available: boolean,
-  downloaded: boolean,
-  error: ?Error,
-  info: ?UpdateInfo,
-|}
+export interface ShellUpdateState {
+  checking: boolean
+  downloading: boolean
+  available: boolean
+  downloaded: boolean
+  error: Error | null | undefined
+  info: UpdateInfo | null | undefined
+}
 
 export type ShellUpdateAction =
-  | {| type: 'shell:CHECK_UPDATE', meta: {| shell: true |} |}
-  | {|
-      type: 'shell:CHECK_UPDATE_RESULT',
-      payload: {| available?: boolean, info?: UpdateInfo, error?: Error |},
-    |}
-  | {| type: 'shell:DOWNLOAD_UPDATE', meta: {| shell: true |} |}
-  | {| type: 'shell:DOWNLOAD_UPDATE_RESULT', payload: {| error?: Error |} |}
-  | {| type: 'shell:APPLY_UPDATE', meta: {| shell: true |} |}
+  | { type: 'shell:CHECK_UPDATE'; meta: { shell: true } }
+  | {
+      type: 'shell:CHECK_UPDATE_RESULT'
+      payload: { available?: boolean; info?: UpdateInfo; error?: Error }
+    }
+  | { type: 'shell:DOWNLOAD_UPDATE'; meta: { shell: true } }
+  | { type: 'shell:DOWNLOAD_UPDATE_RESULT'; payload: { error?: Error } }
+  | { type: 'shell:APPLY_UPDATE'; meta: { shell: true } }
 
-export type ShellState = {|
-  update: ShellUpdateState,
-  robotLogs: RobotLogsState,
-|}
+export interface ShellState {
+  update: ShellUpdateState
+  robotLogs: RobotLogsState
+}
 
-export type UiInitializedAction = {|
-  type: 'shell:UI_INITIALIZED',
-  meta: {| shell: true |},
-|}
+export interface UiInitializedAction {
+  type: 'shell:UI_INITIALIZED'
+  meta: { shell: true }
+}
 
 export type ShellAction =
   | UiInitializedAction
diff --git a/app/src/redux/shell/update.ts b/app/src/redux/shell/update.ts
index b6dc61cc209..3d8299e18d8 100644
--- a/app/src/redux/shell/update.ts
+++ b/app/src/redux/shell/update.ts
@@ -1,4 +1,3 @@
-// @flow
 // shell update substate
 // TODO(mc, 2020-06-10): move to shell/actions and shell/selectors
 import { createSelector } from 'reselect'
@@ -25,8 +24,8 @@ export function getShellUpdateState(state: State): ShellUpdateState {
   return state.shell.update
 }
 
-export const getAvailableShellUpdate: State =>
-  | string
-  | null = createSelector(getShellUpdateState, state =>
+export const getAvailableShellUpdate: (
+  state: State
+) => string | null = createSelector(getShellUpdateState, state =>
   state.available && state.info ? state.info.version : null
 )
diff --git a/app/src/redux/store.ts b/app/src/redux/store.ts
index 1b1bf52f3f4..fcaa4d66777 100644
--- a/app/src/redux/store.ts
+++ b/app/src/redux/store.ts
@@ -1,5 +1,3 @@
-// TODO: BC 2021-02-03 this file should be typed, once redux concerns are in ts
-// initialize redux store and plug in middleware
 import { createStore, applyMiddleware, compose } from 'redux'
 import thunk from 'redux-thunk'
 
@@ -10,7 +8,9 @@ import { apiClientMiddleware as robotApiMiddleware } from './robot/api-client'
 import { rootReducer, history } from './reducer'
 import { rootEpic } from './epic'
 
-const epicMiddleware = createEpicMiddleware()
+import type { Action, State } from './types'
+
+const epicMiddleware = createEpicMiddleware<Action, Action, State, any>()
 
 const middleware = applyMiddleware(
   thunk,
@@ -20,8 +20,8 @@ const middleware = applyMiddleware(
 )
 
 const composeEnhancers =
-  (window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ &&
-    window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__({ maxAge: 200 })) ||
+  ((window as any).__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ &&
+    (window as any).__REDUX_DEVTOOLS_EXTENSION_COMPOSE__({ maxAge: 200 })) ||
   compose
 export const store = createStore(rootReducer, composeEnhancers(middleware))
 
@@ -31,7 +31,7 @@ epicMiddleware.run(rootEpic)
 const unsubscribe = store.subscribe(() => {
   const { config } = store.getState()
   if (config !== null) {
-    if (config.devtools) window.store = store
+    if (config.devtools) (window as any).store = store
     unsubscribe()
   }
 })
diff --git a/app/src/redux/support/__tests__/config-profile.test.ts b/app/src/redux/support/__tests__/config-profile.test.ts
index a72211220e3..329e9d2e8f2 100644
--- a/app/src/redux/support/__tests__/config-profile.test.ts
+++ b/app/src/redux/support/__tests__/config-profile.test.ts
@@ -1,21 +1,17 @@
-// @flow
-
 import { makeProfileUpdate } from '../profile'
 
 import * as Alerts from '../../alerts'
 import * as Config from '../../config'
 
 import type { State } from '../../types'
-import type { AlertId } from '../../alerts/types'
 
 jest.mock('../../alerts/selectors')
 
-const MOCK_STATE: State = ({ mockState: true }: any)
+const MOCK_STATE: State = { mockState: true } as any
 
-const getAlertIsPermanentlyIgnored: JestMockFn<
-  [State, AlertId],
-  boolean | null
-> = Alerts.getAlertIsPermanentlyIgnored
+const getAlertIsPermanentlyIgnored = Alerts.getAlertIsPermanentlyIgnored as jest.MockedFunction<
+  typeof Alerts.getAlertIsPermanentlyIgnored
+>
 
 describe('app config profile updates', () => {
   beforeEach(() => {
diff --git a/app/src/redux/support/__tests__/epic.test.ts b/app/src/redux/support/__tests__/epic.test.ts
index da0e66bb687..60b09b9a625 100644
--- a/app/src/redux/support/__tests__/epic.test.ts
+++ b/app/src/redux/support/__tests__/epic.test.ts
@@ -1,4 +1,3 @@
-// @flow
 // support profile epic test
 import { TestScheduler } from 'rxjs/testing'
 import { configInitialized } from '../../config'
@@ -7,43 +6,40 @@ import * as Event from '../intercom-event'
 import { supportEpic } from '../epic'
 
 import type { Action, State } from '../../types'
-import type { Config } from '../../config/types'
-import type {
-  SupportConfig,
-  SupportProfileUpdate,
-  IntercomEvent,
-} from '../types'
+import type { Observable } from 'rxjs'
 
 jest.mock('../profile')
 jest.mock('../intercom-event')
 
-const makeProfileUpdate: JestMockFn<
-  [Action, State],
-  SupportProfileUpdate | null
-> = Profile.makeProfileUpdate
+const makeProfileUpdate = Profile.makeProfileUpdate as jest.MockedFunction<
+  typeof Profile.makeProfileUpdate
+>
 
-const makeIntercomEvent: JestMockFn<[Action, State], IntercomEvent | null> =
-  Event.makeIntercomEvent
+const makeIntercomEvent = Event.makeIntercomEvent as jest.MockedFunction<
+  typeof Event.makeIntercomEvent
+>
 
-const sendEvent: JestMockFn<[IntercomEvent], void> = Event.sendEvent
+const sendEvent = Event.sendEvent as jest.MockedFunction<typeof Event.sendEvent>
 
-const initializeProfile: JestMockFn<[SupportConfig], void> =
-  Profile.initializeProfile
+const initializeProfile = Profile.initializeProfile as jest.MockedFunction<
+  typeof Profile.initializeProfile
+>
 
-const updateProfile: JestMockFn<[SupportProfileUpdate], void> =
-  Profile.updateProfile
+const updateProfile = Profile.updateProfile as jest.MockedFunction<
+  typeof Profile.updateProfile
+>
 
-const MOCK_ACTION: Action = ({ type: 'MOCK_ACTION' }: any)
-const MOCK_PROFILE_STATE: $Shape<{| ...State, config: $Shape<Config> |}> = {
+const MOCK_ACTION: Action = { type: 'MOCK_ACTION' } as any
+const MOCK_PROFILE_STATE: State = {
   config: {
     support: { userId: 'foo', createdAt: 42, name: 'bar', email: null },
   },
-}
+} as any
 
-const MOCK_EVENT_STATE: $Shape<{| ...State |}> = {}
+const MOCK_EVENT_STATE: State = {} as any
 
 describe('support profile epic', () => {
-  let testScheduler
+  let testScheduler: TestScheduler
 
   beforeEach(() => {
     makeProfileUpdate.mockReturnValue(null)
@@ -59,25 +55,25 @@ describe('support profile epic', () => {
 
   it('should initialize support profile on config:INITIALIZED', () => {
     testScheduler.run(({ hot, expectObservable, flush }) => {
-      const action$ = hot('-a', {
-        a: configInitialized(MOCK_PROFILE_STATE.config),
+      const action$ = hot<Action>('-a', {
+        a: configInitialized(MOCK_PROFILE_STATE.config as any),
       })
-      const state$ = hot('--')
+      const state$ = hot<State>('--')
       const result$ = supportEpic(action$, state$)
 
       expectObservable(result$, '--')
       flush()
 
       expect(initializeProfile).toHaveBeenCalledWith(
-        MOCK_PROFILE_STATE.config.support
+        MOCK_PROFILE_STATE.config?.support
       )
     })
   })
 
   it('should do nothing with actions that do not map to a profile update', () => {
     testScheduler.run(({ hot, expectObservable, flush }) => {
-      const action$ = hot('-a', { a: MOCK_ACTION })
-      const state$ = hot('s-', { s: MOCK_PROFILE_STATE })
+      const action$ = hot<Action>('-a', { a: MOCK_ACTION })
+      const state$ = hot<State>('s-', { s: MOCK_PROFILE_STATE })
       const result$ = supportEpic(action$, state$)
 
       expectObservable(result$, '--')
@@ -90,13 +86,13 @@ describe('support profile epic', () => {
     })
   })
 
-  it('should call a profile update ', () => {
+  it('should call a profile update', () => {
     const profileUpdate = { someProp: 'value' }
     makeProfileUpdate.mockReturnValueOnce(profileUpdate)
 
     testScheduler.run(({ hot, expectObservable, flush }) => {
-      const action$ = hot('-a', { a: MOCK_ACTION })
-      const state$ = hot('s-', { s: MOCK_PROFILE_STATE })
+      const action$ = hot<Action>('-a', { a: MOCK_ACTION })
+      const state$ = hot<State>('s-', { s: MOCK_PROFILE_STATE })
       const result$ = supportEpic(action$, state$)
 
       expectObservable(result$)
@@ -108,7 +104,7 @@ describe('support profile epic', () => {
 })
 
 describe('support event epic', () => {
-  let testScheduler
+  let testScheduler: TestScheduler
 
   beforeEach(() => {
     makeIntercomEvent.mockReturnValue(null)
@@ -124,9 +120,9 @@ describe('support event epic', () => {
 
   it('should do nothing with actions that do not map to an event', () => {
     testScheduler.run(({ hot, expectObservable, flush }) => {
-      const action$ = hot('-a', { a: MOCK_ACTION })
-      const state$ = hot('s-', { s: MOCK_EVENT_STATE })
-      const result$ = supportEpic(action$, state$)
+      const action$ = hot<Action>('-a', { a: MOCK_ACTION })
+      const state$ = hot<State>('s-', { s: MOCK_EVENT_STATE })
+      const result$ = supportEpic(action$, state$ as Observable<State>)
 
       expectObservable(result$, '--')
       flush()
@@ -143,12 +139,12 @@ describe('support event epic', () => {
     const eventPayload = {
       eventName: 'completed-robot-calibration-check',
       metadata: { someProp: 'value' },
-    }
+    } as any
     makeIntercomEvent.mockReturnValueOnce(eventPayload)
 
     testScheduler.run(({ hot, expectObservable, flush }) => {
-      const action$ = hot('-a', { a: MOCK_ACTION })
-      const state$ = hot('s-', { s: MOCK_PROFILE_STATE })
+      const action$ = hot<Action>('-a', { a: MOCK_ACTION })
+      const state$ = hot<State>('s-', { s: MOCK_PROFILE_STATE })
       const result$ = supportEpic(action$, state$)
 
       expectObservable(result$)
diff --git a/app/src/redux/support/__tests__/intercom-binding.test.ts b/app/src/redux/support/__tests__/intercom-binding.test.ts
index f2aaef85a34..86b904e4603 100644
--- a/app/src/redux/support/__tests__/intercom-binding.test.ts
+++ b/app/src/redux/support/__tests__/intercom-binding.test.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import * as IntercomBinding from '../intercom-binding'
 import * as Constants from '../constants'
 
@@ -12,24 +10,28 @@ describe('calling the intercom js api', () => {
   })
   afterEach(() => {
     jest.resetAllMocks()
+    // @ts-expect-error TS expects the operand of delete operator to be optional
     delete global.Intercom
     delete process.env.OT_APP_INTERCOM_ID
     IntercomBinding.setUserId(null)
   })
 
   it('should not boot the intercom api if the global is not present', () => {
+    // @ts-expect-error TS expects the operand of delete operator to be optional
     delete global.Intercom
     IntercomBinding.bootIntercom({})
     expect(intercom).not.toHaveBeenCalled()
   })
 
   it('should not update intercom profiles if the global is not present', () => {
+    // @ts-expect-error TS expects the operand of delete operator to be optional
     delete global.Intercom
     IntercomBinding.updateIntercomProfile({})
     expect(intercom).not.toHaveBeenCalled()
   })
 
   it('should not send intercom events if the global is not present', () => {
+    // @ts-expect-error TS expects the operand of delete operator to be optional
     delete global.Intercom
     IntercomBinding.sendIntercomEvent('someEvent', {})
     expect(intercom).not.toHaveBeenCalled()
diff --git a/app/src/redux/support/__tests__/intercom-event.test.ts b/app/src/redux/support/__tests__/intercom-event.test.ts
index 358a576b62f..e583d92604b 100644
--- a/app/src/redux/support/__tests__/intercom-event.test.ts
+++ b/app/src/redux/support/__tests__/intercom-event.test.ts
@@ -1,28 +1,24 @@
-// @flow
-
-import type { IntercomPayload } from '../types'
 import type { State } from '../../types'
 import * as Binding from '../intercom-binding'
 import * as Calibration from '../../calibration'
 import * as Config from '../../config'
 import * as Sessions from '../../sessions'
 import * as Analytics from '../../analytics'
-import * as AnalyticsTypes from '../../analytics/types'
 import { makeIntercomEvent, sendEvent } from '../intercom-event'
 import * as Constants from '../constants'
 
 jest.mock('../intercom-binding')
 jest.mock('../../analytics/selectors')
 
-const getAnalyticsHealthCheckData: JestMockFn<
-  [State, string, string],
-  AnalyticsTypes.CalibrationHealthCheckAnalyticsData | null
-> = Analytics.getAnalyticsHealthCheckData
+const getAnalyticsHealthCheckData = Analytics.getAnalyticsHealthCheckData as jest.MockedFunction<
+  typeof Analytics.getAnalyticsHealthCheckData
+>
 
-const sendIntercomEvent: JestMockFn<[string, IntercomPayload], void> =
-  Binding.sendIntercomEvent
+const sendIntercomEvent = Binding.sendIntercomEvent as jest.MockedFunction<
+  typeof Binding.sendIntercomEvent
+>
 
-const MOCK_STATE: $Shape<{| ...State |}> = {}
+const MOCK_STATE: State = {} as any
 
 describe('support event tests', () => {
   afterEach(() => {
diff --git a/app/src/redux/support/__tests__/profile.test.ts b/app/src/redux/support/__tests__/profile.test.ts
index 80acc000fb2..a2fc47d5e24 100644
--- a/app/src/redux/support/__tests__/profile.test.ts
+++ b/app/src/redux/support/__tests__/profile.test.ts
@@ -1,20 +1,22 @@
-// @flow
-import { version } from '../../../../package.json'
 import { initializeProfile, updateProfile } from '../profile'
 import * as IntercomBinding from '../intercom-binding'
-import type { IntercomPayload } from '../types'
 
 import type { Config } from '../../config/types'
 
-type SupportConfig = $PropertyType<Config, 'support'>
-
-const bootIntercom: JestMockFn<[IntercomPayload], void> =
-  IntercomBinding.bootIntercom
-const updateIntercomProfile: JestMockFn<[IntercomPayload], void> =
-  IntercomBinding.updateIntercomProfile
-const setUserId: JestMockFn<[string], void> = IntercomBinding.setUserId
-const getIntercomAppId: JestMockFn<[], ?string> =
-  IntercomBinding.getIntercomAppId
+type SupportConfig = Config['support']
+
+const bootIntercom = IntercomBinding.bootIntercom as jest.MockedFunction<
+  typeof IntercomBinding.bootIntercom
+>
+const updateIntercomProfile = IntercomBinding.updateIntercomProfile as jest.MockedFunction<
+  typeof IntercomBinding.updateIntercomProfile
+>
+const setUserId = IntercomBinding.setUserId as jest.MockedFunction<
+  typeof IntercomBinding.setUserId
+>
+const getIntercomAppId = IntercomBinding.getIntercomAppId as jest.MockedFunction<
+  typeof IntercomBinding.getIntercomAppId
+>
 
 jest.mock('../intercom-binding')
 
@@ -24,7 +26,7 @@ describe('support profile tests', () => {
     createdAt: 1234,
     name: null,
     email: null,
-  }
+  } as any
 
   beforeEach(() => {
     getIntercomAppId.mockReturnValue('some-intercom-app-id')
@@ -40,7 +42,7 @@ describe('support profile tests', () => {
     expect(bootIntercom).toHaveBeenCalledWith({
       app_id: 'some-intercom-app-id',
       created_at: 1234,
-      'App Version': version,
+      'App Version': _PKG_VERSION_,
     })
   })
 
diff --git a/app/src/redux/support/__tests__/system-info-profile.test.ts b/app/src/redux/support/__tests__/system-info-profile.test.ts
index f543e854432..043bcda9509 100644
--- a/app/src/redux/support/__tests__/system-info-profile.test.ts
+++ b/app/src/redux/support/__tests__/system-info-profile.test.ts
@@ -1,21 +1,17 @@
-// @flow
-
 import { makeProfileUpdate } from '../profile'
 
 import * as SystemInfo from '../../system-info'
 import * as Fixtures from '../../system-info/__fixtures__'
 
 import type { State } from '../../types'
-import type { U2EAnalyticsProps } from '../../system-info/types'
 
 jest.mock('../../system-info/selectors')
 
-const getU2EDeviceAnalyticsProps: JestMockFn<
-  [State],
-  U2EAnalyticsProps | null
-> = SystemInfo.getU2EDeviceAnalyticsProps
+const getU2EDeviceAnalyticsProps = SystemInfo.getU2EDeviceAnalyticsProps as jest.MockedFunction<
+  typeof SystemInfo.getU2EDeviceAnalyticsProps
+>
 
-const MOCK_STATE: State = ({ mockState: true }: any)
+const MOCK_STATE: State = { mockState: true } as any
 const MOCK_ANALYTICS_PROPS = {
   'U2E Vendor ID': Fixtures.mockRealtekDevice.vendorId,
   'U2E Product ID': Fixtures.mockRealtekDevice.productId,
diff --git a/app/src/redux/support/constants.ts b/app/src/redux/support/constants.ts
index 560a00c9cb7..ac87aab1d82 100644
--- a/app/src/redux/support/constants.ts
+++ b/app/src/redux/support/constants.ts
@@ -1,5 +1,3 @@
-// @flow
-
 // intercom api calls
 export const INTERCOM_BOOT = 'boot'
 export const INTERCOM_UPDATE = 'update'
diff --git a/app/src/redux/support/epic.ts b/app/src/redux/support/epic.ts
index 5462c894e68..29a047e4a29 100644
--- a/app/src/redux/support/epic.ts
+++ b/app/src/redux/support/epic.ts
@@ -1,4 +1,3 @@
-// @flow
 // support profile epic
 import { combineEpics, ofType } from 'redux-observable'
 import { tap, filter, withLatestFrom, ignoreElements } from 'rxjs/operators'
@@ -8,12 +7,13 @@ import { initializeProfile, makeProfileUpdate, updateProfile } from './profile'
 
 import { makeIntercomEvent, sendEvent } from './intercom-event'
 
-import type { Epic } from '../types'
+import type { Action, Epic } from '../types'
 import type { ConfigInitializedAction } from '../config/types'
+import { IntercomEvent, SupportProfileUpdate } from './types'
 
 const initializeSupportEpic: Epic = action$ => {
   return action$.pipe(
-    ofType(Cfg.INITIALIZED),
+    ofType<Action, ConfigInitializedAction>(Cfg.INITIALIZED),
     tap((a: ConfigInitializedAction) => {
       initializeProfile(a.payload.config.support)
     }),
@@ -24,7 +24,9 @@ const initializeSupportEpic: Epic = action$ => {
 const updateProfileEpic: Epic = (action$, state$) => {
   return action$.pipe(
     withLatestFrom(state$, makeProfileUpdate),
-    filter(maybeUpdate => maybeUpdate !== null),
+    filter<SupportProfileUpdate | null, SupportProfileUpdate>(
+      (maybeUpdate): maybeUpdate is SupportProfileUpdate => maybeUpdate !== null
+    ),
     tap(updateProfile),
     ignoreElements()
   )
@@ -33,13 +35,15 @@ const updateProfileEpic: Epic = (action$, state$) => {
 const sendEventEpic: Epic = (action$, state$) => {
   return action$.pipe(
     withLatestFrom(state$, makeIntercomEvent),
-    filter(maybeSend => maybeSend !== null),
+    filter<IntercomEvent | null, IntercomEvent>(
+      (maybeSend): maybeSend is IntercomEvent => maybeSend !== null
+    ),
     tap(sendEvent),
     ignoreElements()
   )
 }
 
-export const supportEpic: Epic = combineEpics(
+export const supportEpic: Epic = combineEpics<Epic>(
   initializeSupportEpic,
   updateProfileEpic,
   sendEventEpic
diff --git a/app/src/redux/support/index.ts b/app/src/redux/support/index.ts
index bbb5eca0bef..cebdce082c0 100644
--- a/app/src/redux/support/index.ts
+++ b/app/src/redux/support/index.ts
@@ -1,4 +1,3 @@
-// @flow
 // user support module
 import { createLogger } from '../../logger'
 import { initializeProfile } from './profile'
diff --git a/app/src/redux/support/intercom-binding.ts b/app/src/redux/support/intercom-binding.ts
index aa51bea24d9..5a311d71333 100644
--- a/app/src/redux/support/intercom-binding.ts
+++ b/app/src/redux/support/intercom-binding.ts
@@ -1,4 +1,3 @@
-// @flow
 // functions for managing the binding to the Intercom js api
 
 import { createLogger } from '../../logger'
@@ -13,7 +12,8 @@ export const setUserId = (newUserId: string | null): void => {
 }
 
 // pulled in from environment at build time
-export const getIntercomAppId = (): ?string => process.env.OT_APP_INTERCOM_ID
+export const getIntercomAppId = (): string | null | undefined =>
+  process.env.OT_APP_INTERCOM_ID
 
 const okToCall = (): boolean => {
   return !!getIntercomAppId() && !!global.Intercom && !!userId
diff --git a/app/src/redux/support/intercom-event.ts b/app/src/redux/support/intercom-event.ts
index 1a50e9b29ad..9e5cbbec283 100644
--- a/app/src/redux/support/intercom-event.ts
+++ b/app/src/redux/support/intercom-event.ts
@@ -1,4 +1,3 @@
-// @flow
 // functions for sending events to intercom, both for enriching user profiles
 // and for triggering contextual support conversations
 import * as Sessions from '../sessions'
diff --git a/app/src/redux/support/profile.ts b/app/src/redux/support/profile.ts
index e81bba1acf7..1c090b04764 100644
--- a/app/src/redux/support/profile.ts
+++ b/app/src/redux/support/profile.ts
@@ -1,6 +1,4 @@
-// @flow
 // functions for managing the user's Intercom profile
-import { version as appVersion } from '../../../package.json'
 import * as Cfg from '../config'
 import * as Alerts from '../alerts'
 import { FF_PREFIX, getRobotAnalyticsData } from '../analytics'
@@ -20,7 +18,7 @@ import type { Action, State } from '../types'
 import type { Config } from '../config/types'
 import type { SupportProfileUpdate } from './types'
 
-type SupportConfig = $PropertyType<Config, 'support'>
+type SupportConfig = Config['support']
 
 export function initializeProfile(config: SupportConfig): void {
   setUserId(config.userId)
@@ -28,7 +26,7 @@ export function initializeProfile(config: SupportConfig): void {
   bootIntercom({
     app_id: getIntercomAppId(),
     created_at: config.createdAt,
-    [Constants.PROFILE_APP_VERSION]: appVersion,
+    [Constants.PROFILE_APP_VERSION]: _PKG_VERSION_,
   })
 }
 
diff --git a/app/src/redux/support/types.ts b/app/src/redux/support/types.ts
index c162f1d9a2d..e5f7a566a0c 100644
--- a/app/src/redux/support/types.ts
+++ b/app/src/redux/support/types.ts
@@ -1,8 +1,6 @@
-// @flow
-
 import type { Config } from '../config/types'
 
-import typeof {
+import {
   INTERCOM_EVENT_CALCHECK_COMPLETE,
   INTERCOM_EVENT_NO_CAL_BLOCK,
 } from './constants'
@@ -10,24 +8,24 @@ import typeof {
 import type { CalibrationHealthCheckAnalyticsData } from '../analytics/types'
 
 export type IntercomEventName =
-  | INTERCOM_EVENT_CALCHECK_COMPLETE
-  | INTERCOM_EVENT_NO_CAL_BLOCK
+  | typeof INTERCOM_EVENT_CALCHECK_COMPLETE
+  | typeof INTERCOM_EVENT_NO_CAL_BLOCK
 
-export type SupportConfig = $PropertyType<Config, 'support'>
+export type SupportConfig = Config['support']
 
-export type BasicIntercomPayload = $Shape<{|
-  [propertyName: string]: string | number | boolean | null,
-|}>
+export type BasicIntercomPayload = Partial<{
+  [propertyName: string]: string | number | boolean | null
+}>
 
 export type IntercomPayload =
   | BasicIntercomPayload
   | CalibrationHealthCheckAnalyticsData
 
-export type SupportProfileUpdate = $Shape<{|
-  [propertyName: string]: string | number | boolean | null,
-|}>
+export type SupportProfileUpdate = Partial<{
+  [propertyName: string]: string | number | boolean | null
+}>
 
-export type IntercomEvent = {|
-  eventName: IntercomEventName,
-  metadata?: IntercomPayload,
-|}
+export interface IntercomEvent {
+  eventName: IntercomEventName
+  metadata?: IntercomPayload
+}
diff --git a/app/src/redux/system-info/__fixtures__/index.ts b/app/src/redux/system-info/__fixtures__/index.ts
index 2b1854782b5..a7ada073bc2 100644
--- a/app/src/redux/system-info/__fixtures__/index.ts
+++ b/app/src/redux/system-info/__fixtures__/index.ts
@@ -1,4 +1,3 @@
-// @flow
 import type { UsbDevice, NetworkInterface } from '../types'
 
 export const mockUsbDevice: UsbDevice = {
diff --git a/app/src/redux/system-info/__tests__/actions.test.ts b/app/src/redux/system-info/__tests__/actions.test.ts
index 70993c36187..fe4677d5a94 100644
--- a/app/src/redux/system-info/__tests__/actions.test.ts
+++ b/app/src/redux/system-info/__tests__/actions.test.ts
@@ -1,18 +1,17 @@
-// @flow
 // system-info actions tests
 
 import * as Actions from '../actions'
 import * as Fixtures from '../__fixtures__'
 import type { SystemInfoAction } from '../types'
 
-type ActionSpec = {|
-  should: string,
-  creator: (...args: Array<any>) => SystemInfoAction,
-  args: Array<any>,
-  expected: SystemInfoAction,
-|}
+interface ActionSpec {
+  should: string
+  creator: (...args: any[]) => SystemInfoAction
+  args: any[]
+  expected: SystemInfoAction
+}
 
-const SPECS: Array<ActionSpec> = [
+const SPECS: ActionSpec[] = [
   {
     should: 'create a systemInfo:USB_DEVICE_ADDED action',
     creator: Actions.usbDeviceAdded,
diff --git a/app/src/redux/system-info/__tests__/epic.test.ts b/app/src/redux/system-info/__tests__/epic.test.ts
index fdb5dfc960b..65bf1a62774 100644
--- a/app/src/redux/system-info/__tests__/epic.test.ts
+++ b/app/src/redux/system-info/__tests__/epic.test.ts
@@ -1,4 +1,3 @@
-// @flow
 import { TestScheduler } from 'rxjs/testing'
 
 import * as Alerts from '../../alerts'
@@ -6,24 +5,25 @@ import * as Selectors from '../selectors'
 import { NOT_APPLICABLE, UP_TO_DATE, OUTDATED } from '../constants'
 import { systemInfoEpic } from '../epic'
 
-import type { State } from '../../types'
+import type { Action, State } from '../../types'
 import type { DriverStatus } from '../types'
 
 jest.mock('../selectors')
 
-const MOCK_STATE: State = ({ mockState: true }: any)
+const MOCK_STATE: State = { mockState: true } as any
 
-const getU2EWindowsDriverStatus: JestMockFn<[State], DriverStatus> =
-  Selectors.getU2EWindowsDriverStatus
+const getU2EWindowsDriverStatus = Selectors.getU2EWindowsDriverStatus as jest.MockedFunction<
+  typeof Selectors.getU2EWindowsDriverStatus
+>
 
 describe('system info epic', () => {
-  let testScheduler
+  let testScheduler: TestScheduler
 
   const expectOutput = (
-    statusValues: Array<DriverStatus>,
-    expectedMarbles,
-    expectedValues
-  ) => {
+    statusValues: DriverStatus[],
+    expectedMarbles: string,
+    expectedValues?: unknown
+  ): void => {
     statusValues.forEach(status => {
       getU2EWindowsDriverStatus.mockImplementationOnce(s => {
         expect(s).toEqual(MOCK_STATE)
@@ -32,8 +32,8 @@ describe('system info epic', () => {
     })
 
     testScheduler.run(({ hot, expectObservable }) => {
-      const action$ = hot('----')
-      const state$ = hot('-s-s', { s: MOCK_STATE })
+      const action$ = hot<Action>('----')
+      const state$ = hot<State>('-s-s', { s: MOCK_STATE })
       const output$ = systemInfoEpic(action$, state$)
 
       expectObservable(output$).toBe(expectedMarbles, expectedValues)
diff --git a/app/src/redux/system-info/__tests__/reducer.test.ts b/app/src/redux/system-info/__tests__/reducer.test.ts
index 1eef14179a4..37c02915a59 100644
--- a/app/src/redux/system-info/__tests__/reducer.test.ts
+++ b/app/src/redux/system-info/__tests__/reducer.test.ts
@@ -1,4 +1,3 @@
-// @flow
 // system-info reducer tests
 
 import * as Fixtures from '../__fixtures__'
@@ -8,14 +7,14 @@ import { systemInfoReducer } from '../reducer'
 import type { Action } from '../../types'
 import type { SystemInfoState } from '../types'
 
-type ReducerSpec = {|
-  should: string,
-  action: Action,
-  initialState: SystemInfoState,
-  expectedState: SystemInfoState,
-|}
+interface ReducerSpec {
+  should: string
+  action: Action
+  initialState: SystemInfoState
+  expectedState: SystemInfoState
+}
 
-const SPECS: Array<ReducerSpec> = [
+const SPECS: ReducerSpec[] = [
   {
     should: 'handle systemInfo:INITIALIZED action',
     action: Actions.initialized(
diff --git a/app/src/redux/system-info/__tests__/selectors.test.ts b/app/src/redux/system-info/__tests__/selectors.test.ts
index ec986016a8a..0d411bf9044 100644
--- a/app/src/redux/system-info/__tests__/selectors.test.ts
+++ b/app/src/redux/system-info/__tests__/selectors.test.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import * as Fixtures from '../__fixtures__'
 import * as Selectors from '../selectors'
 import * as Utils from '../utils'
@@ -13,20 +11,20 @@ describe('robot controls selectors', () => {
   })
 
   it('should return null by default with getU2EAdapterDevice', () => {
-    const state: State = ({
+    const state: State = {
       systemInfo: { usbDevices: [], networkInterfaces: [] },
-    }: $Shape<State>)
+    } as any
 
     expect(Selectors.getU2EAdapterDevice(state)).toBe(null)
   })
 
   it('should return a Realtek device with getU2EAdapterDevice', () => {
-    const state: State = ({
+    const state: State = {
       systemInfo: {
         usbDevices: [Fixtures.mockUsbDevice, Fixtures.mockRealtekDevice],
         networkInterfaces: [],
       },
-    }: $Shape<State>)
+    } as any
 
     expect(Selectors.getU2EAdapterDevice(state)).toBe(
       Fixtures.mockRealtekDevice
@@ -35,12 +33,12 @@ describe('robot controls selectors', () => {
 
   describe('getU2EWindowsDriverStatus', () => {
     it('should return NOT_APPLICABLE if no Windows Realtek devices', () => {
-      const state: State = ({
+      const state: State = {
         systemInfo: {
           usbDevices: [Fixtures.mockUsbDevice, Fixtures.mockRealtekDevice],
           networkInterfaces: [],
         },
-      }: $Shape<State>)
+      } as any
 
       expect(Selectors.getU2EWindowsDriverStatus(state)).toBe(
         Constants.NOT_APPLICABLE
@@ -56,7 +54,7 @@ describe('robot controls selectors', () => {
           : Constants.NOT_APPLICABLE
       })
 
-      const state: State = ({
+      const state: State = {
         systemInfo: {
           usbDevices: [
             Fixtures.mockUsbDevice,
@@ -64,7 +62,7 @@ describe('robot controls selectors', () => {
           ],
           networkInterfaces: [],
         },
-      }: $Shape<State>)
+      } as any
 
       expect(Selectors.getU2EWindowsDriverStatus(state)).toBe(
         Constants.OUTDATED
@@ -74,20 +72,20 @@ describe('robot controls selectors', () => {
 
   describe('getU2EInterfacesMap', () => {
     it('should return empty dict by default', () => {
-      const state: State = ({
+      const state: State = {
         systemInfo: { usbDevices: [], networkInterfaces: [] },
-      }: $Shape<State>)
+      } as any
 
       expect(Selectors.getU2EInterfacesMap(state)).toEqual({})
     })
 
     it('should return empty iface array if adapter found but no interface with same MAC', () => {
-      const state: State = ({
+      const state: State = {
         systemInfo: {
           usbDevices: [Fixtures.mockRealtekDevice],
           networkInterfaces: [Fixtures.mockNetworkInterface],
         },
-      }: $Shape<State>)
+      } as any
 
       expect(Selectors.getU2EInterfacesMap(state)).toEqual({
         [Fixtures.mockRealtekDevice.serialNumber]: [],
@@ -105,9 +103,9 @@ describe('robot controls selectors', () => {
         mac: mac.join(':').toLowerCase(),
       }
 
-      const state: State = ({
+      const state: State = {
         systemInfo: { usbDevices: [adapter], networkInterfaces: [iface] },
-      }: $Shape<State>)
+      } as any
 
       expect(Selectors.getU2EInterfacesMap(state)).toEqual({
         [adapter.serialNumber]: [iface],
@@ -140,7 +138,7 @@ describe('robot controls selectors', () => {
         mac: mac2.join(':').toLowerCase(),
       }
 
-      const state: State = ({
+      const state: State = {
         systemInfo: {
           usbDevices: [adapter1, adapter2],
           networkInterfaces: [
@@ -150,7 +148,7 @@ describe('robot controls selectors', () => {
             iface2v4,
           ],
         },
-      }: $Shape<State>)
+      } as any
 
       expect(Selectors.getU2EInterfacesMap(state)).toEqual({
         [adapter1.serialNumber]: [iface1v4, iface1v6],
@@ -161,23 +159,23 @@ describe('robot controls selectors', () => {
 
   describe('getU2EDeviceAnalyticsProps', () => {
     it('should return null if no Realtek device', () => {
-      const state: State = ({
+      const state: State = {
         systemInfo: {
           usbDevices: [Fixtures.mockUsbDevice],
           networkInterfaces: [],
         },
-      }: $Shape<State>)
+      } as any
 
       expect(Selectors.getU2EDeviceAnalyticsProps(state)).toBe(null)
     })
 
     it('should return device props if Realtek device', () => {
-      const state: State = ({
+      const state: State = {
         systemInfo: {
           usbDevices: [Fixtures.mockRealtekDevice],
           networkInterfaces: [],
         },
-      }: $Shape<State>)
+      } as any
 
       expect(Selectors.getU2EDeviceAnalyticsProps(state)).toEqual({
         'U2E Vendor ID': Fixtures.mockRealtekDevice.vendorId,
@@ -190,12 +188,12 @@ describe('robot controls selectors', () => {
     })
 
     it('should include Windows driver version if applicable', () => {
-      const state: State = ({
+      const state: State = {
         systemInfo: {
           usbDevices: [Fixtures.mockWindowsRealtekDevice],
           networkInterfaces: [],
         },
-      }: $Shape<State>)
+      } as any
 
       expect(Selectors.getU2EDeviceAnalyticsProps(state)).toMatchObject({
         'U2E Windows Driver Version':
@@ -218,12 +216,12 @@ describe('robot controls selectors', () => {
         mac: mac.join(':').toLowerCase(),
       }
 
-      const state: State = ({
+      const state: State = {
         systemInfo: {
           usbDevices: [adapter],
           networkInterfaces: [ifaceV6, ifaceV4],
         },
-      }: $Shape<State>)
+      } as any
 
       expect(Selectors.getU2EDeviceAnalyticsProps(state)).toMatchObject({
         'U2E IPv4 Address': ifaceV4.address,
diff --git a/app/src/redux/system-info/__tests__/utils.test.ts b/app/src/redux/system-info/__tests__/utils.test.ts
index 77ae295e62f..6c0adaad10d 100644
--- a/app/src/redux/system-info/__tests__/utils.test.ts
+++ b/app/src/redux/system-info/__tests__/utils.test.ts
@@ -1,5 +1,3 @@
-// @flow
-
 import { mockUsbDevice, mockRealtekDevice } from '../__fixtures__'
 import { isRealtekU2EAdapter, getDriverStatus } from '../utils'
 
diff --git a/app/src/redux/system-info/actions.ts b/app/src/redux/system-info/actions.ts
index 18ae97e7bef..687aaeb599a 100644
--- a/app/src/redux/system-info/actions.ts
+++ b/app/src/redux/system-info/actions.ts
@@ -1,12 +1,11 @@
-// @flow
 // system-info actions
 
 import * as Constants from './constants'
 import * as Types from './types'
 
 export const initialized = (
-  usbDevices: Array<Types.UsbDevice>,
-  networkInterfaces: Array<Types.NetworkInterface>
+  usbDevices: Types.UsbDevice[],
+  networkInterfaces: Types.NetworkInterface[]
 ): Types.InitializedAction => ({
   type: Constants.INITIALIZED,
   payload: { usbDevices, networkInterfaces },
@@ -27,7 +26,7 @@ export const usbDeviceRemoved = (
 })
 
 export const networkInterfacesChanged = (
-  networkInterfaces: Array<Types.NetworkInterface>
+  networkInterfaces: Types.NetworkInterface[]
 ): Types.NetworkInterfacesChangedAction => ({
   type: Constants.NETWORK_INTERFACES_CHANGED,
   payload: { networkInterfaces },
diff --git a/app/src/redux/system-info/constants.ts b/app/src/redux/system-info/constants.ts
index 33d0c8cd856..bb02dba0fd0 100644
--- a/app/src/redux/system-info/constants.ts
+++ b/app/src/redux/system-info/constants.ts
@@ -1,5 +1,3 @@
-// @flow
-
 // TODO(mc, 2020-05-07): move to config when we have config migration
 // https://github.com/Opentrons/opentrons/issues/5587
 export const U2E_DRIVER_UPDATE_URL =
diff --git a/app/src/redux/system-info/epic.ts b/app/src/redux/system-info/epic.ts
index 914d291db38..104a39b6a08 100644
--- a/app/src/redux/system-info/epic.ts
+++ b/app/src/redux/system-info/epic.ts
@@ -1,4 +1,3 @@
-// @flow
 import { map, mapTo, pairwise, filter } from 'rxjs/operators'
 
 import * as Alerts from '../alerts'
diff --git a/app/src/redux/system-info/index.ts b/app/src/redux/system-info/index.ts
index 01af5346adf..d71c9eba2fe 100644
--- a/app/src/redux/system-info/index.ts
+++ b/app/src/redux/system-info/index.ts
@@ -1,4 +1,3 @@
-// @flow
 // system-info UI module
 
 export * from './actions'
diff --git a/app/src/redux/system-info/reducer.ts b/app/src/redux/system-info/reducer.ts
index c424b9fcf6c..c4b3879ce48 100644
--- a/app/src/redux/system-info/reducer.ts
+++ b/app/src/redux/system-info/reducer.ts
@@ -1,8 +1,8 @@
-// @flow
 // system-info reducer
 
 import * as Constants from './constants'
 
+import type { Reducer } from 'redux'
 import type { Action } from '../types'
 import type { SystemInfoState } from './types'
 
@@ -11,10 +11,10 @@ const INITIAL_STATE: SystemInfoState = {
   networkInterfaces: [],
 }
 
-export function systemInfoReducer(
-  state: SystemInfoState = INITIAL_STATE,
-  action: Action
-): SystemInfoState {
+export const systemInfoReducer: Reducer<SystemInfoState, Action> = (
+  state = INITIAL_STATE,
+  action
+) => {
   switch (action.type) {
     case Constants.INITIALIZED: {
       const { usbDevices, networkInterfaces } = action.payload
diff --git a/app/src/redux/system-info/selectors.ts b/app/src/redux/system-info/selectors.ts
index 366f9b20d61..d3cf5f54ade 100644
--- a/app/src/redux/system-info/selectors.ts
+++ b/app/src/redux/system-info/selectors.ts
@@ -1,4 +1,3 @@
-// @flow
 import { createSelector } from 'reselect'
 import { isRealtekU2EAdapter, getDriverStatus } from './utils'
 import { NOT_APPLICABLE, IFACE_FAMILY_IPV4 } from './constants'
@@ -32,7 +31,7 @@ export const getU2EInterfacesMap: (
   (usbDevices, networkInterfaces) => {
     const ue2Adapters = usbDevices.filter(isRealtekU2EAdapter)
 
-    return ue2Adapters.reduce((interfacesBySerial, device) => {
+    return ue2Adapters.reduce<U2EInterfaceMap>((interfacesBySerial, device) => {
       interfacesBySerial[device.serialNumber] = networkInterfaces.filter(
         iface => {
           const expectedSerial = iface.mac.split(':').join('').toLowerCase()
diff --git a/app/src/redux/system-info/types.ts b/app/src/redux/system-info/types.ts
index 01dd77a7e3c..bc2ab8c673e 100644
--- a/app/src/redux/system-info/types.ts
+++ b/app/src/redux/system-info/types.ts
@@ -1,7 +1,6 @@
-// @flow
 // system-info types
 
-import typeof {
+import {
   INITIALIZED,
   USB_DEVICE_ADDED,
   USB_DEVICE_REMOVED,
@@ -12,75 +11,79 @@ import typeof {
   OUTDATED,
 } from './constants'
 
-export type UsbDevice = {|
-  locationId: number,
-  vendorId: number,
-  productId: number,
-  deviceName: string,
-  manufacturer: string,
-  serialNumber: string,
-  deviceAddress: number,
-  windowsDriverVersion?: string | null,
-|}
+export interface UsbDevice {
+  locationId: number
+  vendorId: number
+  productId: number
+  deviceName: string
+  manufacturer: string
+  serialNumber: string
+  deviceAddress: number
+  windowsDriverVersion?: string | null
+}
 
 // based on built-in type os$NetIFAddr
-export type NetworkInterface = {|
-  name: string,
-  address: string,
-  netmask: string,
-  family: string,
-  mac: string,
-  internal: boolean,
-  cidr: string,
-  scopeid?: number,
-|}
+export interface NetworkInterface {
+  name: string
+  address: string
+  netmask: string
+  family: string
+  mac: string
+  internal: boolean
+  cidr: string
+  scopeid?: number
+}
 
-export type U2EInterfaceMap = {
-  [deviceSerialNumber: string]: Array<NetworkInterface>,
-  ...
+export interface U2EInterfaceMap {
+  [deviceSerialNumber: string]: NetworkInterface[]
 }
 
-export type DriverStatus = NOT_APPLICABLE | UNKNOWN | UP_TO_DATE | OUTDATED
+export type DriverStatus =
+  | typeof NOT_APPLICABLE
+  | typeof UNKNOWN
+  | typeof UP_TO_DATE
+  | typeof OUTDATED
 
-export type U2EAnalyticsProps = {|
-  'U2E Vendor ID': number,
-  'U2E Product ID': number,
-  'U2E Serial Number': string,
-  'U2E Device Name': string,
-  'U2E Manufacturer': string,
-  'U2E IPv4 Address': string | null,
-  'U2E Windows Driver Version'?: string | null,
-|}
+export interface U2EAnalyticsProps {
+  'U2E Vendor ID': number
+  'U2E Product ID': number
+  'U2E Serial Number': string
+  'U2E Device Name': string
+  'U2E Manufacturer': string
+  'U2E IPv4 Address': string | null
+  'U2E Windows Driver Version'?: string | null
+  [key: string]: string | number | null | undefined
+}
 
 // TODO(mc, 2020-04-17): add other system info
-export type SystemInfoState = {|
-  usbDevices: Array<UsbDevice>,
-  networkInterfaces: Array<NetworkInterface>,
-|}
+export interface SystemInfoState {
+  usbDevices: UsbDevice[]
+  networkInterfaces: NetworkInterface[]
+}
 
 // TODO(mc, 2020-04-17): add other system info
-export type InitializedAction = {|
-  type: INITIALIZED,
-  payload: {|
-    usbDevices: Array<UsbDevice>,
-    networkInterfaces: Array<NetworkInterface>,
-  |},
-|}
+export interface InitializedAction {
+  type: typeof INITIALIZED
+  payload: {
+    usbDevices: UsbDevice[]
+    networkInterfaces: NetworkInterface[]
+  }
+}
 
-export type UsbDeviceAddedAction = {|
-  type: USB_DEVICE_ADDED,
-  payload: {| usbDevice: UsbDevice |},
-|}
+export interface UsbDeviceAddedAction {
+  type: typeof USB_DEVICE_ADDED
+  payload: { usbDevice: UsbDevice }
+}
 
-export type UsbDeviceRemovedAction = {|
-  type: USB_DEVICE_REMOVED,
-  payload: {| usbDevice: UsbDevice |},
-|}
+export interface UsbDeviceRemovedAction {
+  type: typeof USB_DEVICE_REMOVED
+  payload: { usbDevice: UsbDevice }
+}
 
-export type NetworkInterfacesChangedAction = {|
-  type: NETWORK_INTERFACES_CHANGED,
-  payload: {| networkInterfaces: Array<NetworkInterface> |},
-|}
+export interface NetworkInterfacesChangedAction {
+  type: typeof NETWORK_INTERFACES_CHANGED
+  payload: { networkInterfaces: NetworkInterface[] }
+}
 
 export type SystemInfoAction =
   | InitializedAction
diff --git a/app/src/redux/system-info/utils.ts b/app/src/redux/system-info/utils.ts
index 2a97fb9d373..4e03aa4cb1c 100644
--- a/app/src/redux/system-info/utils.ts
+++ b/app/src/redux/system-info/utils.ts
@@ -1,4 +1,3 @@
-// @flow
 // system-info helpers and utilities
 
 import { NOT_APPLICABLE, UNKNOWN, UP_TO_DATE, OUTDATED } from './constants'
@@ -42,7 +41,7 @@ export const getDriverStatus = (device: UsbDevice): DriverStatus => {
   const versionParts = windowsDriverVersion.split('.').map(s => Number(s))
   if (!versionParts.every(p => Number.isFinite(p))) return UNKNOWN
 
-  const upToDate = REALTEK_UP_TO_DATE_VERSION.reduce(
+  const upToDate = REALTEK_UP_TO_DATE_VERSION.reduce<boolean | null>(
     (result, subversion, index, collection) => {
       if (result === null) {
         const target = versionParts[index] ?? 0
diff --git a/app/src/redux/types.ts b/app/src/redux/types.ts
index 432233c0a87..70a256e8238 100644
--- a/app/src/redux/types.ts
+++ b/app/src/redux/types.ts
@@ -1,5 +1,4 @@
 /* eslint-disable no-use-before-define */
-// @flow
 // application types
 import type { Store as ReduxStore, Dispatch as ReduxDispatch } from 'redux'
 import type { RouterState, RouterAction } from 'connected-react-router'
@@ -40,27 +39,27 @@ import type { SessionState, SessionsAction } from './sessions/types'
 
 import type { AnalyticsTriggerAction } from './analytics/types'
 
-export type State = $ReadOnly<{|
-  robot: RobotState,
-  robotApi: RobotApiState,
-  robotAdmin: RobotAdminState,
-  robotControls: RobotControlsState,
-  robotSettings: RobotSettingsState,
-  buildroot: BuildrootState,
-  pipettes: PipettesState,
-  modules: ModulesState,
-  config: ConfigState,
-  discovery: DiscoveryState,
-  networking: NetworkingState,
-  labware: CustomLabwareState,
-  protocol: ProtocolState,
-  shell: ShellState,
-  systemInfo: SystemInfoState,
-  alerts: AlertsState,
-  sessions: SessionState,
-  calibration: CalibrationState,
-  router: RouterState,
-|}>
+export interface State {
+  readonly robot: RobotState
+  readonly robotApi: RobotApiState
+  readonly robotAdmin: RobotAdminState
+  readonly robotControls: RobotControlsState
+  readonly robotSettings: RobotSettingsState
+  readonly buildroot: BuildrootState
+  readonly pipettes: PipettesState
+  readonly modules: ModulesState
+  readonly config: ConfigState
+  readonly discovery: DiscoveryState
+  readonly networking: NetworkingState
+  readonly labware: CustomLabwareState
+  readonly protocol: ProtocolState
+  readonly shell: ShellState
+  readonly systemInfo: SystemInfoState
+  readonly alerts: AlertsState
+  readonly sessions: SessionState
+  readonly calibration: CalibrationState
+  readonly router: RouterState
+}
 
 export type Action =
   | RobotAction
@@ -86,9 +85,14 @@ export type Action =
 
 export type GetState = () => State
 
-export type ThunkAction = (Dispatch, GetState) => ?Action
+export type ThunkAction =
+  | ((dispatch: Dispatch, getState: GetState) => Action)
+  | ((dispatch: Dispatch, getState: GetState) => void)
 
-export type ThunkPromiseAction = (Dispatch, GetState) => Promise<?Action>
+export type ThunkPromiseAction = (
+  dispatch: Dispatch,
+  getState: GetState
+) => Promise<Action | null | undefined>
 
 export type Store = ReduxStore<State, Action>
 
@@ -96,20 +100,22 @@ export type Dispatch = PlainDispatch & ThunkDispatch & ThunkPromiseDispatch
 
 export type Middleware = (s: MwStore) => (n: PlainDispatch) => PlainDispatch
 
-type MwStore = {
-  getState: GetState,
-  dispatch: Dispatch,
+interface MwStore {
+  getState: GetState
+  dispatch: Dispatch
 }
 
 type PlainDispatch = ReduxDispatch<Action>
 
-type ThunkDispatch = (thunk: ThunkAction) => ?Action
+type ThunkDispatch = (thunk: ThunkAction) => Action | null | undefined
 
-type ThunkPromiseDispatch = (thunk: ThunkPromiseAction) => Promise<?Action>
+type ThunkPromiseDispatch = (
+  thunk: ThunkPromiseAction
+) => Promise<Action | null | undefined>
 
 export type Epic = (
   action$: Observable<Action>,
   state$: Observable<State>
 ) => Observable<Action>
 
-export type Error = { name?: string, message?: string, ... }
+export type Error = Partial<{ name: string; message: string }>
diff --git a/app/src/rpc/client.ts b/app/src/rpc/client.js
similarity index 100%
rename from app/src/rpc/client.ts
rename to app/src/rpc/client.js
diff --git a/app/src/rpc/message-types.ts b/app/src/rpc/message-types.js
similarity index 100%
rename from app/src/rpc/message-types.ts
rename to app/src/rpc/message-types.js
diff --git a/app/src/rpc/remote-error.ts b/app/src/rpc/remote-error.js
similarity index 100%
rename from app/src/rpc/remote-error.ts
rename to app/src/rpc/remote-error.js
diff --git a/app/src/rpc/remote-object.ts b/app/src/rpc/remote-object.js
similarity index 100%
rename from app/src/rpc/remote-object.ts
rename to app/src/rpc/remote-object.js
diff --git a/app/src/rpc/test/client.test.ts b/app/src/rpc/test/client.test.js
similarity index 100%
rename from app/src/rpc/test/client.test.ts
rename to app/src/rpc/test/client.test.js
diff --git a/app/src/rpc/test/remote-object.test.ts b/app/src/rpc/test/remote-object.test.js
similarity index 100%
rename from app/src/rpc/test/remote-object.test.ts
rename to app/src/rpc/test/remote-object.test.js
diff --git a/app/src/rpc/websocket-client.ts b/app/src/rpc/websocket-client.js
similarity index 100%
rename from app/src/rpc/websocket-client.ts
rename to app/src/rpc/websocket-client.js
diff --git a/app/tsconfig-data.json b/app/tsconfig-data.json
new file mode 100644
index 00000000000..f33614fd7ba
--- /dev/null
+++ b/app/tsconfig-data.json
@@ -0,0 +1,12 @@
+{
+  "extends": "../tsconfig-base.json",
+  "references": [],
+  "compilerOptions": {
+    "composite": true,
+    "emitDeclarationOnly": false,
+    "rootDir": "src",
+    "outDir": "lib"
+  },
+  "include": ["src/**/*.json"],
+  "exclude": ["**/*.ts", "**/*.tsx"]
+}
diff --git a/app/tsconfig.json b/app/tsconfig.json
new file mode 100644
index 00000000000..f0f77e7f42a
--- /dev/null
+++ b/app/tsconfig.json
@@ -0,0 +1,23 @@
+{
+  "extends": "../tsconfig-base.json",
+  "references": [
+    {
+      "path": "./tsconfig-data.json"
+    },
+    {
+      "path": "../components"
+    },
+    {
+      "path": "../discovery-client"
+    },
+    {
+      "path": "../shared-data"
+    }
+  ],
+  "compilerOptions": {
+    "composite": true,
+    "rootDir": "src",
+    "outDir": "lib"
+  },
+  "include": ["typings", "src"]
+}
diff --git a/app/typings/css-modules.d.ts b/app/typings/css-modules.d.ts
new file mode 100644
index 00000000000..6f4c90dd90b
--- /dev/null
+++ b/app/typings/css-modules.d.ts
@@ -0,0 +1,5 @@
+declare module '*.css' {
+  const styles: { [key: string]: string }
+  // eslint-disable-next-line import/no-default-export
+  export default styles
+}
diff --git a/app/typings/global.d.ts b/app/typings/global.d.ts
new file mode 100644
index 00000000000..5b55dae9854
--- /dev/null
+++ b/app/typings/global.d.ts
@@ -0,0 +1,14 @@
+import type { IpcRenderer } from 'electron'
+
+declare global {
+  namespace NodeJS {
+    export interface Global {
+      APP_SHELL_REMOTE: {
+        ipcRenderer: IpcRenderer
+      }
+      btoa: (str: string | Buffer) => string
+      [key: string]: unknown
+    }
+  }
+  export const _PKG_VERSION_: string
+}
diff --git a/app/typings/images.d.ts b/app/typings/images.d.ts
new file mode 100644
index 00000000000..9dcd2f68792
--- /dev/null
+++ b/app/typings/images.d.ts
@@ -0,0 +1,15 @@
+declare module '*.png' {
+  const image: string
+  // eslint-disable-next-line import/no-default-export
+  export default image
+}
+declare module '*.svg' {
+  const image: string
+  // eslint-disable-next-line import/no-default-export
+  export default image
+}
+declare module '*.webm' {
+  const image: string
+  // eslint-disable-next-line import/no-default-export
+  export default image
+}
diff --git a/app/typings/intercom.d.ts b/app/typings/intercom.d.ts
new file mode 100644
index 00000000000..715bb70eede
--- /dev/null
+++ b/app/typings/intercom.d.ts
@@ -0,0 +1,9 @@
+import 'intercom-binding'
+
+declare global {
+  namespace NodeJS {
+    export interface Global {
+      Intercom: (...args: any[]) => unknown
+    }
+  }
+}
diff --git a/app/typings/remark.d.ts b/app/typings/remark.d.ts
new file mode 100644
index 00000000000..2eb55d6f77e
--- /dev/null
+++ b/app/typings/remark.d.ts
@@ -0,0 +1,11 @@
+declare module 'remark' {
+  const remark: any
+  // eslint-disable-next-line import/no-default-export
+  export default remark
+}
+
+declare module 'remark-react' {
+  const reactRenderer: any
+  // eslint-disable-next-line import/no-default-export
+  export default reactRenderer
+}
diff --git a/app/typings/styled-components.d.ts b/app/typings/styled-components.d.ts
new file mode 100644
index 00000000000..5d6296f94be
--- /dev/null
+++ b/app/typings/styled-components.d.ts
@@ -0,0 +1 @@
+import 'styled-components/cssprop'
diff --git a/app/webpack.config.js b/app/webpack.config.js
index f7d16731c57..f8209b79d53 100644
--- a/app/webpack.config.js
+++ b/app/webpack.config.js
@@ -10,9 +10,9 @@ const WorkerPlugin = require('worker-plugin')
 
 const { DEV_MODE, baseConfig } = require('@opentrons/webpack-config')
 const { productName: title } = require('@opentrons/app-shell/package.json')
-const { description, author } = require('./package.json')
+const { description, author, version } = require('./package.json')
 
-const JS_ENTRY = path.join(__dirname, 'src/index.js')
+const JS_ENTRY = path.join(__dirname, 'src/index.tsx')
 const HTML_ENTRY = path.join(__dirname, 'src/index.hbs')
 const OUTPUT_PATH = path.join(__dirname, 'dist')
 
@@ -51,8 +51,8 @@ module.exports = webpackMerge(baseConfig, {
     }),
 
     new ScriptExtHtmlWebpackPlugin({ defaultAttribute: 'defer' }),
+    new webpack.DefinePlugin({ _PKG_VERSION_: JSON.stringify(version) }),
   ],
-
   node: {
     __filename: true,
     // use userland events because webpack's is out of date
diff --git a/components/__utils__/index.js b/components/__utils__/index.ts
similarity index 88%
rename from components/__utils__/index.js
rename to components/__utils__/index.ts
index e33551e4f02..82a0a103e6b 100644
--- a/components/__utils__/index.js
+++ b/components/__utils__/index.ts
@@ -1,3 +1,2 @@
-// @flow
 export * from './mountWithStore'
 export * from './mountWithProviders'
diff --git a/components/__utils__/mountWithProviders.js b/components/__utils__/mountWithProviders.tsx
similarity index 57%
rename from components/__utils__/mountWithProviders.js
rename to components/__utils__/mountWithProviders.tsx
index 056475d0280..4629fc78de0 100644
--- a/components/__utils__/mountWithProviders.js
+++ b/components/__utils__/mountWithProviders.tsx
@@ -1,31 +1,28 @@
-// @flow
 import assert from 'assert'
 import * as React from 'react'
 import { I18nextProvider } from 'react-i18next'
 import { Provider } from 'react-redux'
 import { mount } from 'enzyme'
 
+import type { Store } from 'redux'
 import type { MockStore, WrapperWithStore } from './mountWithStore'
 
-export type MountWithProvidersOptions<State> = {
-  initialState?: State,
-  i18nInstance?: $PropertyType<
-    React.ElementProps<typeof I18nextProvider>,
-    'i18n'
-  >,
-  provideStore?: boolean,
-  provideI18n?: boolean,
-  ...
+export interface MountWithProvidersOptions<State> {
+  initialState?: State
+  i18nInstance?: React.ComponentProps<typeof I18nextProvider>['i18n']
+  provideStore?: boolean
+  provideI18n?: boolean
+  [key: string]: unknown
 }
 
-export function mountWithProviders<Element: React.ElementType, State, Action>(
-  node: React.Element<Element>,
+export function mountWithProviders<Element, State, Action>(
+  node: React.ReactElement,
   options?: MountWithProvidersOptions<State>
 ): WrapperWithStore<Element, State, Action> {
   const {
     provideI18n = true,
     provideStore = true,
-    initialState = (({}: any): State),
+    initialState = {} as State,
     i18nInstance = null,
   } = options || {}
 
@@ -35,17 +32,26 @@ export function mountWithProviders<Element: React.ElementType, State, Action>(
     dispatch: jest.fn(),
   }
 
-  const I18nWrapper = provideI18n
+  const I18nWrapper: React.ElementType<
+    React.ComponentProps<typeof I18nextProvider>
+  > = provideI18n
     ? ({
         i18n,
         children,
-      }: {|
-        i18n: $PropertyType<React.ElementProps<typeof I18nextProvider>, 'i18n'>,
-        children: React.Node,
-      |}) => <I18nextProvider i18n={i18n}>{children}</I18nextProvider>
+      }: {
+        i18n: React.ComponentProps<typeof I18nextProvider>['i18n']
+        children?: React.ReactNode
+      }): JSX.Element => (
+        <I18nextProvider i18n={i18n}>{children}</I18nextProvider>
+      )
     : React.Fragment
-  const StateWrapper = provideStore
-    ? ({ store, children }: {| children: React.Node, store: State |}) => (
+
+  interface StateWrapperProps {
+    children: React.ReactNode
+    store: Store<State>
+  }
+  const StateWrapper: React.ElementType<StateWrapperProps> = provideStore
+    ? ({ store, children }: StateWrapperProps): JSX.Element => (
         <Provider store={store}>{children}</Provider>
       )
     : React.Fragment
@@ -54,11 +60,11 @@ export function mountWithProviders<Element: React.ElementType, State, Action>(
     store,
     children,
     i18n,
-  }: {|
-    children: React.Node,
-    store: State,
-    i18n: $PropertyType<React.ElementProps<typeof I18nextProvider>, 'i18n'>,
-  |}) => (
+  }: {
+    children: React.ReactNode
+    store: Store<State>
+    i18n: React.ComponentProps<typeof I18nextProvider>['i18n']
+  }) => (
     <StateWrapper store={store}>
       <I18nWrapper i18n={i18n}>{children}</I18nWrapper>
     </StateWrapper>
@@ -71,7 +77,7 @@ export function mountWithProviders<Element: React.ElementType, State, Action>(
 
   // force a re-render by returning a new state to recalculate selectors
   // and sending a blank set of new props to the wrapper
-  const refresh = maybeNextState => {
+  const refresh = (maybeNextState?: State): void => {
     const nextState = maybeNextState ?? { ...initialState }
 
     assert(
diff --git a/components/__utils__/mountWithStore.js b/components/__utils__/mountWithStore.ts
similarity index 53%
rename from components/__utils__/mountWithStore.js
rename to components/__utils__/mountWithStore.ts
index a3922540446..4393abb1ac4 100644
--- a/components/__utils__/mountWithStore.js
+++ b/components/__utils__/mountWithStore.ts
@@ -1,4 +1,3 @@
-// @flow
 import assert from 'assert'
 import * as React from 'react'
 import { Provider } from 'react-redux'
@@ -6,28 +5,28 @@ import { mount } from 'enzyme'
 
 import type { ReactWrapper } from 'enzyme'
 
-export type MockStore<State, Action> = {|
-  getState: JestMockFn<[], State>,
-  subscribe: JestMockFn<[], void>,
-  dispatch: JestMockFn<[Action], Action>,
-|}
-
-export type WrapperWithStore<Element, State, Action> = {|
-  wrapper: ReactWrapper<Element>,
-  store: MockStore<State, Action>,
-  refresh: (nextState?: State) => void,
-|}
-
-export type MountWithStoreOptions<State> = {
-  initialState?: State,
-  ...
+export interface MockStore<State, Action> {
+  getState: jest.MockedFunction<() => State>
+  subscribe: jest.MockedFunction<() => void>
+  dispatch: jest.MockedFunction<(action: Action) => Action>
 }
 
-export function mountWithStore<Element: React.ElementType, State, Action>(
-  node: React.Element<Element>,
+export interface WrapperWithStore<Props, State = {}, Action = {}> {
+  wrapper: ReactWrapper<Props>
+  store: MockStore<State, Action>
+  refresh: (nextState?: State) => void
+}
+
+export interface MountWithStoreOptions<State> {
+  initialState?: State
+  [key: string]: unknown
+}
+
+export function mountWithStore<Props, State = {}, Action = {}>(
+  node: React.ReactElement<Props>,
   options?: MountWithStoreOptions<State>
-): WrapperWithStore<Element, State, Action> {
-  const initialState = options?.initialState ?? (({}: any): State)
+): WrapperWithStore<Props, State, Action> {
+  const initialState = options?.initialState ?? ({} as State)
 
   const store: MockStore<State, Action> = {
     getState: jest.fn(() => initialState),
@@ -35,14 +34,14 @@ export function mountWithStore<Element: React.ElementType, State, Action>(
     dispatch: jest.fn(),
   }
 
-  const wrapper = mount(node, {
+  const wrapper = mount<Props>(node, {
     wrappingComponent: Provider,
     wrappingComponentProps: { store },
   })
 
   // force a re-render by returning a new state to recalculate selectors
   // and sending a blank set of new props to the wrapper
-  const refresh = maybeNextState => {
+  const refresh = (maybeNextState?: State): void => {
     const nextState = maybeNextState ?? { ...initialState }
 
     assert(
diff --git a/components/src/buttons/Button.tsx b/components/src/buttons/Button.tsx
index e2cf7289cea..135faeebf53 100644
--- a/components/src/buttons/Button.tsx
+++ b/components/src/buttons/Button.tsx
@@ -18,7 +18,7 @@ export interface ButtonProps {
   /** id attribute */
   id?: string
   /** click handler */
-  onClick?: (event: React.MouseEvent) => unknown
+  onClick?: React.MouseEventHandler
   /** name attribute */
   name?: string
   /** title attribute */
diff --git a/components/src/deck/types.ts b/components/src/deck/types.ts
index 3f4464bfcd5..2db11e7ecdc 100644
--- a/components/src/deck/types.ts
+++ b/components/src/deck/types.ts
@@ -1,7 +1,7 @@
 import type { DeckSlot } from '@opentrons/shared-data'
 
 export interface RobotWorkSpaceRenderProps {
-  deckSlotsById: Record<string, DeckSlot>
+  deckSlotsById: { [slotId: string]: DeckSlot }
   getRobotCoordsFromDOMCoords: (
     domX: number,
     domY: number
diff --git a/components/src/forms/InputField.tsx b/components/src/forms/InputField.tsx
index 15031d6accf..7326ea8d3bc 100644
--- a/components/src/forms/InputField.tsx
+++ b/components/src/forms/InputField.tsx
@@ -12,7 +12,7 @@ export interface InputFieldProps {
   /** field is disabled if value is true */
   disabled?: boolean
   /** change handler */
-  onChange?: (event: React.SyntheticEvent<HTMLInputElement>) => unknown
+  onChange?: React.ChangeEventHandler<HTMLInputElement>
   /** classes to apply to outer element */
   className?: string
   /** inline label text. DEPRECATED */
diff --git a/package.json b/package.json
index 13d0e3fd333..0ab653dafef 100755
--- a/package.json
+++ b/package.json
@@ -41,11 +41,20 @@
     "@storybook/addon-essentials": "^6.2.5",
     "@storybook/addon-links": "^6.2.5",
     "@storybook/react": "^6.2.5",
+    "@testing-library/jest-dom": "^5.12.0",
+    "@testing-library/react": "^11.2.6",
+    "@testing-library/react-hooks": "^5.1.1",
     "@types/enzyme": "^3.10.8",
+    "@types/express": "^4.17.11",
     "@types/jest": "^26.0.20",
     "@types/jest-when": "^2.7.2",
     "@types/lodash": "^4.14.168",
+    "@types/multer": "^1.4.5",
+    "@types/netmask": "^1.0.30",
+    "@types/react-redux": "^7.1.16",
     "@types/react-test-renderer": "^17.0.1",
+    "@types/redux-mock-store": "^1.0.2",
+    "@types/semver": "^7.3.6",
     "@typescript-eslint/eslint-plugin": "^4.18.0",
     "@typescript-eslint/parser": "^4.18.0",
     "ajv": "^6.10.2",
@@ -90,6 +99,7 @@
     "flow-bin": "^0.125.1",
     "flow-typed": "^3.1.0",
     "flowgen": "^1.13.0",
+    "form-data": "2.5.0",
     "fs-extra": "^6.0.1",
     "glob": "^7.1.2",
     "globby": "^10.0.1",
@@ -136,9 +146,6 @@
     "stylelint-config-styled-components": "0.1.1",
     "stylelint-processor-styled-components": "1.10.0",
     "terser-webpack-plugin": "^2.3.5",
-    "@testing-library/react": "^11.2.6",
-    "@testing-library/react-hooks": "^5.1.1",
-    "@testing-library/jest-dom": "^5.12.0",
     "typescript": "4.1.3",
     "url-loader": "^2.1.0",
     "wait-on": "^4.0.2",
diff --git a/shared-data/js/types.ts b/shared-data/js/types.ts
index 770e6a5559d..f499c9f150c 100644
--- a/shared-data/js/types.ts
+++ b/shared-data/js/types.ts
@@ -314,6 +314,7 @@ export interface PipetteNameSpecs {
   }
 }
 
+// TODO(bc, 2021-05-27): the type of `model` here should be PipetteModel
 // TODO(mc, 2019-10-14): update this type according to the schema
 export interface PipetteModelSpecs extends PipetteNameSpecs {
   model: string
diff --git a/tsconfig-eslint.json b/tsconfig-eslint.json
index a6cb40cece8..4e029df4e75 100644
--- a/tsconfig-eslint.json
+++ b/tsconfig-eslint.json
@@ -5,6 +5,8 @@
     "noEmit": true
   },
   "include": [
+    "app/src",
+    "app/typings",
     "app-shell/src",
     "app-shell/typings",
     "components/src",
diff --git a/tsconfig.json b/tsconfig.json
index e8e1980b654..b290a4e00c1 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -2,11 +2,14 @@
   "files": [],
   "references": [
     {
-      "path": "./components"
+      "path": "./app"
     },
     {
       "path": "./app-shell"
     },
+    {
+      "path": "./components"
+    },
     {
       "path": "./discovery-client"
     },
diff --git a/yarn.lock b/yarn.lock
index 25d314eab45..a7d239475bd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4420,6 +4420,14 @@
   dependencies:
     "@babel/types" "^7.3.0"
 
+"@types/body-parser@*":
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.0.tgz#0685b3c47eb3006ffed117cdd55164b61f80538f"
+  integrity sha512-W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ==
+  dependencies:
+    "@types/connect" "*"
+    "@types/node" "*"
+
 "@types/braces@*":
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/@types/braces/-/braces-3.0.0.tgz#7da1c0d44ff1c7eb660a36ec078ea61ba7eb42cb"
@@ -4464,6 +4472,13 @@
   resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
   integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==
 
+"@types/connect@*":
+  version "3.4.34"
+  resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.34.tgz#170a40223a6d666006d93ca128af2beb1d9b1901"
+  integrity sha512-ePPA/JuI+X0vb+gSWlPKOY0NdNAie/rPUqX2GUPpbZwiKTkSPhjXWuee47E4MtE54QVzGCQMQkAL6JhV2E1+cQ==
+  dependencies:
+    "@types/node" "*"
+
 "@types/cookie@^0.4.0":
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/@types/cookie/-/cookie-0.4.0.tgz#14f854c0f93d326e39da6e3b6f34f7d37513d108"
@@ -4492,6 +4507,25 @@
   resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
   integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==
 
+"@types/express-serve-static-core@^4.17.18":
+  version "4.17.19"
+  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.19.tgz#00acfc1632e729acac4f1530e9e16f6dd1508a1d"
+  integrity sha512-DJOSHzX7pCiSElWaGR8kCprwibCB/3yW6vcT8VG3P0SJjnv19gnWG/AZMfM60Xj/YJIp/YCaDHyvzsFVeniARA==
+  dependencies:
+    "@types/node" "*"
+    "@types/qs" "*"
+    "@types/range-parser" "*"
+
+"@types/express@*", "@types/express@^4.17.11":
+  version "4.17.11"
+  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.11.tgz#debe3caa6f8e5fcda96b47bd54e2f40c4ee59545"
+  integrity sha512-no+R6rW60JEc59977wIxreQVsIEOAYwgCqldrA/vkpCnbD7MqTefO97lmoBe4WE0F156bC4uLSP1XHDOySnChg==
+  dependencies:
+    "@types/body-parser" "*"
+    "@types/express-serve-static-core" "^4.17.18"
+    "@types/qs" "*"
+    "@types/serve-static" "*"
+
 "@types/file-saver@2.0.1":
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/@types/file-saver/-/file-saver-2.0.1.tgz#e18eb8b069e442f7b956d313f4fadd3ef887354e"
@@ -4545,7 +4579,7 @@
   resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.8.tgz#49348387983075705fe8f4e02fb67f7daaec4934"
   integrity sha512-S78QIYirQcUoo6UJZx9CSP0O2ix9IaeAXwQi26Rhr/+mg7qqPy8TzaxHSUut7eGjL8WmLccT7/MXf304WjqHcA==
 
-"@types/hoist-non-react-statics@*":
+"@types/hoist-non-react-statics@*", "@types/hoist-non-react-statics@^3.3.0":
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz#1124aafe5118cb591977aeb1ceaaed1070eb039f"
   integrity sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==
@@ -4670,6 +4704,11 @@
   dependencies:
     "@types/braces" "*"
 
+"@types/mime@^1":
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"
+  integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==
+
 "@types/minimatch@*":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
@@ -4680,6 +4719,18 @@
   resolved "https://registry.yarnpkg.com/@types/mixpanel-browser/-/mixpanel-browser-2.35.6.tgz#6a2c98471f3cf4473625a4345a4abd37d30dec84"
   integrity sha512-wYzQ6nIr7HjPgpkyaO0nxXa3GIbm1I7kgJHuTJWxFGS+4/TFfOIy739a/GoDM2PczeSEX5v4FplLbOdzgxjttg==
 
+"@types/multer@^1.4.5":
+  version "1.4.5"
+  resolved "https://registry.yarnpkg.com/@types/multer/-/multer-1.4.5.tgz#db0557562307e9adb6661a9500c334cd7ddd0cd9"
+  integrity sha512-9b/0a8JyrR0r2nQhL73JR86obWL7cogfX12augvlrvcpciCo/hkvEsgu80Z4S2g2DHGVXHr8pUIi1VhqFJ8Ufw==
+  dependencies:
+    "@types/express" "*"
+
+"@types/netmask@^1.0.30":
+  version "1.0.30"
+  resolved "https://registry.yarnpkg.com/@types/netmask/-/netmask-1.0.30.tgz#b68005e3e3c19f517ced4610bb69dce2e0c5babb"
+  integrity sha512-Kl1xAICLv1Y7/WsNXkPKldRMz3QmXUYMIzr3rMXnIBDy9c4/sYG7V6P6u7Ja3w+uNtNQrRudJduqVoYX/DxfZg==
+
 "@types/node-fetch@^2.5.7":
   version "2.5.9"
   resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.9.tgz#c04a12115aa436f189e39579272b305e477621b4"
@@ -4778,7 +4829,7 @@
   resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.2.tgz#690a1475b84f2a884fd07cd797c00f5f31356ea8"
   integrity sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw==
 
-"@types/qs@^6.9.5":
+"@types/qs@*", "@types/qs@^6.9.5":
   version "6.9.6"
   resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.6.tgz#df9c3c8b31a247ec315e6996566be3171df4b3b1"
   integrity sha512-0/HnwIfW4ki2D8L8c9GVcG5I72s9jP5GSLVF0VIXDW00kmIpA6O33G7a8n59Tmh7Nz0WUC3rSb7PTY/sdW2JzA==
@@ -4788,6 +4839,11 @@
   resolved "https://registry.yarnpkg.com/@types/query-string/-/query-string-6.2.0.tgz#ac1903ab175de7fd4a7bb703964c297eebddc8f7"
   integrity sha512-dnYqKg7eZ+t7ZhCuBtwLxjqON8yXr27hiu3zXfPqxfJSbWUZNwwISE0BJUxghlcKsk4lZSp7bdFSJBJVNWBfmA==
 
+"@types/range-parser@*":
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.3.tgz#7ee330ba7caafb98090bece86a5ee44115904c2c"
+  integrity sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==
+
 "@types/reach__router@^1.3.7":
   version "1.3.7"
   resolved "https://registry.yarnpkg.com/@types/reach__router/-/reach__router-1.3.7.tgz#de8ab374259ae7f7499fc1373b9697a5f3cd6428"
@@ -4809,6 +4865,16 @@
   dependencies:
     "@types/react" "*"
 
+"@types/react-redux@^7.1.16":
+  version "7.1.16"
+  resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.16.tgz#0fbd04c2500c12105494c83d4a3e45c084e3cb21"
+  integrity sha512-f/FKzIrZwZk7YEO9E1yoxIuDNRiDducxkFlkw/GNMGEnK9n4K8wJzlJBghpSuOVDgEUHoDkDF7Gi9lHNQR4siw==
+  dependencies:
+    "@types/hoist-non-react-statics" "^3.3.0"
+    "@types/react" "*"
+    hoist-non-react-statics "^3.3.0"
+    redux "^4.0.0"
+
 "@types/react-router-dom@^5.1.7":
   version "5.1.7"
   resolved "https://registry.yarnpkg.com/@types/react-router-dom/-/react-router-dom-5.1.7.tgz#a126d9ea76079ffbbdb0d9225073eb5797ab7271"
@@ -4874,6 +4940,13 @@
     "@types/scheduler" "*"
     csstype "^3.0.2"
 
+"@types/redux-mock-store@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@types/redux-mock-store/-/redux-mock-store-1.0.2.tgz#c27d5deadfb29d8514bdb0fc2cadae6feea1922d"
+  integrity sha512-6LBtAQBN34i7SI5X+Qs4zpTEZO1tTDZ6sZ9fzFjYwTl3nLQXaBtwYdoV44CzNnyKu438xJ1lSIYyw0YMvunESw==
+  dependencies:
+    redux "^4.0.5"
+
 "@types/responselike@*":
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.0.tgz#251f4fe7d154d2bad125abe1b429b23afd262e29"
@@ -4891,6 +4964,19 @@
   resolved "https://registry.yarnpkg.com/@types/semver/-/semver-6.0.1.tgz#a984b405c702fa5a7ec6abc56b37f2ba35ef5af6"
   integrity sha512-ffCdcrEE5h8DqVxinQjo+2d1q+FV5z7iNtPofw3JsrltSoSVlOGaW0rY8XxtO9XukdTn8TaCGWmk2VFGhI70mg==
 
+"@types/semver@^7.3.6":
+  version "7.3.6"
+  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.6.tgz#e9831776f4512a7ba6da53e71c26e5fb67882d63"
+  integrity sha512-0caWDWmpCp0uifxFh+FaqK3CuZ2SkRR/ZRxAV5+zNdC3QVUi6wyOJnefhPvtNt8NQWXB5OA93BUvZsXpWat2Xw==
+
+"@types/serve-static@*":
+  version "1.13.9"
+  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.9.tgz#aacf28a85a05ee29a11fb7c3ead935ac56f33e4e"
+  integrity sha512-ZFqF6qa48XsPdjXV5Gsz0Zqmux2PerNd3a/ktL45mHpa19cuMi/cL8tcxdAx497yRh+QtYPuofjT9oWw9P7nkA==
+  dependencies:
+    "@types/mime" "^1"
+    "@types/node" "*"
+
 "@types/sinonjs__fake-timers@^6.0.1":
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-6.0.2.tgz#3a84cf5ec3249439015e14049bd3161419bf9eae"
@@ -20302,6 +20388,13 @@ redux@4.0.5:
     loose-envify "^1.4.0"
     symbol-observable "^1.2.0"
 
+redux@^4.0.0, redux@^4.0.5:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/redux/-/redux-4.1.0.tgz#eb049679f2f523c379f1aff345c8612f294c88d4"
+  integrity sha512-uI2dQN43zqLWCt6B/BMGRMY6db7TTY4qeHHfGeKb3EOhmOKjU3KdWvNLJyqaHRksv/ErdNH7cFZWg9jXtewy4g==
+  dependencies:
+    "@babel/runtime" "^7.9.2"
+
 redux@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/redux/-/redux-4.0.1.tgz#436cae6cc40fbe4727689d7c8fae44808f1bfef5"