remove analytics

ui/component/channelSelector/index.js

@@ -1,11 +1,10 @@
 import { connect } from 'react-redux';
-import { selectMyChannelClaims, makeSelectClaimForUri } from 'lbry-redux';
+import { selectMyChannelClaims } from 'lbry-redux';
 import { selectActiveChannelClaim, selectIncognito } from 'redux/selectors/app';
 import { doSetActiveChannel, doSetIncognito } from 'redux/actions/app';
 import SelectChannel from './view';
 
-const select = (state, props) => ({
+const select = state => ({
-  claim: makeSelectClaimForUri(props.uri)(state),
   channels: selectMyChannelClaims(state),
   activeChannelClaim: selectActiveChannelClaim(state),
   incognito: selectIncognito(state),

ui/component/channelSelector/view.jsx

@@ -10,8 +10,6 @@ import Icon from 'component/common/icon';
 import { useHistory } from 'react-router';
 
 type Props = {
-  uri: string,
-  claim: ?Claim,
   selectedChannelUrl: string, // currently selected channel
   channels: ?Array<ChannelClaim>,
   onChannelSelect: (url: string) => void,
@@ -20,8 +18,6 @@ type Props = {
   doSetActiveChannel: (string) => void,
   incognito: boolean,
   doSetIncognito: (boolean) => void,
-  activeChanged: boolean,
-  setActiveChanged: (boolean) => void,
 };
 
 type ListItemProps = {
@@ -56,19 +52,15 @@ function IncognitoSelector(props: IncognitoSelectorProps) {
 }
 
 function ChannelSelector(props: Props) {
-  const { claim, channels, activeChannelClaim, doSetActiveChannel, hideAnon = false, incognito, doSetIncognito, activeChanged, setActiveChanged } = props;
+  const { channels, activeChannelClaim, doSetActiveChannel, hideAnon = false, incognito, doSetIncognito } = props;
   const {
     push,
     location: { pathname },
   } = useHistory();
-  const selectedClaimId = claim && claim.claim_id;
-  if (selectedClaimId && !activeChanged) doSetActiveChannel(selectedClaimId);
-
   const activeChannelUrl = activeChannelClaim && activeChannelClaim.permanent_url;
 
   function handleChannelSelect(channelClaim) {
     doSetIncognito(false);
-    setActiveChanged(true);
     doSetActiveChannel(channelClaim.claim_id);
   }
 

ui/component/claimMenuList/view.jsx

@@ -117,10 +117,6 @@ function ClaimMenuList(props: Props) {
     });
   }
 
-  function handleAnalytics() {
-    push(`/$/${PAGES.CREATOR_DASHBOARD}?channel=${encodeURIComponent(permanentUrl)}`);
-  }
-
   function handleToggleMute() {
     if (channelIsMuted) {
       doChannelUnmute(channelUri);
@@ -191,22 +187,14 @@ function ClaimMenuList(props: Props) {
         <Icon size={20} icon={ICONS.MORE_VERTICAL} />
       </MenuButton>
       <MenuList className="menu__list">
-
+        {!incognito && !isRepost && !claimIsMine && !isChannelPage && (
-        {!incognito && !isRepost && (!claimIsMine ? (!isChannelPage &&
           <MenuItem className="comment__menu-option" onSelect={handleFollow}>
             <div className="menu__link">
               <Icon aria-hidden icon={ICONS.SUBSCRIBE} />
               {subscriptionLabel}
             </div>
           </MenuItem>
-        ) : (
+        )}
-          <MenuItem className="comment__menu-option" onSelect={handleAnalytics}>
-            <div className="menu__link">
-              <Icon aria-hidden icon={ICONS.ANALYTICS} />
-              {__('Channel Analytics')}
-            </div>
-          </MenuItem>
-        ))}
 
         {hasExperimentalUi && (
           <>

ui/page/creatorDashboard/view.jsx

@@ -7,7 +7,6 @@ import Button from 'component/button';
 import CreatorAnalytics from 'component/creatorAnalytics';
 import ChannelSelector from 'component/channelSelector';
 import Yrbl from 'component/yrbl';
-import { useHistory } from 'react-router';
 
 type Props = {
   channels: Array<ChannelClaim>,
@@ -18,10 +17,6 @@ type Props = {
 export default function CreatorDashboardPage(props: Props) {
   const { channels, fetchingChannels, activeChannelClaim } = props;
   const hasChannels = channels && channels.length > 0;
-  const [activeChanged, setActiveChanged] = React.useState(false);
-  const { location: { search } } = useHistory();
-  const urlParams = new URLSearchParams(search);
-  const channelParam = urlParams.get('channel');
 
   return (
     <Page>
@@ -45,8 +40,8 @@ export default function CreatorDashboardPage(props: Props) {
 
       {!fetchingChannels && activeChannelClaim && (
         <React.Fragment>
-          <ChannelSelector hideAnon uri={channelParam} activeChanged={activeChanged} setActiveChanged={setActiveChanged} />
+          <ChannelSelector hideAnon />
-          <CreatorAnalytics uri={!activeChanged && channelParam ? channelParam : activeChannelClaim.canonical_url} />
+          <CreatorAnalytics uri={activeChannelClaim.canonical_url} />
         </React.Fragment>
       )}
     </Page>