From 7d3f7ab60444846aae055196e19a290d6aff78f0 Mon Sep 17 00:00:00 2001
From: NanaKay007 <jnranikuabe@gmail.com>
Date: Tue, 9 Jun 2020 13:06:19 -0400
Subject: [PATCH] fixed rebase issues

---
 web/src/components/app.tsx                    |  4 +--
 web/src/components/layout/demo-layout.tsx     |  2 +-
 web/src/components/layout/demo_layout.tsx     | 30 -------------------
 .../pages/datasets/dataset-info.tsx           |  3 +-
 4 files changed, 5 insertions(+), 34 deletions(-)
 delete mode 100644 web/src/components/layout/demo_layout.tsx

diff --git a/web/src/components/app.tsx b/web/src/components/app.tsx
index 9df044ccd8d20..954c76a5a0646 100644
--- a/web/src/components/app.tsx
+++ b/web/src/components/app.tsx
@@ -35,7 +35,7 @@ import StateTree from '../stores/tree';
 import { Uploads } from '../stores/uploads';
 import { User } from '../stores/user';
 import Layout from './layout/layout';
-import DemoLayout from './layout/demo_layout';
+import DemoLayout from './layout/demo-layout';
 import NotificationBanner from './notification-banner/notification-banner';
 import NotificationPill from './notification-pill/notification-pill';
 import { Spinner } from './ui/ui';
@@ -219,7 +219,7 @@ let LocalizedPage: any = class extends React.Component<
 
   render() {
     const { locale, notifications, toLocaleRoute, location } = this.props;
-    const { bundleGenerator, uploadPercentage } = this.state;
+    const { l10n, uploadPercentage } = this.state;
 
     if (!l10n) return null;
 
diff --git a/web/src/components/layout/demo-layout.tsx b/web/src/components/layout/demo-layout.tsx
index 6d5b24d00dc94..eb72a930ede03 100644
--- a/web/src/components/layout/demo-layout.tsx
+++ b/web/src/components/layout/demo-layout.tsx
@@ -4,7 +4,7 @@ import { Switch, Route, withRouter, Redirect } from 'react-router';
 import { useLocale } from '../locale-helpers';
 import { Spinner } from '../ui/ui';
 import URLS from '../../urls';
-import Intro from '../demo-pages/Intro/intro';
+import Intro from '../demo-pages/intro/intro';
 
 const Kiosk = React.lazy(() => import('../demo-pages/kiosk/kiosk'));
 
diff --git a/web/src/components/layout/demo_layout.tsx b/web/src/components/layout/demo_layout.tsx
deleted file mode 100644
index 6b3e34e213209..0000000000000
--- a/web/src/components/layout/demo_layout.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import * as React from 'react';
-import { Switch, Route, withRouter } from 'react-router';
-import { useLocale } from '../locale-helpers';
-import { Spinner } from '../ui/ui';
-import Intro from '../demo_pages/Intro/intro';
-
-function DemoLayout() {
-  const [_, toLocaleRoute] = useLocale();
-
-  return (
-    <div>
-      <React.Suspense fallback={<Spinner />}>
-        <Switch>
-          <Route exact path={toLocaleRoute('/demo')} component={Intro} />
-          <Route
-            exact
-            path={toLocaleRoute('/demo/language-select')}
-            render={() => {
-              return <h1>in language select</h1>;
-            }}
-          />
-          {/* more routes to be added */}
-          <Route path="*" render={() => <h1>not found</h1>} />
-        </Switch>
-      </React.Suspense>
-    </div>
-  );
-}
-
-export default withRouter(DemoLayout);
diff --git a/web/src/components/pages/datasets/dataset-info.tsx b/web/src/components/pages/datasets/dataset-info.tsx
index 91947e0a8f2e2..00b73f08f71aa 100644
--- a/web/src/components/pages/datasets/dataset-info.tsx
+++ b/web/src/components/pages/datasets/dataset-info.tsx
@@ -27,6 +27,7 @@ import CircleStats from './circle-stats';
 import stats from './stats';
 import { DPropsFromState } from './types';
 import './dataset-info.css';
+import URLS from '../../../urls';
 
 const languages = Object.keys(stats.locales).length;
 const globalStats = {
@@ -90,7 +91,7 @@ export const Splits = ({
   );
 };
 
-type Props = LocalePropsFromState & LocalizationProps & DPropsFromState;
+type Props = LocalePropsFromState & WithLocalizationProps & DPropsFromState;
 
 type State = {
   bundleLocale: string;