From b5a077a91641e10dfd8906bd342bb9ceea622deb Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Tue, 2 Jun 2020 10:38:03 -0400
Subject: [PATCH 1/8] bump lbry-redux

---
 package.json | 2 +-
 yarn.lock    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 451c82a20..80ccf3d6e 100644
--- a/package.json
+++ b/package.json
@@ -135,7 +135,7 @@
     "json-loader": "^0.5.4",
     "lbry-format": "https://github.com/lbryio/lbry-format.git",
     "lbry-redux": "lbryio/lbry-redux#b2d49c275538164ea6a8eee8eaf913c09b2a4992",
-    "lbryinc": "lbryio/lbryinc#39510e8b21d3fb56e903569224453bb8e122c23f",
+    "lbryinc": "lbryio/lbryinc#c21bc3075ca3f8bb130893107c11215eb7d5f4d5",
     "lint-staged": "^7.0.2",
     "localforage": "^1.7.1",
     "lodash-es": "^4.17.14",
diff --git a/yarn.lock b/yarn.lock
index 6fd8a3fe3..e6ace869b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6210,9 +6210,9 @@ lbry-redux@lbryio/lbry-redux#b2d49c275538164ea6a8eee8eaf913c09b2a4992:
     reselect "^3.0.0"
     uuid "^3.3.2"
 
-lbryinc@lbryio/lbryinc#39510e8b21d3fb56e903569224453bb8e122c23f:
+lbryinc@lbryio/lbryinc#c21bc3075ca3f8bb130893107c11215eb7d5f4d5:
   version "0.0.1"
-  resolved "https://codeload.github.com/lbryio/lbryinc/tar.gz/39510e8b21d3fb56e903569224453bb8e122c23f"
+  resolved "https://codeload.github.com/lbryio/lbryinc/tar.gz/c21bc3075ca3f8bb130893107c11215eb7d5f4d5"
   dependencies:
     reselect "^3.0.0"
 
-- 
2.45.2


From 17b8aa0202eea0529d4ff58ffc33199add3e801d Mon Sep 17 00:00:00 2001
From: Thomas Zarebczan <tzarebczan@users.noreply.github.com>
Date: Tue, 2 Jun 2020 10:50:34 -0400
Subject: [PATCH 2/8] add @MH to paid content beta

---
 ui/util/homepage.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/util/homepage.js b/ui/util/homepage.js
index 058efa3a2..0e687fdb7 100644
--- a/ui/util/homepage.js
+++ b/ui/util/homepage.js
@@ -83,6 +83,7 @@ export default function getHomePageRowData(
     'f3da2196b5151570d980b34d311ee0973225a68e',
     '7644fdb8342624f6c647c79de25610801573fa68',
     'da5534547c15856646c1bd281313ddd55cbec407',
+    '5bd299a92e7b31865d2bb3e2313402edaca41a94',
   ];
 
   const TV_PAID_BETA_ROW = {
-- 
2.45.2


From a0ace5ca5818c7674f3b7ac2b9ed59ddaac845c1 Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Tue, 2 Jun 2020 12:32:58 -0400
Subject: [PATCH 3/8] add refresh icon to refresh buttons

---
 custom/homepage.example.js          |  2 +-
 ui/component/common/icon-custom.jsx |  7 ++++
 ui/component/splash/view.jsx        | 16 +++++++--
 ui/component/txoList/view.jsx       |  3 +-
 ui/component/userVerify/view.jsx    |  4 ++-
 ui/page/fileListPublished/view.jsx  | 55 +++++++++++++++--------------
 6 files changed, 56 insertions(+), 31 deletions(-)

diff --git a/custom/homepage.example.js b/custom/homepage.example.js
index 0f8db1a5a..d81c90866 100644
--- a/custom/homepage.example.js
+++ b/custom/homepage.example.js
@@ -71,7 +71,7 @@ type RowDataItem = {
 };
 
 export default function getHomePageRowData(
-  authenticated,
+  authenticated: boolean,
   showPersonalizedChannels: boolean,
   showPersonalizedTags: boolean,
   subscribedChannels: Array<Subscription>,
diff --git a/ui/component/common/icon-custom.jsx b/ui/component/common/icon-custom.jsx
index 2468dc630..a1da0dc19 100644
--- a/ui/component/common/icon-custom.jsx
+++ b/ui/component/common/icon-custom.jsx
@@ -634,4 +634,11 @@ export const icons = {
       <path d="M21.44 11.05l-9.19 9.19a6 6 0 0 1-8.49-8.49l9.19-9.19a4 4 0 0 1 5.66 5.66l-9.2 9.19a2 2 0 0 1-2.83-2.83l8.49-8.48" />
     </g>
   ),
+  [ICONS.REFRESH]: buildIcon(
+    <g>
+      <polyline points="23 4 23 10 17 10" />
+      <polyline points="1 20 1 14 7 14" />
+      <path d="M3.51 9a9 9 0 0 1 14.85-3.36L23 10M1 14l4.64 4.36A9 9 0 0 0 20.49 15" />{' '}
+    </g>
+  ),
 };
diff --git a/ui/component/splash/view.jsx b/ui/component/splash/view.jsx
index 23084f814..bc7723265 100644
--- a/ui/component/splash/view.jsx
+++ b/ui/component/splash/view.jsx
@@ -2,6 +2,7 @@
 import type { Node } from 'react';
 import * as MODALS from 'constants/modal_types';
 import * as SETTINGS from 'constants/settings';
+import * as ICONS from 'constants/icons';
 import React from 'react';
 import { Lbry } from 'lbry-redux';
 import Button from 'component/button';
@@ -307,7 +308,11 @@ export default class SplashScreen extends React.PureComponent<Props, State> {
                   <I18nMessage
                     tokens={{
                       help_link: (
-                        <Button button="link" href="https://lbry.com/faq/startup-troubleshooting" label={__("this link")} />
+                        <Button
+                          button="link"
+                          href="https://lbry.com/faq/startup-troubleshooting"
+                          label={__('this link')}
+                        />
                       ),
                     }}
                   >
@@ -316,7 +321,14 @@ export default class SplashScreen extends React.PureComponent<Props, State> {
                 </p>
               </React.Fragment>
             }
-            actions={<Button button="primary" label={__('Refresh')} onClick={() => window.location.reload()} />}
+            actions={
+              <Button
+                button="primary"
+                icon={ICONS.REFRESH}
+                label={__('Refresh')}
+                onClick={() => window.location.reload()}
+              />
+            }
           />
         )}
         {/* Temp hack: don't show any modals on splash screen daemon is running;
diff --git a/ui/component/txoList/view.jsx b/ui/component/txoList/view.jsx
index 7bbc58b07..43a8b22c7 100644
--- a/ui/component/txoList/view.jsx
+++ b/ui/component/txoList/view.jsx
@@ -1,4 +1,5 @@
 // @flow
+import * as ICONS from 'constants/icons';
 import React, { useEffect } from 'react';
 import { withRouter } from 'react-router';
 import { TXO_LIST as TXO } from 'lbry-redux';
@@ -175,7 +176,7 @@ function TxoList(props: Props) {
       title={__(`Transactions`)}
       titleActions={
         <div className="card__actions--inline">
-          <Button button="alt" label={__('Refresh')} onClick={() => fetchTxoPage()} />
+          <Button button="alt" icon={ICONS.REFRESH} label={__('Refresh')} onClick={() => fetchTxoPage()} />
         </div>
       }
       isBodyList
diff --git a/ui/component/userVerify/view.jsx b/ui/component/userVerify/view.jsx
index 394915392..c95e61599 100644
--- a/ui/component/userVerify/view.jsx
+++ b/ui/component/userVerify/view.jsx
@@ -44,7 +44,9 @@ class UserVerify extends React.PureComponent<Props> {
                 rewards_program: (
                   <Button button="link" label={__('Rewards Program')} href="https://lbry.com/faq/rewards" />
                 ),
-                Refresh: <Button onClick={() => fetchUser()} button="link" label={__('Refresh')} />,
+                Refresh: (
+                  <Button icon={ICONS.REFRESH} onClick={() => fetchUser()} button="link" label={__('Refresh')} />
+                ),
                 Skip: <Button {...skipButtonProps} button="link" label={__('Skip')} />,
               }}
             >
diff --git a/ui/page/fileListPublished/view.jsx b/ui/page/fileListPublished/view.jsx
index 70cbeb272..12bf14efb 100644
--- a/ui/page/fileListPublished/view.jsx
+++ b/ui/page/fileListPublished/view.jsx
@@ -58,32 +58,35 @@ function FileListPublished(props: Props) {
     <Page>
       <div className="card-stack">
         <WebUploadList />
-        <Card
-          title={__('Publishes')}
-          titleActions={
-            <div className="card__actions--inline">
-              <Button
-                button="alt"
-                label={__('Refresh')}
-                onClick={() => fetchClaimListMine(params.page, params.page_size)}
-              />
-              <Button
-                icon={ICONS.PUBLISH}
-                button="secondary"
-                label={__('Publish')}
-                navigate="/$/publish"
-                onClick={() => clearPublish()}
-              />
-            </div>
-          }
-          isBodyList
-          body={
-            <div>
-              <ClaimList isCardBody loading={fetching} persistedStorageKey="claim-list-published" uris={urls} />
-              <Paginate totalPages={urlTotal > 0 ? Math.ceil(urlTotal / Number(pageSize)) : 1} />
-            </div>
-          }
-        />
+        {!!(urls && urls.length) && (
+          <Card
+            title={__('Publishes')}
+            titleActions={
+              <div className="card__actions--inline">
+                <Button
+                  button="alt"
+                  label={__('Refresh')}
+                  icon={ICONS.REFRESH}
+                  onClick={() => fetchClaimListMine(params.page, params.page_size)}
+                />
+                <Button
+                  icon={ICONS.PUBLISH}
+                  button="secondary"
+                  label={__('Publish')}
+                  navigate="/$/publish"
+                  onClick={() => clearPublish()}
+                />
+              </div>
+            }
+            isBodyList
+            body={
+              <div>
+                <ClaimList isCardBody loading={fetching} persistedStorageKey="claim-list-published" uris={urls} />
+                <Paginate totalPages={urlTotal > 0 ? Math.ceil(urlTotal / Number(pageSize)) : 1} />
+              </div>
+            }
+          />
+        )}
       </div>
       {!(urls && urls.length) && (
         <React.Fragment>
-- 
2.45.2


From 48eac1188ffeaf3e297f73da32e2808526ef71a7 Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Tue, 2 Jun 2020 12:44:14 -0400
Subject: [PATCH 4/8] always use thumbnail from claim if it exists on web

---
 ui/component/claimPreview/index.js | 2 --
 ui/component/claimPreview/view.jsx | 4 +---
 ui/effects/use-get-thumbnail.js    | 5 ++++-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/ui/component/claimPreview/index.js b/ui/component/claimPreview/index.js
index 0a39ef6aa..20eeb0d2c 100644
--- a/ui/component/claimPreview/index.js
+++ b/ui/component/claimPreview/index.js
@@ -5,7 +5,6 @@ import {
   makeSelectIsUriResolving,
   makeSelectClaimIsMine,
   makeSelectClaimIsPending,
-  makeSelectThumbnailForUri,
   makeSelectCoverForUri,
   makeSelectClaimIsNsfw,
   selectBlockedChannels,
@@ -28,7 +27,6 @@ const select = (state, props) => ({
   obscureNsfw: !selectShowMatureContent(state),
   claimIsMine: props.uri && makeSelectClaimIsMine(props.uri)(state),
   isResolvingUri: props.uri && makeSelectIsUriResolving(props.uri)(state),
-  thumbnail: props.uri && makeSelectThumbnailForUri(props.uri)(state),
   cover: props.uri && makeSelectCoverForUri(props.uri)(state),
   nsfw: props.uri && makeSelectClaimIsNsfw(props.uri)(state),
   blackListedOutpoints: selectBlackListedOutpoints(state),
diff --git a/ui/component/claimPreview/view.jsx b/ui/component/claimPreview/view.jsx
index e11b50eb4..ef1960c62 100644
--- a/ui/component/claimPreview/view.jsx
+++ b/ui/component/claimPreview/view.jsx
@@ -34,7 +34,6 @@ type Props = {
   resolveUri: string => void,
   isResolvingUri: boolean,
   history: { push: string => void },
-  thumbnail: string,
   title: string,
   nsfw: boolean,
   placeholder: string,
@@ -71,7 +70,6 @@ const ClaimPreview = forwardRef<any, {}>((props: Props, ref: any) => {
     history,
     uri,
     isResolvingUri,
-    thumbnail,
     nsfw,
     resolveUri,
     claim,
@@ -159,7 +157,7 @@ const ClaimPreview = forwardRef<any, {}>((props: Props, ref: any) => {
 
   // Weird placement warning
   // Make sure this happens after we figure out if this claim needs to be hidden
-  const thumbnailUrl = useGetThumbnail(uri, claim, streamingUrl, getFile, shouldHide) || thumbnail;
+  const thumbnailUrl = useGetThumbnail(uri, claim, streamingUrl, getFile, shouldHide);
 
   function handleContextMenu(e) {
     // @if TARGET='app'
diff --git a/ui/effects/use-get-thumbnail.js b/ui/effects/use-get-thumbnail.js
index 0b84fb53a..0a8a71350 100644
--- a/ui/effects/use-get-thumbnail.js
+++ b/ui/effects/use-get-thumbnail.js
@@ -18,7 +18,10 @@ export default function useGetThumbnail(
   let thumbnailToUse;
 
   // @if TARGET='web'
-  if (claim && isImage && isFree) {
+  const thumbnailInClaim = claim && claim.value && claim.value.thumbnail && claim.value.thumbnail.url;
+  if (thumbnailInClaim) {
+    thumbnailToUse = thumbnailInClaim;
+  } else if (claim && isImage && isFree) {
     thumbnailToUse = generateStreamUrl(claim.name, claim.claim_id);
   }
   // @endif
-- 
2.45.2


From 16fcc4c932ceafccdf0b0b44327a14486a6b1bc2 Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Tue, 2 Jun 2020 15:01:30 -0400
Subject: [PATCH 5/8] only set x-lbry-auth-token once user is signed in

---
 ui/component/userVerify/view.jsx | 4 +---
 ui/index.jsx                     | 7 -------
 ui/redux/actions/app.js          | 5 ++++-
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/ui/component/userVerify/view.jsx b/ui/component/userVerify/view.jsx
index c95e61599..394915392 100644
--- a/ui/component/userVerify/view.jsx
+++ b/ui/component/userVerify/view.jsx
@@ -44,9 +44,7 @@ class UserVerify extends React.PureComponent<Props> {
                 rewards_program: (
                   <Button button="link" label={__('Rewards Program')} href="https://lbry.com/faq/rewards" />
                 ),
-                Refresh: (
-                  <Button icon={ICONS.REFRESH} onClick={() => fetchUser()} button="link" label={__('Refresh')} />
-                ),
+                Refresh: <Button onClick={() => fetchUser()} button="link" label={__('Refresh')} />,
                 Skip: <Button {...skipButtonProps} button="link" label={__('Skip')} />,
               }}
             >
diff --git a/ui/index.jsx b/ui/index.jsx
index f5d8402eb..96ef3c583 100644
--- a/ui/index.jsx
+++ b/ui/index.jsx
@@ -143,13 +143,6 @@ Lbryio.setOverride(
   () =>
     new Promise(resolve => {
       const authTokenToReturn = authToken || getAuthToken();
-
-      // @if TARGET='web'
-      if (authTokenToReturn !== null) {
-        Lbry.setApiHeader(X_LBRY_AUTH_TOKEN, authTokenToReturn);
-      }
-      // @endif
-
       resolve(authTokenToReturn);
     })
 );
diff --git a/ui/redux/actions/app.js b/ui/redux/actions/app.js
index f7eee0d62..152f5a955 100644
--- a/ui/redux/actions/app.js
+++ b/ui/redux/actions/app.js
@@ -46,7 +46,8 @@ import {
 import { doAuthenticate, doGetSync, doClaimRewardType, rewards as REWARDS } from 'lbryinc';
 import { lbrySettings as config, version as appVersion } from 'package.json';
 import analytics, { SHARE_INTERNAL } from 'analytics';
-import { doSignOutCleanup, deleteSavedPassword, getSavedPassword } from 'util/saved-passwords';
+import { doSignOutCleanup, deleteSavedPassword, getSavedPassword, getAuthToken } from 'util/saved-passwords';
+import { X_LBRY_AUTH_TOKEN } from 'constants/token';
 
 // @if TARGET='app'
 const { autoUpdater } = remote.require('electron-updater');
@@ -494,6 +495,8 @@ export function doAnaltyicsPurchaseEvent(fileInfo) {
 export function doSignIn() {
   return (dispatch, getState) => {
     // @if TARGET='web'
+    const authToken = getAuthToken();
+    Lbry.setApiHeader(X_LBRY_AUTH_TOKEN, authToken);
     dispatch(doBalanceSubscribe());
     dispatch(doFetchChannelListMine());
     // @endif
-- 
2.45.2


From 5b4e45b0b043379e6ae8e5b45eeccc025fd18711 Mon Sep 17 00:00:00 2001
From: TigerxWood <TigerxWood@users.noreply.github.com>
Date: Tue, 2 Jun 2020 03:08:53 +0300
Subject: [PATCH 6/8] Update translatable string

---
 ui/component/channelContent/view.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/component/channelContent/view.jsx b/ui/component/channelContent/view.jsx
index c34818a15..ec916beca 100644
--- a/ui/component/channelContent/view.jsx
+++ b/ui/component/channelContent/view.jsx
@@ -73,7 +73,7 @@ function ChannelContent(props: Props) {
           injectedItem={!isAuthenticated && IS_WEB && <Ads type="video" />}
         />
       ) : (
-        <section className="main--empty">This channel hasn't published anything yet</section>
+        <section className="main--empty">{__("This channel hasn't published anything yet")}</section>
       )}
     </Fragment>
   );
-- 
2.45.2


From c0fc7e5fbd283626367e1a56f823abec24f3ea6d Mon Sep 17 00:00:00 2001
From: TigerxWood <TigerxWood@users.noreply.github.com>
Date: Tue, 2 Jun 2020 12:14:22 +0300
Subject: [PATCH 7/8] Fix boolean declaration in claimInsufficientCredits

---
 ui/component/claimInsufficientCredits/view.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/component/claimInsufficientCredits/view.jsx b/ui/component/claimInsufficientCredits/view.jsx
index 6d7d33fc2..e9162a098 100644
--- a/ui/component/claimInsufficientCredits/view.jsx
+++ b/ui/component/claimInsufficientCredits/view.jsx
@@ -7,7 +7,7 @@ type Props = {
   uri: string,
   fileInfo: FileListItem,
   isInsufficientCredits: boolean,
-  claimWasPurchased: boolea,
+  claimWasPurchased: boolean,
 };
 
 function ClaimInsufficientCredits(props: Props) {
-- 
2.45.2


From 7fe88d86d5e1e5b8fcca314e0eecfd21b951e194 Mon Sep 17 00:00:00 2001
From: jessop <jessop@lbry.com>
Date: Tue, 2 Jun 2020 16:52:34 -0400
Subject: [PATCH 8/8] strip ga calls

---
 package.json                           |   1 -
 static/app-strings.json                |   6 +-
 ui/analytics.js                        | 101 ++-----------------------
 ui/component/button/view.jsx           |  14 +---
 ui/component/privacyAgreement/view.jsx |   5 +-
 yarn.lock                              |   4 -
 6 files changed, 18 insertions(+), 113 deletions(-)

diff --git a/package.json b/package.json
index 451c82a20..3ec7a7f96 100644
--- a/package.json
+++ b/package.json
@@ -159,7 +159,6 @@
     "react-confetti": "^4.0.1",
     "react-dom": "^16.8.2",
     "react-draggable": "^3.3.0",
-    "react-ga": "^2.5.7",
     "react-google-recaptcha": "^2.0.1",
     "react-hot-loader": "^4.11.1",
     "react-modal": "^3.1.7",
diff --git a/static/app-strings.json b/static/app-strings.json
index 8b7f40b52..51e01245d 100644
--- a/static/app-strings.json
+++ b/static/app-strings.json
@@ -1197,5 +1197,9 @@
   "lbry.tv Premium - 1 month": "lbry.tv Premium - 1 month",
   "We will refund no questions asked within 30 days.": "We will refund no questions asked within 30 days.",
   "Your Wallet": "Your Wallet",
-  "This file may have been streamed, moved or deleted": "This file may have been streamed, moved or deleted"
+  "This file may have been streamed, moved or deleted": "This file may have been streamed, moved or deleted",
+  "LBRY takes privacy and choice seriously. Just a few questions before you enter the land of content freedom. ": "LBRY takes privacy and choice seriously. Just a few questions before you enter the land of content freedom. ",
+  "Sending information to third parties (e.g. Google Analytics or Mixpanel) allows us to use detailed\n                analytical reports to improve all aspects of LBRY.": "Sending information to third parties (e.g. Google Analytics or Mixpanel) allows us to use detailed\n                analytical reports to improve all aspects of LBRY.",
+  "Sharing information with LBRY, Inc. allows us to report to publishers how their content is doing, as\n                well as track basic usage and performance. This is the minimum required to earn rewards from LBRY, Inc.": "Sharing information with LBRY, Inc. allows us to report to publishers how their content is doing, as\n                well as track basic usage and performance. This is the minimum required to earn rewards from LBRY, Inc.",
+  "No information will be sent directly to LBRY, Inc. or third-parties about your usage. Note that as\n                peer-to-peer software, your IP address and potentially other system information can be sent to other\n                users, though this information is not stored permanently.": "No information will be sent directly to LBRY, Inc. or third-parties about your usage. Note that as\n                peer-to-peer software, your IP address and potentially other system information can be sent to other\n                users, though this information is not stored permanently."
 }
diff --git a/ui/analytics.js b/ui/analytics.js
index 71cfbeedb..c5f0d967a 100644
--- a/ui/analytics.js
+++ b/ui/analytics.js
@@ -1,6 +1,5 @@
 // @flow
 import { Lbryio } from 'lbryinc';
-import ReactGA from 'react-ga';
 import * as Sentry from '@sentry/browser';
 import MatomoTracker from '@datapunt/matomo-tracker-js';
 import { history } from './store';
@@ -14,10 +13,6 @@ import { MATOMO_ID, MATOMO_URL } from 'config';
 
 const isProduction = process.env.NODE_ENV === 'production';
 const devInternalApis = process.env.LBRY_API_URL;
-const LBRY_TV_MINUS_PIRATE_BAY_UA_ID = 'UA-60403362-16';
-const LBRY_TV_UA_ID = 'UA-60403362-12';
-const DESKTOP_UA_ID = 'UA-60403362-13';
-const SECOND_TRACKER_NAME = 'tracker2';
 
 export const SHARE_INTERNAL = 'shareInternal';
 const SHARE_THIRD_PARTY = 'shareThirdParty';
@@ -36,7 +31,6 @@ type Analytics = {
   pageView: string => void,
   setUser: Object => void,
   toggleInternal: (boolean, ?boolean) => void,
-  toggleThirdParty: (boolean, ?boolean) => void,
   apiLogView: (string, string, string, ?number, ?() => void) => Promise<any>,
   apiLogPublish: (ChannelClaim | StreamClaim) => void,
   apiSyncTags: ({}) => void,
@@ -60,10 +54,10 @@ type LogPublishParams = {
 };
 
 let internalAnalyticsEnabled: boolean = IS_WEB || false;
-let thirdPartyAnalyticsEnabled: boolean = IS_WEB || false;
+// let thirdPartyAnalyticsEnabled: boolean = IS_WEB || false;
 // @if TARGET='app'
 if (window.localStorage.getItem(SHARE_INTERNAL) === 'true') internalAnalyticsEnabled = true;
-if (window.localStorage.getItem(SHARE_THIRD_PARTY) === 'true') thirdPartyAnalyticsEnabled = true;
+// if (window.localStorage.getItem(SHARE_THIRD_PARTY) === 'true') thirdPartyAnalyticsEnabled = true;
 // @endif
 
 const analytics: Analytics = {
@@ -92,9 +86,6 @@ const analytics: Analytics = {
     });
   },
   pageView: path => {
-    if (thirdPartyAnalyticsEnabled) {
-      ReactGA.pageview(path, [SECOND_TRACKER_NAME]);
-    }
     if (internalAnalyticsEnabled) {
       MatomoInstance.trackPageView({
         href: `${path}`,
@@ -102,14 +93,11 @@ const analytics: Analytics = {
     }
   },
   setUser: userId => {
-    if (thirdPartyAnalyticsEnabled && userId) {
-      ReactGA.set({
-        userId,
-      });
-
+    // SEND USERID TO MATOMO?
+    if (internalAnalyticsEnabled && userId) {
       // @if TARGET='app'
       Native.getAppVersionInfo().then(({ localVersion }) => {
-        sendGaEvent('Desktop-Version', localVersion);
+        sendMatomoEvent('Version', 'Desktop-Version', localVersion);
       });
       // @endif
     }
@@ -125,7 +113,7 @@ const analytics: Analytics = {
   toggleThirdParty: (enabled: boolean): void => {
     // Always collect analytics on lbry.tv
     // @if TARGET='app'
-    thirdPartyAnalyticsEnabled = enabled;
+    // thirdPartyAnalyticsEnabled = enabled;
     window.localStorage.setItem(SHARE_THIRD_PARTY, enabled);
     // @endif
   },
@@ -190,71 +178,45 @@ const analytics: Analytics = {
     }
   },
   videoStartEvent: (claimId, duration) => {
-    sendGaTimingEvent('Media', 'TimeToStart', duration, claimId);
     sendPromMetric('time_to_start', duration);
     sendMatomoEvent('Media', 'TimeToStart', claimId, duration);
   },
   videoBufferEvent: (claimId, currentTime) => {
-    sendGaTimingEvent('Media', 'BufferTimestamp', currentTime * 1000, claimId);
     sendPromMetric('buffer');
     sendMatomoEvent('Media', 'BufferTimestamp', claimId, currentTime * 1000);
   },
   tagFollowEvent: (tag, following) => {
-    sendGaEvent(following ? 'Tag-Follow' : 'Tag-Unfollow', tag);
     sendMatomoEvent('Tag', following ? 'Tag-Follow' : 'Tag-Unfollow', tag);
   },
   channelBlockEvent: (uri, blocked, location) => {
-    sendGaEvent(blocked ? 'Channel-Hidden' : 'Channel-Unhidden', uri);
     sendMatomoEvent(blocked ? 'Channel-Hidden' : 'Channel-Unhidden', uri);
   },
   emailProvidedEvent: () => {
-    sendGaEvent('Engagement', 'Email-Provided');
     sendMatomoEvent('Engagement', 'Email-Provided');
   },
   emailVerifiedEvent: () => {
-    sendGaEvent('Engagement', 'Email-Verified');
     sendMatomoEvent('Engagement', 'Email-Verified');
   },
   rewardEligibleEvent: () => {
-    sendGaEvent('Engagement', 'Reward-Eligible');
     sendMatomoEvent('Engagement', 'Reward-Eligible');
   },
   openUrlEvent: (url: string) => {
-    sendGaEvent('Engagement', 'Open-Url', url);
     sendMatomoEvent('Engagement', 'Open-Url', url);
   },
   trendingAlgorithmEvent: (trendingAlgorithm: string) => {
-    sendGaEvent('Engagement', 'Trending-Algorithm', trendingAlgorithm);
+    sendMatomoEvent('Engagement', 'Trending-Algorithm', trendingAlgorithm);
   },
   startupEvent: () => {
-    sendGaEvent('Startup', 'Startup');
     sendMatomoEvent('Startup', 'Startup');
   },
   readyEvent: (timeToReady: number) => {
-    sendGaEvent('Startup', 'App-Ready');
-    sendGaTimingEvent('Startup', 'App-Ready', timeToReady);
     sendMatomoEvent('Startup', 'App-Ready', 'Time', timeToReady);
   },
   purchaseEvent: (purchaseInt: number) => {
-    sendGaEvent('Purchase', 'Purchase-Complete', undefined, purchaseInt);
     sendMatomoEvent('Purchase', 'Purchase-Complete', 'someLabel', purchaseInt);
   },
 };
 
-function sendGaEvent(category, action, label, value) {
-  if (thirdPartyAnalyticsEnabled && isProduction) {
-    ReactGA.event(
-      {
-        category,
-        action,
-        ...(label ? { label } : {}),
-        ...(value ? { value } : {}),
-      },
-      [SECOND_TRACKER_NAME]
-    );
-  }
-}
-
 function sendMatomoEvent(category, action, name, value) {
   if (internalAnalyticsEnabled) {
     const event = { category, action, name, value };
@@ -262,20 +224,6 @@ function sendMatomoEvent(category, action, name, value) {
   }
 }
 
-function sendGaTimingEvent(category: string, action: string, timeInMs: number, label?: string) {
-  if (thirdPartyAnalyticsEnabled && isProduction) {
-    ReactGA.timing(
-      {
-        category,
-        variable: action,
-        value: timeInMs,
-        ...(label ? { label } : {}),
-      },
-      [SECOND_TRACKER_NAME]
-    );
-  }
-}
-
 function sendPromMetric(name: string, value?: number) {
   if (IS_WEB) {
     let url = new URL(SDK_API_PATH + '/metric/ui');
@@ -285,31 +233,6 @@ function sendPromMetric(name: string, value?: number) {
   }
 }
 
-let gaTrackers = [];
-
-if (!IS_WEB) {
-  gaTrackers.push({
-    trackingId: DESKTOP_UA_ID,
-  });
-} else {
-  gaTrackers.push({
-    trackingId: LBRY_TV_UA_ID,
-  });
-
-  const { search } = window.location;
-  const urlParams = new URLSearchParams(search);
-  const isPirateBayUser = urlParams.get('utm_source') === 'PB';
-
-  if (!isPirateBayUser) {
-    gaTrackers.push({
-      trackingId: LBRY_TV_MINUS_PIRATE_BAY_UA_ID,
-      gaOptions: {
-        name: SECOND_TRACKER_NAME,
-      },
-    });
-  }
-}
-
 const MatomoInstance = new MatomoTracker({
   urlBase: MATOMO_URL,
   siteId: MATOMO_ID, // optional, default value: `1`
@@ -320,14 +243,6 @@ const MatomoInstance = new MatomoTracker({
   // linkTracking: false // optional, default value: true
 });
 
-ReactGA.initialize(gaTrackers, {
-  testMode: process.env.NODE_ENV !== 'production',
-  cookieDomain: 'auto',
-  siteSpeedSampleRate: 100,
-  // un-comment to see events as they are sent to google
-  // debug: true,
-});
-
 // Manually call the first page view
 // React Router doesn't include this on `history.listen`
 // @if TARGET='web'
@@ -335,8 +250,6 @@ analytics.pageView(window.location.pathname + window.location.search);
 // @endif
 
 // @if TARGET='app'
-ReactGA.set({ checkProtocolTask: null });
-ReactGA.set({ location: 'https://lbry.tv' });
 analytics.pageView(
   window.location.pathname.split('.html')[1] + window.location.search || generateInitialUrl(window.location.hash)
 );
diff --git a/ui/component/button/view.jsx b/ui/component/button/view.jsx
index 8be0839eb..b57a9d72f 100644
--- a/ui/component/button/view.jsx
+++ b/ui/component/button/view.jsx
@@ -5,7 +5,6 @@ import Icon from 'component/common/icon';
 import classnames from 'classnames';
 import { NavLink } from 'react-router-dom';
 import { formatLbryUrlForWeb } from 'util/url';
-import { OutboundLink } from 'react-ga';
 import * as PAGES from 'constants/pages';
 import useCombinedRefs from 'effects/use-combined-refs';
 
@@ -129,19 +128,12 @@ const Button = forwardRef<any, {}>((props: Props, ref: any) => {
       {iconRight && <Icon icon={iconRight} iconColor={iconColor} size={size} />}
     </span>
   );
-
+  // TODO: replace the below with an outbound link tracker for matomo
   if (href) {
     return (
-      <OutboundLink
-        eventLabel="outboundClick"
-        to={href}
-        target="_blank"
-        className={combinedClassName}
-        onClick={onClick}
-        {...otherProps}
-      >
+      <a href={href} className={combinedClassName}>
         {content}
-      </OutboundLink>
+      </a>
     );
   }
 
diff --git a/ui/component/privacyAgreement/view.jsx b/ui/component/privacyAgreement/view.jsx
index 10a811745..cdd9c0860 100644
--- a/ui/component/privacyAgreement/view.jsx
+++ b/ui/component/privacyAgreement/view.jsx
@@ -7,13 +7,14 @@ import { Form } from 'component/common/form-components/form';
 import { withRouter } from 'react-router-dom';
 // $FlowFixMe cannot resolve ...
 import image from 'static/img/unlocklbry.svg';
+import { WELCOME_VERSION } from 'config';
 
 const FREE = 'free';
 const LIMITED = 'limited';
 const NONE = 'none';
 
 type Props = {
-  setWelcomeVersion: () => void,
+  setWelcomeVersion: number => void,
   signOut: () => void,
   setShareDataInternal: boolean => void,
   setShareDataThirdParty: boolean => void,
@@ -37,7 +38,7 @@ function PrivacyAgreement(props: Props) {
       setShareDataInternal(false);
       setShareDataThirdParty(false);
     }
-    setWelcomeVersion();
+    setWelcomeVersion(WELCOME_VERSION);
     history.replace(`/`);
   }
 
diff --git a/yarn.lock b/yarn.lock
index 6fd8a3fe3..e7f20542c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8693,10 +8693,6 @@ react-draggable@^3.3.0:
     classnames "^2.2.5"
     prop-types "^15.6.0"
 
-react-ga@^2.5.7:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/react-ga/-/react-ga-2.7.0.tgz#24328f157f31e8cffbf4de74a3396536679d8d7c"
-
 react-google-recaptcha@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/react-google-recaptcha/-/react-google-recaptcha-2.0.1.tgz#3276b29659493f7ca2a5b7739f6c239293cdf1d8"
-- 
2.45.2