From ea43a453ab0c4eb69672788d155955c322ed2576 Mon Sep 17 00:00:00 2001
From: Matt Kime <matt@mattki.me>
Date: Fri, 13 May 2022 22:00:29 -0500
Subject: [PATCH] fix conflicted fields modal

---
 .../public/components/edit_index_pattern/tabs/tabs.tsx          | 2 +-
 .../public/management_app/mount_management_section.tsx          | 1 +
 src/plugins/data_view_management/public/types.ts                | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/plugins/data_view_management/public/components/edit_index_pattern/tabs/tabs.tsx b/src/plugins/data_view_management/public/components/edit_index_pattern/tabs/tabs.tsx
index a50e1062f447f..35323d90a7efb 100644
--- a/src/plugins/data_view_management/public/components/edit_index_pattern/tabs/tabs.tsx
+++ b/src/plugins/data_view_management/public/components/edit_index_pattern/tabs/tabs.tsx
@@ -448,7 +448,7 @@ export function Tabs({
                       getFieldInfo,
                     }}
                     openModal={overlays.openModal}
-                    theme={theme!}
+                    theme={theme}
                     userEditPermission={dataViews.getCanSaveSync()}
                   />
                 )}
diff --git a/src/plugins/data_view_management/public/management_app/mount_management_section.tsx b/src/plugins/data_view_management/public/management_app/mount_management_section.tsx
index 0ef1c47541302..ecff28546e409 100644
--- a/src/plugins/data_view_management/public/management_app/mount_management_section.tsx
+++ b/src/plugins/data_view_management/public/management_app/mount_management_section.tsx
@@ -67,6 +67,7 @@ export async function mountManagementSection(
     IndexPatternEditor: dataViewEditor.IndexPatternEditorComponent,
     fieldFormats,
     spaces,
+    theme,
   };
 
   ReactDOM.render(
diff --git a/src/plugins/data_view_management/public/types.ts b/src/plugins/data_view_management/public/types.ts
index 56e9735a9001f..0901ba72d050b 100644
--- a/src/plugins/data_view_management/public/types.ts
+++ b/src/plugins/data_view_management/public/types.ts
@@ -14,6 +14,7 @@ import {
   DocLinksStart,
   HttpSetup,
   ApplicationStart,
+  ThemeServiceStart,
 } from '@kbn/core/public';
 import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
@@ -44,6 +45,7 @@ export interface IndexPatternManagmentContext {
   IndexPatternEditor: DataViewEditorStart['IndexPatternEditorComponent'];
   fieldFormats: FieldFormatsStart;
   spaces?: SpacesPluginStart;
+  theme: ThemeServiceStart;
 }
 
 export type IndexPatternManagmentContextValue =