Hide Wild West for DE (#875)

lbryio · Feb 15, 2022 · 60d9acf · 60d9acf
1 parent a38ef13
commit 60d9acf
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 5 deletions.
diff --git a/ui/component/router/index.js b/ui/component/router/index.js
@@ -1,7 +1,7 @@
 import { connect } from 'react-redux';
 import { selectUserVerifiedEmail } from 'redux/selectors/user';
 import { selectHasNavigated, selectScrollStartingPosition, selectWelcomeVersion } from 'redux/selectors/app';
-import { selectHomepageData } from 'redux/selectors/settings';
+import { selectHomepageData, selectWildWestDisabled } from 'redux/selectors/settings';
 import Router from './view';
 import { normalizeURI } from 'util/lbryURI';
 import { selectTitleForUri } from 'redux/selectors/claims';
@@ -35,6 +35,7 @@ const select = (state) => {
     hasNavigated: selectHasNavigated(state),
     hasUnclaimedRefereeReward: selectHasUnclaimedRefereeReward(state),
     homepageData: selectHomepageData(state),
+    wildWestDisabled: selectWildWestDisabled(state),
   };
 };
 

diff --git a/ui/component/router/view.jsx b/ui/component/router/view.jsx
@@ -8,7 +8,7 @@ import { useIsLargeScreen } from 'effects/use-screensize';
 import { lazyImport } from 'util/lazyImport';
 import { LINKED_COMMENT_QUERY_PARAM } from 'constants/comment';
 import { parseURI, isURIValid } from 'util/lbryURI';
-import { SITE_TITLE, WELCOME_VERSION, SIMPLE_SITE } from 'config';
+import { SITE_TITLE, WELCOME_VERSION } from 'config';
 import LoadingBarOneOff from 'component/loadingBarOneOff';
 import { GetLinksData } from 'util/buildHomepage';
 
@@ -129,6 +129,7 @@ type Props = {
   setReferrer: (?string) => void,
   hasUnclaimedRefereeReward: boolean,
   homepageData: any,
+  wildWestDisabled: boolean,
 };
 
 type PrivateRouteProps = Props & {
@@ -168,7 +169,9 @@ function AppRouter(props: Props) {
     hasUnclaimedRefereeReward,
     setReferrer,
     homepageData,
+    wildWestDisabled,
   } = props;
+
   const { entries, listen, action: historyAction } = history;
   const entryIndex = history.index;
   const urlParams = new URLSearchParams(search);
@@ -277,7 +280,7 @@ function AppRouter(props: Props) {
 
         <Route path={`/`} exact component={HomePage} />
         <Route path={`/$/${PAGES.DISCOVER}`} exact component={DiscoverPage} />
-        {SIMPLE_SITE && <Route path={`/$/${PAGES.WILD_WEST}`} exact component={DiscoverPage} />}
+        {!wildWestDisabled && <Route path={`/$/${PAGES.WILD_WEST}`} exact component={DiscoverPage} />}
         {homeCategoryPages}
 
         <Route path={`/$/${PAGES.AUTH_SIGNIN}`} exact component={SignInPage} />

diff --git a/ui/component/sideNavigation/index.js b/ui/component/sideNavigation/index.js
@@ -4,7 +4,7 @@ import { selectSubscriptions } from 'redux/selectors/subscriptions';
 import { doClearPurchasedUriSuccess } from 'redux/actions/file';
 import { selectFollowedTags } from 'redux/selectors/tags';
 import { selectUserVerifiedEmail, selectUser } from 'redux/selectors/user';
-import { selectHomepageData, selectLanguage } from 'redux/selectors/settings';
+import { selectHomepageData, selectLanguage, selectWildWestDisabled } from 'redux/selectors/settings';
 import { doSignOut } from 'redux/actions/app';
 import { selectUnseenNotificationCount } from 'redux/selectors/notifications';
 import { selectPurchaseUriSuccess } from 'redux/selectors/claims';
@@ -21,6 +21,7 @@ const select = (state) => ({
   user: selectUser(state),
   homepageData: selectHomepageData(state),
   activeChannelStakedLevel: selectActiveChannelStakedLevel(state),
+  wildWestDisabled: selectWildWestDisabled(state),
 });
 
 export default connect(select, {

diff --git a/ui/component/sideNavigation/view.jsx b/ui/component/sideNavigation/view.jsx
@@ -112,6 +112,7 @@ type Props = {
   user: ?User,
   homepageData: any,
   activeChannelStakedLevel: number,
+  wildWestDisabled: boolean,
 };
 
 function SideNavigation(props: Props) {
@@ -130,6 +131,7 @@ function SideNavigation(props: Props) {
     user,
     followedTags,
     activeChannelStakedLevel,
+    wildWestDisabled,
   } = props;
 
   const isLargeScreen = useIsLargeScreen();
@@ -480,7 +482,7 @@ function SideNavigation(props: Props) {
                 <>
                   {/* $FlowFixMe -- GetLinksData should fix it's data type */}
                   {EXTRA_SIDEBAR_LINKS.map((linkProps) => getLink(linkProps))}
-                  {getLink(WILD_WEST)}
+                  {!wildWestDisabled && getLink(WILD_WEST)}
                 </>
               )}
             </ul>

diff --git a/ui/redux/selectors/settings.js b/ui/redux/selectors/settings.js
@@ -1,5 +1,6 @@
 import * as SETTINGS from 'constants/settings';
 import * as DAEMON_SETTINGS from 'constants/daemon_settings';
+import SUPPORTED_BROWSER_LANGUAGES from 'constants/supported_browser_languages';
 
 import { createSelector } from 'reselect';
 import { ENABLE_MATURE } from 'config';
@@ -72,4 +73,17 @@ export const selectHomepageData = createSelector(
   }
 );
 
+export const selectInRegionByCode = (state, code) => {
+  const hp = selectClientSetting(state, SETTINGS.HOMEPAGE);
+  const lang = selectLanguage(state);
+
+  return hp === code || lang === code;
+};
+
+export const selectWildWestDisabled = (state) => {
+  const deRegion = selectInRegionByCode(state, SUPPORTED_BROWSER_LANGUAGES.de);
+
+  return deRegion;
+};
+
 export const selectosNotificationsEnabled = (state) => selectClientSetting(state, SETTINGS.OS_NOTIFICATIONS_ENABLED);