From d04b0f09ba2bc772d97fe32bfd66ec89786e3234 Mon Sep 17 00:00:00 2001
From: zeppi <jessopb@gmail.com>
Date: Tue, 26 Jan 2021 18:45:34 -0500
Subject: [PATCH] fix ad areas and drivers

---
 ui/component/recommendedContent/index.js | 2 --
 ui/component/recommendedContent/view.jsx | 7 +++----
 ui/page/discover/view.jsx                | 6 ++++--
 ui/page/search/view.jsx                  | 4 +++-
 web/component/ads/index.js               | 8 ++++++++
 web/component/{ads.jsx => ads/view.jsx}  | 0
 6 files changed, 18 insertions(+), 9 deletions(-)
 create mode 100644 web/component/ads/index.js
 rename web/component/{ads.jsx => ads/view.jsx} (100%)

diff --git a/ui/component/recommendedContent/index.js b/ui/component/recommendedContent/index.js
index 8f6e308c3..1509e617f 100644
--- a/ui/component/recommendedContent/index.js
+++ b/ui/component/recommendedContent/index.js
@@ -4,14 +4,12 @@ import { doSearch } from 'redux/actions/search';
 import { makeSelectRecommendedContentForUri, selectIsSearching } from 'redux/selectors/search';
 import { selectUserVerifiedEmail } from 'redux/selectors/user';
 import RecommendedVideos from './view';
-import { selectTheme } from 'redux/selectors/settings';
 
 const select = (state, props) => ({
   claim: makeSelectClaimForUri(props.uri)(state),
   mature: makeSelectClaimIsNsfw(props.uri)(state),
   recommendedContent: makeSelectRecommendedContentForUri(props.uri)(state),
   isSearching: selectIsSearching(state),
-  theme: selectTheme(state),
   isAuthenticated: selectUserVerifiedEmail(state),
 });
 
diff --git a/ui/component/recommendedContent/view.jsx b/ui/component/recommendedContent/view.jsx
index a9b6711b7..495a1aad3 100644
--- a/ui/component/recommendedContent/view.jsx
+++ b/ui/component/recommendedContent/view.jsx
@@ -19,11 +19,10 @@ type Props = {
   search: (string, Options) => void,
   mature: boolean,
   isAuthenticated: boolean,
-  theme: string,
 };
 
 export default function RecommendedContent(props: Props) {
-  const { uri, claim, search, mature, recommendedContent, isSearching, isAuthenticated, theme } = props;
+  const { uri, claim, search, mature, recommendedContent, isSearching, isAuthenticated } = props;
   const isMobile = useIsMobile();
   const isMedium = useIsMediumScreen();
 
@@ -62,9 +61,9 @@ export default function RecommendedContent(props: Props) {
           injectedItem={
             SHOW_ADS && IS_WEB ? (
               SIMPLE_SITE ? (
-                <Ads small type={'google'} theme={theme} />
+                <Ads small type={'google'} />
               ) : (
-                !isAuthenticated && <Ads small type={'video'} theme={theme} />
+                !isAuthenticated && <Ads small type={'video'} />
               )
             ) : (
               false
diff --git a/ui/page/discover/view.jsx b/ui/page/discover/view.jsx
index 573a87794..19b144898 100644
--- a/ui/page/discover/view.jsx
+++ b/ui/page/discover/view.jsx
@@ -1,5 +1,5 @@
 // @flow
-import { SHOW_ADS, DOMAIN } from 'config';
+import { SHOW_ADS, DOMAIN, SIMPLE_SITE } from 'config';
 import * as ICONS from 'constants/icons';
 import React, { useRef } from 'react';
 import Page from 'component/page';
@@ -104,7 +104,9 @@ function DiscoverPage(props: Props) {
         tags={tags}
         hiddenNsfwMessage={<HiddenNsfw type="page" />}
         repostedClaimId={repostedClaim ? repostedClaim.claim_id : null}
-        injectedItem={SHOW_ADS && !isAuthenticated && IS_WEB && <Ads type="video" />}
+        injectedItem={
+          SHOW_ADS && IS_WEB ? (SIMPLE_SITE ? false : !isAuthenticated && <Ads small type={'video'} />) : false
+        }
         channelIds={
           (dynamicRouteProps && dynamicRouteProps.options && dynamicRouteProps.options.channelIds) || undefined
         }
diff --git a/ui/page/search/view.jsx b/ui/page/search/view.jsx
index c34280899..b884a08ba 100644
--- a/ui/page/search/view.jsx
+++ b/ui/page/search/view.jsx
@@ -101,7 +101,9 @@ export default function SearchPage(props: Props) {
               uris={uris}
               loading={isSearching}
               header={!SIMPLE_SITE && <SearchOptions additionalOptions={additionalOptions} />}
-              injectedItem={SHOW_ADS && !isAuthenticated && IS_WEB && <Ads type="video" />}
+              injectedItem={
+                SHOW_ADS && IS_WEB ? (SIMPLE_SITE ? false : !isAuthenticated && <Ads small type={'video'} />) : false
+              }
               headerAltControls={
                 <>
                   <span>{__('Find what you were looking for?')}</span>
diff --git a/web/component/ads/index.js b/web/component/ads/index.js
new file mode 100644
index 000000000..b7acdd5d1
--- /dev/null
+++ b/web/component/ads/index.js
@@ -0,0 +1,8 @@
+import { connect } from 'react-redux';
+import { selectTheme } from 'redux/selectors/settings';
+import Ads from './view';
+const select = state => ({
+  theme: selectTheme(state),
+});
+
+export default connect(select)(Ads);
diff --git a/web/component/ads.jsx b/web/component/ads/view.jsx
similarity index 100%
rename from web/component/ads.jsx
rename to web/component/ads/view.jsx