diff --git a/src/plugins/navigation/__tests__/testAutoCompleteSearch.node.js b/src/plugins/navigation/__tests__/testAutoCompleteSearch.node.js
index 06a977c96..1e1367729 100644
--- a/src/plugins/navigation/__tests__/testAutoCompleteSearch.node.js
+++ b/src/plugins/navigation/__tests__/testAutoCompleteSearch.node.js
@@ -6,7 +6,7 @@
  * @flow strict-local
  */
 
-import {filterMatchPatterns} from '../util/autoCompleteProvider';
+import {filterMatchPatterns} from '../util/autoCompleteProvider.tsx';
 
 import type {URI} from '../flow-types';
 
diff --git a/src/plugins/navigation/components/AutoCompleteSheet.js b/src/plugins/navigation/components/AutoCompleteSheet.js
index 4dbd2b579..766ef74f8 100644
--- a/src/plugins/navigation/components/AutoCompleteSheet.js
+++ b/src/plugins/navigation/components/AutoCompleteSheet.js
@@ -8,7 +8,7 @@
 
 import {Glyph, styled} from 'flipper';
 import {useItemNavigation} from '../hooks/autoCompleteSheet';
-import {filterProvidersToLineItems} from '../util/autoCompleteProvider';
+import {filterProvidersToLineItems} from '../util/autoCompleteProvider.tsx';
 
 import type {AutoCompleteProvider} from '../flow-types';
 
diff --git a/src/plugins/navigation/index.js b/src/plugins/navigation/index.js
index 074f069df..228f3f287 100644
--- a/src/plugins/navigation/index.js
+++ b/src/plugins/navigation/index.js
@@ -24,7 +24,7 @@ import {
   appMatchPatternsToAutoCompleteProvider,
   bookmarksToAutoCompleteProvider,
   DefaultProvider,
-} from './util/autoCompleteProvider';
+} from './util/autoCompleteProvider.tsx';
 import {getAppMatchPatterns} from './util/appMatchPatterns';
 import {getRequiredParameters, filterOptionalParameters} from './util/uri.tsx';
 
diff --git a/src/plugins/navigation/util/autoCompleteProvider.js b/src/plugins/navigation/util/autoCompleteProvider.tsx
similarity index 72%
rename from src/plugins/navigation/util/autoCompleteProvider.js
rename to src/plugins/navigation/util/autoCompleteProvider.tsx
index d3c9022f8..83d4790e2 100644
--- a/src/plugins/navigation/util/autoCompleteProvider.js
+++ b/src/plugins/navigation/util/autoCompleteProvider.tsx
@@ -3,30 +3,30 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  * @format
- * @flow strict-local
  */
 
-import type {
+import {
   URI,
   Bookmark,
   AutoCompleteProvider,
   AutoCompleteLineItem,
   AppMatchPattern,
-} from '../flow-types';
+} from '../types';
 
 export function DefaultProvider(): AutoCompleteProvider {
-  this.icon = 'caution';
-  this.matchPatterns = new Map<string, URI>();
-  return this;
+  return {
+    icon: 'caution',
+    matchPatterns: new Map<string, URI>(),
+  };
 }
 
-export const bookmarksToAutoCompleteProvider: (
-  Map<URI, Bookmark>,
-) => AutoCompleteProvider = bookmarks => {
+export const bookmarksToAutoCompleteProvider = (
+  bookmarks: Map<URI, Bookmark>,
+) => {
   const autoCompleteProvider = {
     icon: 'bookmark',
     matchPatterns: new Map<string, URI>(),
-  };
+  } as AutoCompleteProvider;
   bookmarks.forEach((bookmark, uri) => {
     const matchPattern = bookmark.commonName + ' - ' + uri;
     autoCompleteProvider.matchPatterns.set(matchPattern, uri);
@@ -49,14 +49,14 @@ export const appMatchPatternsToAutoCompleteProvider = (
       appMatchPattern.pattern,
     );
   });
-  return (autoCompleteProvider: AutoCompleteProvider);
+  return autoCompleteProvider;
 };
 
-export const filterMatchPatterns: (
-  Map<string, URI>,
-  string,
-  number,
-) => Map<string, URI> = (matchPatterns, query, maxItems) => {
+export const filterMatchPatterns = (
+  matchPatterns: Map<string, URI>,
+  query: URI,
+  maxItems: number,
+) => {
   const filteredPatterns = new Map<string, URI>();
   for (const [pattern, uri] of matchPatterns) {
     if (filteredPatterns.size >= maxItems) {
@@ -68,22 +68,22 @@ export const filterMatchPatterns: (
   return filteredPatterns;
 };
 
-const filterProvider: (
-  AutoCompleteProvider,
-  string,
-  number,
-) => AutoCompleteProvider = (provider, query, maxItems) => {
+const filterProvider = (
+  provider: AutoCompleteProvider,
+  query: string,
+  maxItems: number,
+) => {
   return {
     ...provider,
     matchPatterns: filterMatchPatterns(provider.matchPatterns, query, maxItems),
   };
 };
 
-export const filterProvidersToLineItems: (
-  Array<AutoCompleteProvider>,
-  string,
-  number,
-) => Array<AutoCompleteLineItem> = (providers, query, maxItems) => {
+export const filterProvidersToLineItems = (
+  providers: Array<AutoCompleteProvider>,
+  query: string,
+  maxItems: number,
+) => {
   let itemsLeft = maxItems;
   const lineItems = new Array<AutoCompleteLineItem>(0);
   for (const provider of providers) {