Fix bad merge conflict resolution

elastic · Apr 22, 2020 · 903e213 · 903e213
1 parent e2e82d3
commit 903e213
Showing 1 changed file with 11 additions and 20 deletions.
diff --git a/x-pack/plugins/infra/public/apps/start_app.tsx b/x-pack/plugins/infra/public/apps/start_app.tsx
@@ -37,11 +37,6 @@ export async function startApp(
   triggersActionsUI: TriggersAndActionsUIPublicPluginSetup
 ) {
   const { element, history } = params;
-  const libs$ = new BehaviorSubject(libs);
-  const store = createStore({
-    apolloClient: libs$.pipe(pluck('apolloClient')),
-    observableApi: libs$.pipe(pluck('observableApi')),
-  });
 
   const InfraPluginRoot: React.FunctionComponent = () => {
     const [darkMode] = useUiSetting$<boolean>('theme:darkMode');
@@ -50,21 +45,17 @@ export async function startApp(
       <core.i18n.Context>
         <EuiErrorBoundary>
           <TriggersActionsProvider triggersActionsUI={triggersActionsUI}>
-            <ReduxStoreProvider store={store}>
-              <ReduxStateContextProvider>
-                <ApolloProvider client={libs.apolloClient}>
-                  <ApolloClientContext.Provider value={libs.apolloClient}>
-                    <EuiThemeProvider darkMode={darkMode}>
-                      <HistoryContext.Provider value={history}>
-                        <NavigationWarningPromptProvider>
-                          <Router history={history} />
-                        </NavigationWarningPromptProvider>
-                      </HistoryContext.Provider>
-                    </EuiThemeProvider>
-                  </ApolloClientContext.Provider>
-                </ApolloProvider>
-              </ReduxStateContextProvider>
-            </ReduxStoreProvider>
+            <ApolloProvider client={libs.apolloClient}>
+              <ApolloClientContext.Provider value={libs.apolloClient}>
+                <EuiThemeProvider darkMode={darkMode}>
+                  <HistoryContext.Provider value={history}>
+                    <NavigationWarningPromptProvider>
+                      <Router history={history} />
+                    </NavigationWarningPromptProvider>
+                  </HistoryContext.Provider>
+                </EuiThemeProvider>
+              </ApolloClientContext.Provider>
+            </ApolloProvider>
           </TriggersActionsProvider>
         </EuiErrorBoundary>
       </core.i18n.Context>