diff --git a/ts/state/roots/createConversationView.tsx b/ts/state/roots/createConversationView.tsx
index f6ac2cfd5b..a484845df2 100644
--- a/ts/state/roots/createConversationView.tsx
+++ b/ts/state/roots/createConversationView.tsx
@@ -1,4 +1,4 @@
-// Copyright 2021 Signal Messenger, LLC
+// Copyright 2021-2022 Signal Messenger, LLC
 // SPDX-License-Identifier: AGPL-3.0-only
 
 import React from 'react';
@@ -9,17 +9,11 @@ import type { Store } from 'redux';
 import type { PropsType } from '../smart/ConversationView';
 import { SmartConversationView } from '../smart/ConversationView';
 
-// Workaround: A react component's required properties are filtering up through connect()
-//   https://github.com/DefinitelyTyped/DefinitelyTyped/issues/31363
-/* eslint-disable @typescript-eslint/no-explicit-any */
-const FilteredConversationView = SmartConversationView as any;
-/* eslint-disable @typescript-eslint/no-explicit-any */
-
 export const createConversationView = (
   store: Store,
   props: PropsType
 ): React.ReactElement => (
   <Provider store={store}>
-    <FilteredConversationView {...props} />
+    <SmartConversationView {...props} />
   </Provider>
 );
diff --git a/ts/state/roots/createSafetyNumberViewer.tsx b/ts/state/roots/createSafetyNumberViewer.tsx
index 1b1b0b8fb4..20f610ad3b 100644
--- a/ts/state/roots/createSafetyNumberViewer.tsx
+++ b/ts/state/roots/createSafetyNumberViewer.tsx
@@ -1,4 +1,4 @@
-// Copyright 2020 Signal Messenger, LLC
+// Copyright 2020-2022 Signal Messenger, LLC
 // SPDX-License-Identifier: AGPL-3.0-only
 
 import React from 'react';
@@ -8,12 +8,6 @@ import type { Store } from 'redux';
 
 import { SmartSafetyNumberViewer } from '../smart/SafetyNumberViewer';
 
-// Workaround: A react component's required properties are filtering up through connect()
-//   https://github.com/DefinitelyTyped/DefinitelyTyped/issues/31363
-/* eslint-disable @typescript-eslint/no-explicit-any */
-const FilteredSafetyNumberViewer = SmartSafetyNumberViewer as any;
-/* eslint-enable @typescript-eslint/no-explicit-any */
-
 type Props = {
   contactID: string;
   onClose?: () => void;
@@ -24,6 +18,6 @@ export const createSafetyNumberViewer = (
   props: Props
 ): React.ReactElement => (
   <Provider store={store}>
-    <FilteredSafetyNumberViewer {...props} />
+    <SmartSafetyNumberViewer {...props} />
   </Provider>
 );
diff --git a/ts/state/roots/createShortcutGuideModal.tsx b/ts/state/roots/createShortcutGuideModal.tsx
index 0c39ba1853..cbb0054677 100644
--- a/ts/state/roots/createShortcutGuideModal.tsx
+++ b/ts/state/roots/createShortcutGuideModal.tsx
@@ -1,4 +1,4 @@
-// Copyright 2019-2020 Signal Messenger, LLC
+// Copyright 2019-2022 Signal Messenger, LLC
 // SPDX-License-Identifier: AGPL-3.0-only
 
 import React from 'react';
@@ -6,19 +6,14 @@ import { Provider } from 'react-redux';
 
 import type { Store } from 'redux';
 
+import type { ExternalProps } from '../smart/ShortcutGuideModal';
 import { SmartShortcutGuideModal } from '../smart/ShortcutGuideModal';
 
-// Workaround: A react component's required properties are filtering up through connect()
-//   https://github.com/DefinitelyTyped/DefinitelyTyped/issues/31363
-/* eslint-disable @typescript-eslint/no-explicit-any */
-const FilteredShortcutGuideModal = SmartShortcutGuideModal as any;
-/* eslint-enable @typescript-eslint/no-explicit-any */
-
 export const createShortcutGuideModal = (
   store: Store,
-  props: Record<string, unknown>
+  props: ExternalProps
 ): React.ReactElement => (
   <Provider store={store}>
-    <FilteredShortcutGuideModal {...props} />
+    <SmartShortcutGuideModal {...props} />
   </Provider>
 );
diff --git a/ts/state/roots/createStickerPreviewModal.tsx b/ts/state/roots/createStickerPreviewModal.tsx
index bc1a94202e..77099e063f 100644
--- a/ts/state/roots/createStickerPreviewModal.tsx
+++ b/ts/state/roots/createStickerPreviewModal.tsx
@@ -1,4 +1,4 @@
-// Copyright 2019-2020 Signal Messenger, LLC
+// Copyright 2019-2022 Signal Messenger, LLC
 // SPDX-License-Identifier: AGPL-3.0-only
 
 import React from 'react';
@@ -6,19 +6,14 @@ import { Provider } from 'react-redux';
 
 import type { Store } from 'redux';
 
+import type { ExternalProps } from '../smart/StickerPreviewModal';
 import { SmartStickerPreviewModal } from '../smart/StickerPreviewModal';
 
-// Workaround: A react component's required properties are filtering up through connect()
-//   https://github.com/DefinitelyTyped/DefinitelyTyped/issues/31363
-/* eslint-disable @typescript-eslint/no-explicit-any */
-const FilteredStickerPreviewModal = SmartStickerPreviewModal as any;
-/* eslint-enable @typescript-eslint/no-explicit-any */
-
 export const createStickerPreviewModal = (
   store: Store,
-  props: Record<string, unknown>
+  props: ExternalProps
 ): React.ReactElement => (
   <Provider store={store}>
-    <FilteredStickerPreviewModal {...props} />
+    <SmartStickerPreviewModal {...props} />
   </Provider>
 );
diff --git a/ts/state/smart/ShortcutGuideModal.tsx b/ts/state/smart/ShortcutGuideModal.tsx
index 83e72ef37b..9269b46fb5 100644
--- a/ts/state/smart/ShortcutGuideModal.tsx
+++ b/ts/state/smart/ShortcutGuideModal.tsx
@@ -1,4 +1,4 @@
-// Copyright 2019-2020 Signal Messenger, LLC
+// Copyright 2019-2022 Signal Messenger, LLC
 // SPDX-License-Identifier: AGPL-3.0-only
 
 import { connect } from 'react-redux';
@@ -15,7 +15,7 @@ import {
   getReceivedStickerPacks,
 } from '../selectors/stickers';
 
-type ExternalProps = {
+export type ExternalProps = {
   close: () => unknown;
 };
 
diff --git a/ts/state/smart/StickerPreviewModal.tsx b/ts/state/smart/StickerPreviewModal.tsx
index abc84e505e..d0b1eaa2e8 100644
--- a/ts/state/smart/StickerPreviewModal.tsx
+++ b/ts/state/smart/StickerPreviewModal.tsx
@@ -1,4 +1,4 @@
-// Copyright 2019-2020 Signal Messenger, LLC
+// Copyright 2019-2022 Signal Messenger, LLC
 // SPDX-License-Identifier: AGPL-3.0-only
 
 import { connect } from 'react-redux';
@@ -13,7 +13,7 @@ import {
   translatePackFromDB,
 } from '../selectors/stickers';
 
-type ExternalProps = {
+export type ExternalProps = {
   packId: string;
   readonly onClose: () => unknown;
 };