diff --git a/.env.defaults b/.env.defaults
index 48c0ebb66..bfeb12fff 100644
--- a/.env.defaults
+++ b/.env.defaults
@@ -19,7 +19,7 @@ THUMBNAIL_CDN_URL=https://image-processor.vanwanet.com/optimize/
 WELCOME_VERSION=1.0
 
 # STRIPE
-# STRIPE_PUBLIC_KEY='pk_test_NoL1JWL7i1ipfhVId5KfDZgo'
+STRIPE_PUBLIC_KEY='pk_test_NoL1JWL7i1ipfhVId5KfDZgo'
 
 # Analytics
 MATOMO_URL=https://analytics.lbry.com/
@@ -52,7 +52,6 @@ YRBL_SAD_IMG_URL=https://cdn.lbryplayer.xyz/api/v3/streams/free/yrbl-sad/c2d9649
 #LOGO_TEXT_LIGHT=https://cdn.lbryplayer.xyz/api/v3/streams/free/yrbl-sad/c2d9649633d974e5ffb503925e1f17d951f1bd0f/f262dd
 #LOGO_TEXT_DARK=https://cdn.lbryplayer.xyz/api/v3/streams/free/yrbl-sad/c2d9649633d974e5ffb503925e1f17d951f1bd0f/f262dd
 #AVATAR_DEFAULT=
-#MISSING_THUMB_DEFAULT=
 #FAVICON=
 
 # LOCALE
diff --git a/config.js b/config.js
index 49e215c5b..89c916654 100644
--- a/config.js
+++ b/config.js
@@ -35,7 +35,6 @@ const config = {
   LOGO_TEXT_LIGHT: process.env.LOGO_TEXT_LIGHT,
   LOGO_TEXT_DARK: process.env.LOGO_TEXT_DARK,
   AVATAR_DEFAULT: process.env.AVATAR_DEFAULT,
-  MISSING_THUMB_DEFAULT: process.env.MISSING_THUMB_DEFAULT,
   // OG
   OG_TITLE_SUFFIX: process.env.OG_TITLE_SUFFIX,
   OG_HOMEPAGE_TITLE: process.env.OG_HOMEPAGE_TITLE,
diff --git a/package.json b/package.json
index b4b78d99e..fcde26e5b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lbry",
-  "version": "0.51.2-rc.3",
+  "version": "0.51.2-rc.2",
   "description": "A browser for the LBRY network, a digital marketplace controlled by its users.",
   "keywords": [
     "lbry"
diff --git a/static/app-strings.json b/static/app-strings.json
index a7e83a936..e5f45808b 100644
--- a/static/app-strings.json
+++ b/static/app-strings.json
@@ -2090,8 +2090,5 @@
   "Expand Comments": "Expand Comments",
   "Expand": "Expand",
   "Load More": "Load More",
-  "Collection": "Collection",
-  "%channelName% isn't live right now, but the chat is! Check back later to watch the stream.": "%channelName% isn't live right now, but the chat is! Check back later to watch the stream.",
-  "Review": "Review",
   "--end--": "--end--"
 }
diff --git a/ui/component/commentCreate/view.jsx b/ui/component/commentCreate/view.jsx
index 63e77a026..008a28aa1 100644
--- a/ui/component/commentCreate/view.jsx
+++ b/ui/component/commentCreate/view.jsx
@@ -1,6 +1,6 @@
 // @flow
 import type { ElementRef } from 'react';
-import { SIMPLE_SITE } from 'config';
+import { SIMPLE_SITE, STRIPE_PUBLIC_KEY } from 'config';
 import * as PAGES from 'constants/pages';
 import * as ICONS from 'constants/icons';
 import React from 'react';
@@ -21,8 +21,12 @@ import Empty from 'component/common/empty';
 import { getChannelIdFromClaim } from 'util/claim';
 import { Lbryio } from 'lbryinc';
 
-import { getStripeEnvironment } from 'util/stripe';
-let stripeEnvironment = getStripeEnvironment();
+let stripeEnvironment = 'test';
+// if the key contains pk_live it's a live key
+// update the environment for the calls to the backend to indicate which environment to hit
+if (STRIPE_PUBLIC_KEY.indexOf('pk_live') > -1) {
+  stripeEnvironment = 'live';
+}
 
 const TAB_FIAT = 'TabFiat';
 const TAB_LBC = 'TabLBC';
@@ -241,13 +245,10 @@ export function CommentCreate(props: Props) {
           }, 1500);
 
           doToast({
-            message: __(
-              "You sent %tipAmount% LBRY Credits as a tip to %tipChannelName%, I'm sure they appreciate it!",
-              {
-                tipAmount: tipAmount, // force show decimal places
-                tipChannelName,
-              }
-            ),
+            message: __("You sent %tipAmount% LBRY Credits as a tip to %tipChannelName%, I'm sure they appreciate it!", {
+              tipAmount: tipAmount, // force show decimal places
+              tipChannelName,
+            }),
           });
 
           setSuccessTip({ txid, tipAmount });
@@ -264,8 +265,7 @@ export function CommentCreate(props: Props) {
       Lbryio.call(
         'customer',
         'tip',
-        {
-          // round to deal with floating point precision
+        { // round to deal with floating point precision
           amount: Math.round(100 * roundedAmount), // convert from dollars to cents
           creator_channel_name: tipChannelName, // creator_channel_name
           creator_channel_claim_id: channelClaimId,
@@ -387,7 +387,12 @@ export function CommentCreate(props: Props) {
           }
         }}
       >
-        <FormField type="textarea" name={'comment_signup_prompt'} placeholder={__('Say something about this...')} />
+        <FormField
+          type="textarea"
+          name={'comment_signup_prompt'}
+          placeholder={__('Say something about this...')}
+          label={isFetchingChannels ? __('Comment') : undefined}
+        />
         <div className="section__actions--no-margin">
           <Button disabled button="primary" label={__('Post --[button to submit something]--')} requiresAuth={IS_WEB} />
         </div>
@@ -529,8 +534,7 @@ export function CommentCreate(props: Props) {
                 }}
               />
             )}
-            {/* @if TARGET='web' */}
-            {!claimIsMine && stripeEnvironment && (
+            {!claimIsMine && (
               <Button
                 disabled={disabled}
                 button="alt"
@@ -542,7 +546,6 @@ export function CommentCreate(props: Props) {
                 }}
               />
             )}
-            {/* @endif */}
             {isReply && !minTip && (
               <Button
                 button="link"
diff --git a/ui/component/fileThumbnail/thumb.jsx b/ui/component/fileThumbnail/thumb.jsx
index 9f2fb993e..64f11c138 100644
--- a/ui/component/fileThumbnail/thumb.jsx
+++ b/ui/component/fileThumbnail/thumb.jsx
@@ -6,16 +6,14 @@ import useLazyLoading from 'effects/use-lazy-loading';
 
 type Props = {
   thumb: string,
-  fallback: ?string,
   children?: Node,
   className?: string,
 };
 
 const Thumb = (props: Props) => {
-  const { thumb, fallback, children, className } = props;
+  const { thumb, children, className } = props;
   const thumbnailRef = React.useRef(null);
-
-  useLazyLoading(thumbnailRef, fallback || '');
+  useLazyLoading(thumbnailRef);
 
   return (
     <div ref={thumbnailRef} data-background-image={thumb} className={classnames('media__thumb', className)}>
diff --git a/ui/component/fileThumbnail/view.jsx b/ui/component/fileThumbnail/view.jsx
index a5ef83ab6..6da4e513c 100644
--- a/ui/component/fileThumbnail/view.jsx
+++ b/ui/component/fileThumbnail/view.jsx
@@ -4,7 +4,6 @@ import { getThumbnailCdnUrl } from 'util/thumbnail';
 import React from 'react';
 import FreezeframeWrapper from './FreezeframeWrapper';
 import Placeholder from './placeholder.png';
-import { MISSING_THUMB_DEFAULT } from 'config';
 import classnames from 'classnames';
 import Thumb from './thumb';
 
@@ -43,8 +42,6 @@ function FileThumbnail(props: Props) {
     );
   }
 
-  const fallback = MISSING_THUMB_DEFAULT ? getThumbnailCdnUrl({ thumbnail: MISSING_THUMB_DEFAULT }) : undefined;
-
   let url = thumbnail || (hasResolvedClaim ? Placeholder : '');
   // @if TARGET='web'
   // Pass image urls through a compression proxy
@@ -57,7 +54,7 @@ function FileThumbnail(props: Props) {
 
   if (hasResolvedClaim || thumbnailUrl) {
     return (
-      <Thumb thumb={thumbnailUrl} fallback={fallback} className={className}>
+      <Thumb thumb={thumbnailUrl} className={className}>
         {children}
       </Thumb>
     );
diff --git a/ui/component/viewers/videoViewer/internal/plugins/videojs-aniview/plugin.js b/ui/component/viewers/videoViewer/internal/plugins/videojs-aniview/plugin.js
index f51502be8..0dcdc20be 100644
--- a/ui/component/viewers/videoViewer/internal/plugins/videojs-aniview/plugin.js
+++ b/ui/component/viewers/videoViewer/internal/plugins/videojs-aniview/plugin.js
@@ -97,7 +97,7 @@ class AniviewPlugin extends Component {
   }
 }
 
-videojs.registerComponent('recsys', AniviewPlugin);
+videojs.registerComponent('aniview', AniviewPlugin);
 
 const onPlayerReady = (player, options) => {
   player.aniview = new AniviewPlugin(player, options);
diff --git a/ui/component/viewers/videoViewer/internal/videojs.jsx b/ui/component/viewers/videoViewer/internal/videojs.jsx
index 29366c338..d27bf7f1d 100644
--- a/ui/component/viewers/videoViewer/internal/videojs.jsx
+++ b/ui/component/viewers/videoViewer/internal/videojs.jsx
@@ -13,8 +13,9 @@ import hlsQualitySelector from './plugins/videojs-hls-quality-selector/plugin';
 import recsys from './plugins/videojs-recsys/plugin';
 import qualityLevels from 'videojs-contrib-quality-levels';
 import isUserTyping from 'util/detect-typing';
+// @if TARGET='web'
 import './plugins/videojs-aniview/plugin';
-
+// @endif
 const isDev = process.env.NODE_ENV !== 'production';
 
 export type Player = {
@@ -585,9 +586,11 @@ export default React.memo<Props>(function VideoJs(props: Props) {
     // This must be initialized earlier than everything else
     // otherwise a race condition occurs if we place this in the onReady call back
     // allow if isDev because otherwise you'll never see ads when basing to master
+    // @if TARGET='web'
     if ((allowPreRoll && SIMPLE_SITE) || isDev) {
       vjs.aniview();
     }
+    // @endif
 
     // fixes #3498 (https://github.com/lbryio/lbry-desktop/issues/3498)
     // summary: on firefox the focus would stick to the fullscreen button which caused buggy behavior with spacebar
@@ -662,6 +665,7 @@ export default React.memo<Props>(function VideoJs(props: Props) {
   }, [source, reload]);
 
   // Load IMA3 SDK for aniview
+  // @if TARGET='web'
   useEffect(() => {
     const script = document.createElement('script');
     script.src = `https://imasdk.googleapis.com/js/sdkloader/ima3.js`;
@@ -674,6 +678,7 @@ export default React.memo<Props>(function VideoJs(props: Props) {
       document.body.removeChild(script);
     };
   });
+  // @endif
 
   return (
     // $FlowFixMe
diff --git a/ui/component/walletFiatPaymentHistory/view.jsx b/ui/component/walletFiatPaymentHistory/view.jsx
index 45d55bde7..42d0341f3 100644
--- a/ui/component/walletFiatPaymentHistory/view.jsx
+++ b/ui/component/walletFiatPaymentHistory/view.jsx
@@ -4,8 +4,14 @@ import Button from 'component/button';
 import Card from 'component/common/card';
 import { Lbryio } from 'lbryinc';
 import moment from 'moment';
-import { getStripeEnvironment } from 'util/stripe';
-let stripeEnvironment = getStripeEnvironment();
+import { STRIPE_PUBLIC_KEY } from 'config';
+
+let stripeEnvironment = 'test';
+// if the key contains pk_live it's a live key
+// update the environment for the calls to the backend to indicate which environment to hit
+if (STRIPE_PUBLIC_KEY.indexOf('pk_live') > -1) {
+  stripeEnvironment = 'live';
+}
 
 type Props = {
   accountDetails: any,
@@ -35,15 +41,12 @@ const WalletBalance = (props: Props) => {
 
   // TODO: this is actually incorrect, last4 should be populated based on the transaction not the current customer details
   React.useEffect(() => {
-    (async function () {
-      const customerStatusResponse = await getCustomerStatus();
+    (async function() {
+        const customerStatusResponse = await getCustomerStatus();
 
-      const lastFour =
-        customerStatusResponse.PaymentMethods &&
-        customerStatusResponse.PaymentMethods.length &&
-        customerStatusResponse.PaymentMethods[0].card.last4;
+        const lastFour = customerStatusResponse.PaymentMethods && customerStatusResponse.PaymentMethods.length && customerStatusResponse.PaymentMethods[0].card.last4;
 
-      setLastFour(lastFour);
+        setLastFour(lastFour);
     })();
   }, []);
 
@@ -56,57 +59,53 @@ const WalletBalance = (props: Props) => {
             <div className="table__wrapper">
               <table className="table table--transactions">
                 <thead>
-                  <tr>
-                    <th className="date-header">{__('Date')}</th>
-                    <th>{<>{__('Receiving Channel Name')}</>}</th>
-                    <th>{__('Tip Location')}</th>
-                    <th>{__('Amount (USD)')} </th>
-                    <th>{__('Card Last 4')}</th>
-                    <th>{__('Anonymous')}</th>
-                  </tr>
+                <tr>
+                  <th className="date-header">{__('Date')}</th>
+                  <th>{<>{__('Receiving Channel Name')}</>}</th>
+                  <th>{__('Tip Location')}</th>
+                  <th>{__('Amount (USD)')} </th>
+                  <th>{__('Card Last 4')}</th>
+                  <th>{__('Anonymous')}</th>
+                </tr>
                 </thead>
                 <tbody>
-                  {accountTransactions &&
-                    accountTransactions.map((transaction) => (
-                      <tr key={transaction.name + transaction.created_at}>
-                        <td>{moment(transaction.created_at).format('LLL')}</td>
-                        <td>
-                          <Button
-                            className=""
-                            navigate={'/' + transaction.channel_name + ':' + transaction.channel_claim_id}
-                            label={transaction.channel_name}
-                            button="link"
-                          />
-                        </td>
-                        <td>
-                          <Button
-                            className=""
-                            navigate={'/' + transaction.channel_name + ':' + transaction.source_claim_id}
-                            label={
-                              transaction.channel_claim_id === transaction.source_claim_id
-                                ? 'Channel Page'
-                                : 'Content Page'
-                            }
-                            button="link"
-                          />
-                        </td>
-                        <td>${transaction.tipped_amount / 100}</td>
-                        <td>{lastFour}</td>
-                        <td>{transaction.private_tip ? 'Yes' : 'No'}</td>
-                      </tr>
-                    ))}
+                {accountTransactions &&
+                accountTransactions.map((transaction) => (
+                  <tr key={transaction.name + transaction.created_at}>
+                    <td>{moment(transaction.created_at).format('LLL')}</td>
+                    <td>
+                      <Button
+                        className=""
+                        navigate={'/' + transaction.channel_name + ':' + transaction.channel_claim_id}
+                        label={transaction.channel_name}
+                        button="link"
+                      />
+                    </td>
+                    <td>
+                      <Button
+                        className=""
+                        navigate={'/' + transaction.channel_name + ':' + transaction.source_claim_id}
+                        label={
+                          transaction.channel_claim_id === transaction.source_claim_id
+                            ? 'Channel Page'
+                            : 'Content Page'
+                        }
+                        button="link"
+                      />
+                    </td>
+                    <td>${transaction.tipped_amount / 100}</td>
+                    <td>{lastFour}</td>
+                    <td>{transaction.private_tip ? 'Yes' : 'No'}</td>
+                  </tr>
+                ))}
                 </tbody>
               </table>
-              {(!accountTransactions || accountTransactions.length === 0) && (
-                <p style={{ textAlign: 'center', marginTop: '20px', fontSize: '13px', color: 'rgb(171, 171, 171)' }}>
-                  No Transactions
-                </p>
-              )}
+              {(!accountTransactions || accountTransactions.length === 0) && <p style={{textAlign: 'center', marginTop: '20px', fontSize: '13px', color: 'rgb(171, 171, 171)'}}>No Transactions</p>}
             </div>
           </>
         }
       />
-    </>
+  </>
   );
 };
 
diff --git a/ui/component/walletSendTip/view.jsx b/ui/component/walletSendTip/view.jsx
index 2167f2e62..c88d3dd7a 100644
--- a/ui/component/walletSendTip/view.jsx
+++ b/ui/component/walletSendTip/view.jsx
@@ -15,8 +15,14 @@ import LbcSymbol from 'component/common/lbc-symbol';
 import { parseURI } from 'lbry-redux';
 import usePersistedState from 'effects/use-persisted-state';
 import WalletSpendableBalanceHelp from 'component/walletSpendableBalanceHelp';
-import { getStripeEnvironment } from 'util/stripe';
-let stripeEnvironment = getStripeEnvironment();
+import { STRIPE_PUBLIC_KEY } from 'config';
+
+let stripeEnvironment = 'test';
+// if the key contains pk_live it's a live key
+// update the environment for the calls to the backend to indicate which environment to hit
+if (STRIPE_PUBLIC_KEY.indexOf('pk_live') > -1) {
+  stripeEnvironment = 'live';
+}
 
 const DEFAULT_TIP_AMOUNTS = [1, 5, 25, 100];
 const MINIMUM_FIAT_TIP = 1;
@@ -94,7 +100,7 @@ function WalletSendTip(props: Props) {
 
   // check if creator has a payment method saved
   React.useEffect(() => {
-    if (channelClaimId && isAuthenticated && stripeEnvironment) {
+    if (channelClaimId && isAuthenticated) {
       Lbryio.call(
         'customer',
         'status',
@@ -112,18 +118,16 @@ function WalletSendTip(props: Props) {
         setHasSavedCard(Boolean(defaultPaymentMethodId));
       });
     }
-  }, [channelClaimId, isAuthenticated, stripeEnvironment]);
+  }, [channelClaimId, isAuthenticated]);
 
   // check if creator has an account saved
   React.useEffect(() => {
     const tipInputElement = document.getElementById('tip-input');
-    if (tipInputElement) {
-      tipInputElement.focus();
-    }
+    if (tipInputElement) { tipInputElement.focus() }
   }, []);
 
   React.useEffect(() => {
-    if (channelClaimId && stripeEnvironment) {
+    if (channelClaimId) {
       Lbryio.call(
         'account',
         'check',
@@ -145,14 +149,14 @@ function WalletSendTip(props: Props) {
           // console.log(error);
         });
     }
-  }, [channelClaimId, stripeEnvironment]);
+  }, [channelClaimId]);
 
   const noBalance = balance === 0;
   const tipAmount = useCustomTip ? customTipAmount : presetTipAmount;
 
   const [activeTab, setActiveTab] = React.useState(claimIsMine ? TAB_BOOST : TAB_LBC);
 
-  function getClaimTypeText() {
+  function setClaimTypeText() {
     if (claim.value_type === 'stream') {
       return __('Content');
     } else if (claim.value_type === 'channel') {
@@ -165,24 +169,22 @@ function WalletSendTip(props: Props) {
       return __('Claim');
     }
   }
-  const claimTypeText = getClaimTypeText();
+  const claimTypeText = setClaimTypeText();
 
   let iconToUse;
   let explainerText = '';
   if (activeTab === TAB_BOOST) {
     iconToUse = ICONS.LBC;
-    explainerText = __('This refundable boost will improve the discoverability of this %claimTypeText% while active.', {
-      claimTypeText,
-    });
+    explainerText = __('This refundable boost will improve the discoverability of this %claimTypeText% while active.', {claimTypeText});
   } else if (activeTab === TAB_FIAT) {
     iconToUse = ICONS.FINANCE;
-    explainerText = __('Show this channel your appreciation by sending a donation in USD.');
+    explainerText = __('Show this channel your appreciation by sending a donation in USD. ');
     // if (!hasCardSaved) {
     //   explainerText += __('You must add a card to use this functionality.');
     // }
   } else if (activeTab === TAB_LBC) {
     iconToUse = ICONS.LBC;
-    explainerText = __('Show this channel your appreciation by sending a donation of Credits.');
+    explainerText = __('Show this channel your appreciation by sending a donation of Credits. ');
   }
 
   const isSupport = claimIsMine || activeTab === TAB_BOOST;
@@ -214,7 +216,7 @@ function WalletSendTip(props: Props) {
       } else if (tipAmount < MINIMUM_PUBLISH_BID) {
         tipError = __('Amount must be higher');
       }
-      //  if tip fiat tab
+    //  if tip fiat tab
     } else {
       regexp = RegExp(/^(\d*([.]\d{0,2})?)$/);
       const validTipInput = regexp.test(String(tipAmount));
@@ -274,8 +276,7 @@ function WalletSendTip(props: Props) {
           Lbryio.call(
             'customer',
             'tip',
-            {
-              // round to fix issues with floating point numbers
+            { // round to fix issues with floating point numbers
               amount: Math.round(100 * tipAmount), // convert from dollars to cents
               creator_channel_name: tipChannelName, // creator_channel_name
               creator_channel_claim_id: channelClaimId,
@@ -296,7 +297,7 @@ function WalletSendTip(props: Props) {
                 }),
               });
             })
-            .catch(function (error) {
+            .catch(function(error) {
               let displayError = 'Sorry, there was an error in processing your payment!';
 
               if (error.message !== 'payment intent failed to confirm') {
@@ -315,10 +316,10 @@ function WalletSendTip(props: Props) {
     }
   }
 
-  const countDecimals = function (value) {
+  const countDecimals = function(value) {
     const text = value.toString();
     const index = text.indexOf('.');
-    return text.length - index - 1;
+    return (text.length - index - 1);
   };
 
   function handleCustomPriceChange(event: SyntheticInputEvent<*>) {
@@ -386,9 +387,7 @@ function WalletSendTip(props: Props) {
     const displayAmount = !isNan(tipAmount) ? amountToShow : '';
 
     if (activeTab === TAB_BOOST) {
-      return claimIsMine
-        ? __('Boost Your %claimTypeText%', { claimTypeText })
-        : __('Boost This %claimTypeText%', { claimTypeText });
+      return (claimIsMine ?  __('Boost Your %claimTypeText%', {claimTypeText}) : __('Boost This %claimTypeText%', {claimTypeText}));
     } else if (activeTab === TAB_FIAT) {
       return __('Send a $%displayAmount% Tip', { displayAmount });
     } else if (activeTab === TAB_LBC) {
@@ -417,16 +416,7 @@ function WalletSendTip(props: Props) {
       {/* if there is no LBC balance, show user frontend to get credits */}
       {/* if there is lbc, the main tip/boost gui with the 3 tabs at the top */}
       <Card
-        title={
-          <LbcSymbol
-            postfix={
-              claimIsMine
-                ? __('Boost Your %claimTypeText%', { claimTypeText })
-                : __('Support This %claimTypeText%', { claimTypeText })
-            }
-            size={22}
-          />
-        }
+        title={<LbcSymbol postfix={claimIsMine ? __('Boost Your %claimTypeText%', {claimTypeText}) : __('Support This %claimTypeText%', {claimTypeText})} size={22} />}
         subtitle={
           <React.Fragment>
             {!claimIsMine && (
@@ -439,9 +429,7 @@ function WalletSendTip(props: Props) {
                   button="alt"
                   onClick={() => {
                     const tipInputElement = document.getElementById('tip-input');
-                    if (tipInputElement) {
-                      tipInputElement.focus();
-                    }
+                    if (tipInputElement) { tipInputElement.focus() }
                     if (!isConfirming) {
                       setActiveTab(TAB_LBC);
                     }
@@ -450,24 +438,20 @@ function WalletSendTip(props: Props) {
                 />
                 {/* tip fiat tab button */}
                 {/* @if TARGET='web' */}
-                {stripeEnvironment && (
-                  <Button
-                    key="tip-fiat"
-                    icon={ICONS.FINANCE}
-                    label={__('Tip')}
-                    button="alt"
-                    onClick={() => {
-                      const tipInputElement = document.getElementById('tip-input');
-                      if (tipInputElement) {
-                        tipInputElement.focus();
-                      }
-                      if (!isConfirming) {
-                        setActiveTab(TAB_FIAT);
-                      }
-                    }}
-                    className={classnames('button-toggle', { 'button-toggle--active': activeTab === TAB_FIAT })}
-                  />
-                )}
+                <Button
+                  key="tip-fiat"
+                  icon={ICONS.FINANCE}
+                  label={__('Tip')}
+                  button="alt"
+                  onClick={() => {
+                    const tipInputElement = document.getElementById('tip-input');
+                    if (tipInputElement) { tipInputElement.focus() }
+                    if (!isConfirming) {
+                      setActiveTab(TAB_FIAT);
+                    }
+                  }}
+                  className={classnames('button-toggle', { 'button-toggle--active': activeTab === TAB_FIAT })}
+                />
                 {/* @endif */}
                 {/* tip LBC tab button */}
                 <Button
@@ -477,9 +461,7 @@ function WalletSendTip(props: Props) {
                   button="alt"
                   onClick={() => {
                     const tipInputElement = document.getElementById('tip-input');
-                    if (tipInputElement) {
-                      tipInputElement.focus();
-                    }
+                    if (tipInputElement) { tipInputElement.focus() }
                     if (!isConfirming) {
                       setActiveTab(TAB_BOOST);
                     }
@@ -511,29 +493,33 @@ function WalletSendTip(props: Props) {
                   </div>
                   <div className="confirm__label">{setConfirmLabel()}</div>
                   <div className="confirm__value">
-                    {activeTab === TAB_FIAT ? (
-                      <p>$ {(Math.round(tipAmount * 100) / 100).toFixed(2)}</p>
-                    ) : (
-                      <LbcSymbol postfix={tipAmount} size={22} />
-                    )}
+                    {activeTab === TAB_FIAT ? <p>$ {(Math.round(tipAmount * 100) / 100).toFixed(2)}</p> : <LbcSymbol postfix={tipAmount} size={22} />}
                   </div>
                 </div>
               </div>
               <div className="section__actions">
-                <Button autoFocus onClick={handleSubmit} button="primary" disabled={isPending} label={__('Confirm')} />
+                <Button
+                  autoFocus
+                  onClick={handleSubmit}
+                  button="primary"
+                  disabled={isPending}
+                  label={__('Confirm')}
+                />
                 <Button button="link" label={__('Cancel')} onClick={() => setIsConfirming(false)} />
               </div>
             </>
-          ) : !((activeTab === TAB_LBC || activeTab === TAB_BOOST) && noBalance) ? (
-            <>
+            // only show the prompt to earn more if its lbc or boost tab and no balance
+            // otherwise you can show the full prompt
+          ) : (!((activeTab === TAB_LBC || activeTab === TAB_BOOST) && noBalance)
+            ? <>
               <div className="section">
                 <ChannelSelector />
               </div>
 
               {activeTab === TAB_FIAT && !hasCardSaved && (
                 <h3 className="add-card-prompt">
-                  <Button navigate={`/$/${PAGES.SETTINGS_STRIPE_CARD}`} label={__('Add a Card')} button="link" />{' '}
-                  {__('To Tip Creators')}
+                  <Button navigate={`/$/${PAGES.SETTINGS_STRIPE_CARD}`} label={__('Add a Card')} button="link" />
+                  {' '}{__('To Tip Creators')}
                 </h3>
               )}
 
@@ -639,36 +625,28 @@ function WalletSendTip(props: Props) {
                 <div className="help">{__('The payment will be made from your saved card')}</div>
               )}
             </>
-          ) : (
-            // if it's LBC and there is no balance, you can prompt to purchase LBC
-            <Card
-              title={
-                <I18nMessage tokens={{ lbc: <LbcSymbol size={22} /> }}>Supporting content requires %lbc%</I18nMessage>
-              }
-              subtitle={
-                <I18nMessage tokens={{ lbc: <LbcSymbol /> }}>
-                  With %lbc%, you can send tips to your favorite creators, or help boost their content for more people
-                  to see.
-                </I18nMessage>
-              }
-              actions={
-                <div className="section__actions">
-                  <Button
-                    icon={ICONS.REWARDS}
-                    button="primary"
-                    label={__('Earn Rewards')}
-                    navigate={`/$/${PAGES.REWARDS}`}
-                  />
-                  <Button
-                    icon={ICONS.BUY}
-                    button="secondary"
-                    label={__('Buy/Swap Credits')}
-                    navigate={`/$/${PAGES.BUY}`}
-                  />
-                  <Button button="link" label={__('Nevermind')} onClick={closeModal} />
-                </div>
-              }
-            />
+              // if it's LBC and there is no balance, you can prompt to purchase LBC
+               : <Card
+                 title={<I18nMessage tokens={{ lbc: <LbcSymbol size={22} /> }}>Supporting content requires %lbc%</I18nMessage>}
+                 subtitle={
+                    <I18nMessage tokens={{ lbc: <LbcSymbol /> }}>
+                      With %lbc%, you can send tips to your favorite creators, or help boost their content for more people to
+                      see.
+                    </I18nMessage>
+                  }
+                 actions={
+                    <div className="section__actions">
+                      <Button
+                        icon={ICONS.REWARDS}
+                        button="primary"
+                        label={__('Earn Rewards')}
+                        navigate={`/$/${PAGES.REWARDS}`}
+                      />
+                      <Button icon={ICONS.BUY} button="secondary" label={__('Buy/Swap Credits')} navigate={`/$/${PAGES.BUY}`} />
+                      <Button button="link" label={__('Nevermind')} onClick={closeModal} />
+                    </div>
+                  }
+              />
           )
         }
       />
diff --git a/ui/component/walletTipAmountSelector/view.jsx b/ui/component/walletTipAmountSelector/view.jsx
index 25c402810..eeb526e39 100644
--- a/ui/component/walletTipAmountSelector/view.jsx
+++ b/ui/component/walletTipAmountSelector/view.jsx
@@ -11,8 +11,14 @@ import classnames from 'classnames';
 import usePersistedState from 'effects/use-persisted-state';
 import WalletSpendableBalanceHelp from 'component/walletSpendableBalanceHelp';
 import { Lbryio } from 'lbryinc';
-import { getStripeEnvironment } from 'util/stripe';
-let stripeEnvironment = getStripeEnvironment();
+import { STRIPE_PUBLIC_KEY } from 'config';
+
+let stripeEnvironment = 'test';
+// if the key contains pk_live it's a live key
+// update the environment for the calls to the backend to indicate which environment to hit
+if (STRIPE_PUBLIC_KEY.indexOf('pk_live') > -1) {
+  stripeEnvironment = 'live';
+}
 
 const DEFAULT_TIP_AMOUNTS = [1, 5, 25, 100];
 
@@ -70,49 +76,45 @@ function WalletTipAmountSelector(props: Props) {
 
   // check if creator has a payment method saved
   React.useEffect(() => {
-    if (stripeEnvironment) {
-      Lbryio.call(
-        'customer',
-        'status',
-        {
-          environment: stripeEnvironment,
-        },
-        'post'
-      ).then((customerStatusResponse) => {
-        const defaultPaymentMethodId =
-          customerStatusResponse.Customer &&
-          customerStatusResponse.Customer.invoice_settings &&
-          customerStatusResponse.Customer.invoice_settings.default_payment_method &&
-          customerStatusResponse.Customer.invoice_settings.default_payment_method.id;
+    Lbryio.call(
+      'customer',
+      'status',
+      {
+        environment: stripeEnvironment,
+      },
+      'post'
+    ).then((customerStatusResponse) => {
+      const defaultPaymentMethodId =
+        customerStatusResponse.Customer &&
+        customerStatusResponse.Customer.invoice_settings &&
+        customerStatusResponse.Customer.invoice_settings.default_payment_method &&
+        customerStatusResponse.Customer.invoice_settings.default_payment_method.id;
 
-        setHasSavedCard(Boolean(defaultPaymentMethodId));
-      });
-    }
-  }, [stripeEnvironment]);
+      setHasSavedCard(Boolean(defaultPaymentMethodId));
+    });
+  }, []);
 
   //
   React.useEffect(() => {
-    if (stripeEnvironment) {
-      Lbryio.call(
-        'account',
-        'check',
-        {
-          channel_claim_id: channelClaimId,
-          channel_name: tipChannelName,
-          environment: stripeEnvironment,
-        },
-        'post'
-      )
-        .then((accountCheckResponse) => {
-          if (accountCheckResponse === true && canReceiveFiatTip !== true) {
-            setCanReceiveFiatTip(true);
-          }
-        })
-        .catch(function (error) {
-          // console.log(error);
-        });
-    }
-  }, [stripeEnvironment]);
+    Lbryio.call(
+      'account',
+      'check',
+      {
+        channel_claim_id: channelClaimId,
+        channel_name: tipChannelName,
+        environment: stripeEnvironment,
+      },
+      'post'
+    )
+      .then((accountCheckResponse) => {
+        if (accountCheckResponse === true && canReceiveFiatTip !== true) {
+          setCanReceiveFiatTip(true);
+        }
+      })
+      .catch(function (error) {
+        // console.log(error);
+      });
+  }, []);
 
   React.useEffect(() => {
     // setHasSavedCard(false);
@@ -212,7 +214,7 @@ function WalletTipAmountSelector(props: Props) {
           <div className="help">
             <span className="help--spendable">
               <Button navigate={`/$/${PAGES.SETTINGS_STRIPE_CARD}`} label={__('Add a Card ')} button="link" /> To{' '}
-              {__('Tip Creators')}
+              {__(' Tip Creators')}
             </span>
           </div>
         </>
@@ -280,7 +282,7 @@ function WalletTipAmountSelector(props: Props) {
           <div className="help">
             <span className="help--spendable">
               <Button navigate={`/$/${PAGES.SETTINGS_STRIPE_CARD}`} label={__('Add a Card ')} button="link" /> To{' '}
-              {__('Tip Creators')}
+              {__(' Tip Creators')}
             </span>
           </div>
         </>
diff --git a/ui/constants/stripe.js b/ui/constants/stripe.js
deleted file mode 100644
index 95f355892..000000000
--- a/ui/constants/stripe.js
+++ /dev/null
@@ -1,2 +0,0 @@
-export const TEST = 'test';
-export const LIVE = 'live';
diff --git a/ui/effects/use-lazy-loading.js b/ui/effects/use-lazy-loading.js
index 18ac92be5..8e9ed8555 100644
--- a/ui/effects/use-lazy-loading.js
+++ b/ui/effects/use-lazy-loading.js
@@ -5,13 +5,11 @@ import React, { useEffect } from 'react';
 /**
  * Helper React hook for lazy loading images
  * @param elementRef - A React useRef instance to the element to lazy load.
- * @param backgroundFallback
  * @param yOffsetPx - Number of pixels from the viewport to start loading.
  * @param {Array<>} [deps=[]] - The dependencies this lazy-load is reliant on.
  */
 export default function useLazyLoading(
   elementRef: { current: ?ElementRef<any> },
-  backgroundFallback: string = '',
   yOffsetPx: number = 500,
   deps: Array<any> = []
 ) {
@@ -44,19 +42,11 @@ export default function useLazyLoading(
               // $FlowFixMe
               target.src = target.dataset.src;
               setSrcLoaded(true);
-              // No fallback handling here (clients have access to 'onerror' on the image ref).
               return;
             }
 
             // useful for lazy loading background images on divs
             if (target.dataset.backgroundImage) {
-              if (backgroundFallback) {
-                const tmpImage = new Image();
-                tmpImage.onerror = () => {
-                  target.style.backgroundImage = `url(${backgroundFallback})`;
-                };
-                tmpImage.src = target.dataset.backgroundImage;
-              }
               target.style.backgroundImage = `url(${target.dataset.backgroundImage})`;
             }
           }
diff --git a/ui/modal/modalRemoveCard/view.jsx b/ui/modal/modalRemoveCard/view.jsx
index 1cc984f26..b4047dab1 100644
--- a/ui/modal/modalRemoveCard/view.jsx
+++ b/ui/modal/modalRemoveCard/view.jsx
@@ -5,19 +5,43 @@ import Card from 'component/common/card';
 import Button from 'component/button';
 import * as ICONS from 'constants/icons';
 import { Lbryio } from 'lbryinc';
-import { getStripeEnvironment } from 'util/stripe';
-let stripeEnvironment = getStripeEnvironment();
+import { STRIPE_PUBLIC_KEY } from 'config';
+
+let stripeEnvironment = 'test';
+// if the key contains pk_live it's a live key
+// update the environment for the calls to the backend to indicate which environment to hit
+if (STRIPE_PUBLIC_KEY.indexOf('pk_live') > -1) {
+  stripeEnvironment = 'live';
+}
 
 type Props = {
   closeModal: () => void,
+  abandonTxo: (Txo, () => void) => void,
+  abandonClaim: (string, number, ?() => void) => void,
+  tx: Txo,
+  claim: GenericClaim,
+  cb: () => void,
+  doResolveUri: (string) => void,
+  uri: string,
   paymentMethodId: string,
-  setAsConfirmingCard: () => void, // ?
+  setAsConfirmingCard: () => void,
 };
 
-export default function ModalRemoveCard(props: Props) {
-  const { closeModal, paymentMethodId } = props;
+export default function ModalRevokeClaim(props: Props) {
+  var that = this;
+  console.log(that);
+
+  console.log(props);
+
+  const { closeModal, uri, paymentMethodId, setAsConfirmingCard } = props;
+
+  console.log(uri);
+
+  console.log(setAsConfirmingCard);
 
   function removeCard() {
+    console.log(paymentMethodId);
+
     Lbryio.call(
       'customer',
       'detach',
@@ -27,9 +51,11 @@ export default function ModalRemoveCard(props: Props) {
       },
       'post'
     ).then((removeCardResponse) => {
+      console.log(removeCardResponse);
+
       // TODO: add toast here
       // closeModal();
-      // Is there a better way to handle this? Why reload?
+
       window.location.reload();
     });
   }
@@ -37,14 +63,15 @@ export default function ModalRemoveCard(props: Props) {
   return (
     <Modal ariaHideApp={false} isOpen contentLabel={'hello'} type="card" onAborted={closeModal}>
       <Card
-        title={__('Confirm Remove Card')}
+        title={'Confirm Remove Card'}
+        // body={getMsgBody(type, isSupport, name)}
         actions={
           <div className="section__actions">
             <Button
               className="stripe__confirm-remove-card"
               button="secondary"
               icon={ICONS.DELETE}
-              label={__('Remove Card')}
+              label={'Remove Card'}
               onClick={removeCard}
             />
             <Button button="link" label={__('Cancel')} onClick={closeModal} />
diff --git a/ui/page/file/view.jsx b/ui/page/file/view.jsx
index 20f39e38b..987b6bcac 100644
--- a/ui/page/file/view.jsx
+++ b/ui/page/file/view.jsx
@@ -12,6 +12,7 @@ import FileRenderDownload from 'component/fileRenderDownload';
 import RecommendedContent from 'component/recommendedContent';
 import CollectionContent from 'component/collectionContentSidebar';
 import CommentsList from 'component/commentsList';
+import { Redirect } from 'react-router';
 import Button from 'component/button';
 import I18nMessage from 'component/i18nMessage';
 import Empty from 'component/common/empty';
@@ -144,6 +145,10 @@ function FilePage(props: Props) {
     );
   }
 
+  if (!claimIsMine && isLivestream) {
+    return <Redirect to={`/$/${PAGES.LIVESTREAM}`} />;
+  }
+
   if (obscureNsfw && isMature) {
     return (
       <Page className="file-page" filePage isMarkdown={isMarkdown}>
diff --git a/ui/page/settings/view.jsx b/ui/page/settings/view.jsx
index 60d29d385..3f201373a 100644
--- a/ui/page/settings/view.jsx
+++ b/ui/page/settings/view.jsx
@@ -20,7 +20,6 @@ import { SIMPLE_SITE } from 'config';
 import homepages from 'homepages';
 import { Lbryio } from 'lbryinc';
 import Yrbl from 'component/yrbl';
-import { getStripeEnvironment } from 'util/stripe';
 
 type Price = {
   currency: string,
@@ -452,7 +451,7 @@ class SettingsPage extends React.PureComponent<Props, State> {
             {/* @endif */}
 
             {/* @if TARGET='web' */}
-            {user && getStripeEnvironment() && (
+            {user && (
               <Card
                 title={__('Bank Accounts')}
                 subtitle={__('Connect a bank account to receive tips and compensation in your local currency')}
@@ -471,7 +470,7 @@ class SettingsPage extends React.PureComponent<Props, State> {
             {/* @endif */}
 
             {/* @if TARGET='web' */}
-            {isAuthenticated && getStripeEnvironment() && (
+            {isAuthenticated && (
               <Card
                 title={__('Payment Methods')}
                 subtitle={__('Add a credit card to tip creators in their local currency')}
diff --git a/ui/page/settingsStripeAccount/view.jsx b/ui/page/settingsStripeAccount/view.jsx
index f91caaf57..9c115cf6c 100644
--- a/ui/page/settingsStripeAccount/view.jsx
+++ b/ui/page/settingsStripeAccount/view.jsx
@@ -7,12 +7,17 @@ import Card from 'component/common/card';
 import Page from 'component/page';
 
 import { Lbryio } from 'lbryinc';
-import { URL, WEBPACK_WEB_PORT } from 'config';
-import { getStripeEnvironment } from 'util/stripe';
+import { URL, WEBPACK_WEB_PORT, STRIPE_PUBLIC_KEY } from 'config';
 
 const isDev = process.env.NODE_ENV !== 'production';
 
-let stripeEnvironment = getStripeEnvironment();
+let stripeEnvironment = 'test';
+// if the key contains pk_live it's a live key
+// update the environment for the calls to the backend to indicate which environment to hit
+if (STRIPE_PUBLIC_KEY.indexOf('pk_live') > -1) {
+  stripeEnvironment = 'live';
+}
+
 let successStripeRedirectUrl, failureStripeRedirectUrl;
 let successEndpoint = '/$/settings/tip_account';
 let failureEndpoint = '/$/settings/tip_account';
@@ -41,7 +46,7 @@ type State = {
   unpaidBalance: number,
   pageTitle: string,
   stillRequiringVerification: boolean,
-  accountTransactions: any,
+  accountTransactions: any
 };
 
 class StripeAccountConnection extends React.Component<Props, State> {
@@ -139,10 +144,7 @@ class StripeAccountConnection extends React.Component<Props, State> {
             stillRequiringVerification: false,
           };
 
-          if (
-            (eventuallyDueInformation && eventuallyDueInformation.length) ||
-            (currentlyDueInformation && currentlyDueInformation.length)
-          ) {
+          if ((eventuallyDueInformation && eventuallyDueInformation.length) || (currentlyDueInformation && currentlyDueInformation.length)) {
             objectToUpdateState.stillRequiringVerification = true;
             getAndSetAccountLink(false);
           }
@@ -231,17 +233,8 @@ class StripeAccountConnection extends React.Component<Props, State> {
                   <div>
                     <div>
                       <h3>{__('Congratulations! Your account has been connected with Odysee.')}</h3>
-                      {stillRequiringVerification && (
-                        <>
-                          <h3 style={{ marginTop: '10px' }}>
-                            Although your account is connected it still requires verification to begin receiving tips.
-                          </h3>
-                          <h3 style={{ marginTop: '10px' }}>
-                            Please use the button below to complete your verification process and enable tipping for
-                            your account.
-                          </h3>
-                        </>
-                      )}
+                      {stillRequiringVerification && <><h3 style={{marginTop: '10px'}}>Although your account is connected it still requires verification to begin receiving tips.</h3>
+                      <h3 style={{marginTop: '10px'}}>Please use the button below to complete your verification process and enable tipping for your account.</h3></> }
                     </div>
                   </div>
                 </div>
@@ -261,7 +254,9 @@ class StripeAccountConnection extends React.Component<Props, State> {
                       <br />
                       <div>
                         <h3>
-                          {__('Connect your bank account to be able to cash your pending balance out to your account.')}
+                          {__(
+                            'Connect your bank account to be able to cash your pending balance out to your account.'
+                          )}
                         </h3>
                       </div>
                       <div className="section__actions">
@@ -276,23 +271,19 @@ class StripeAccountConnection extends React.Component<Props, State> {
             </div>
           }
           actions={
-            <>
-              {stillRequiringVerification && (
-                <Button
-                  button="primary"
-                  label={__('Complete Verification')}
-                  icon={ICONS.SETTINGS}
-                  navigate={stripeConnectionUrl}
-                  className="stripe__complete-verification-button"
-                />
-              )}
-              <Button
-                button="secondary"
-                label={__('View Transactions')}
-                icon={ICONS.SETTINGS}
-                navigate={`/$/${PAGES.WALLET}?tab=fiat-payment-history`}
-              />
-            </>
+            <>{ stillRequiringVerification && <Button
+              button="primary"
+              label={__('Complete Verification')}
+              icon={ICONS.SETTINGS}
+              navigate={stripeConnectionUrl}
+              className="stripe__complete-verification-button"
+            /> }
+            <Button
+              button="secondary"
+              label={__('View Transactions')}
+              icon={ICONS.SETTINGS}
+              navigate={`/$/${PAGES.WALLET}?tab=fiat-payment-history`}
+            /></>
           }
         />
         <br />
diff --git a/ui/page/settingsStripeCard/view.jsx b/ui/page/settingsStripeCard/view.jsx
index 7c1903ab9..d3bef38ef 100644
--- a/ui/page/settingsStripeCard/view.jsx
+++ b/ui/page/settingsStripeCard/view.jsx
@@ -5,14 +5,19 @@ import React from 'react';
 import Page from 'component/page';
 import Card from 'component/common/card';
 import { Lbryio } from 'lbryinc';
+import { STRIPE_PUBLIC_KEY } from 'config';
 import Plastic from 'react-plastic';
 import Button from 'component/button';
 import * as ICONS from 'constants/icons';
 import * as MODALS from 'constants/modal_types';
 import * as PAGES from 'constants/pages';
-import { STRIPE_PUBLIC_KEY } from 'config';
-import { getStripeEnvironment } from 'util/stripe';
-let stripeEnvironment = getStripeEnvironment();
+
+let stripeEnvironment = 'test';
+// if the key contains pk_live it's a live key
+// update the environment for the calls to the backend to indicate which environment to hit
+if (STRIPE_PUBLIC_KEY.indexOf('pk_live') > -1) {
+  stripeEnvironment = 'live';
+}
 
 const APIS_DOWN_ERROR_RESPONSE = __('There was an error from the server, please try again later');
 const CARD_SETUP_ERROR_RESPONSE = __('There was an error getting your card setup, please try again later');
@@ -74,116 +79,114 @@ class SettingsStripeCard extends React.Component<Props, State> {
     // TODO: fix this, should be a cleaner way
     setTimeout(function () {
       // check if customer has card setup already
-      if (stripeEnvironment) {
-        Lbryio.call(
-          'customer',
-          'status',
-          {
-            environment: stripeEnvironment,
-          },
-          'post'
-        )
-          .then((customerStatusResponse) => {
-            // user has a card saved if their defaultPaymentMethod has an id
-            const defaultPaymentMethod = customerStatusResponse.Customer.invoice_settings.default_payment_method;
-            let userHasAlreadySetupPayment = Boolean(defaultPaymentMethod && defaultPaymentMethod.id);
+      Lbryio.call(
+        'customer',
+        'status',
+        {
+          environment: stripeEnvironment,
+        },
+        'post'
+      )
+        .then((customerStatusResponse) => {
+          // user has a card saved if their defaultPaymentMethod has an id
+          const defaultPaymentMethod = customerStatusResponse.Customer.invoice_settings.default_payment_method;
+          let userHasAlreadySetupPayment = Boolean(defaultPaymentMethod && defaultPaymentMethod.id);
 
-            // show different frontend if user already has card
-            if (userHasAlreadySetupPayment) {
-              let card = customerStatusResponse.PaymentMethods[0].card;
+          // show different frontend if user already has card
+          if (userHasAlreadySetupPayment) {
+            let card = customerStatusResponse.PaymentMethods[0].card;
 
-              let customer = customerStatusResponse.Customer;
+            let customer = customerStatusResponse.Customer;
 
-              let topOfDisplay = customer.email.split('@')[0];
-              let bottomOfDisplay = '@' + customer.email.split('@')[1];
+            let topOfDisplay = customer.email.split('@')[0];
+            let bottomOfDisplay = '@' + customer.email.split('@')[1];
 
-              let cardDetails = {
-                brand: card.brand,
-                expiryYear: card.exp_year,
-                expiryMonth: card.exp_month,
-                lastFour: card.last4,
-                topOfDisplay: topOfDisplay,
-                bottomOfDisplay: bottomOfDisplay,
-              };
+            let cardDetails = {
+              brand: card.brand,
+              expiryYear: card.exp_year,
+              expiryMonth: card.exp_month,
+              lastFour: card.last4,
+              topOfDisplay: topOfDisplay,
+              bottomOfDisplay: bottomOfDisplay,
+            };
 
-              that.setState({
-                currentFlowStage: 'cardConfirmed',
-                pageTitle: 'Tip History',
-                userCardDetails: cardDetails,
-                paymentMethodId: customerStatusResponse.PaymentMethods[0].id,
-              });
+            that.setState({
+              currentFlowStage: 'cardConfirmed',
+              pageTitle: 'Tip History',
+              userCardDetails: cardDetails,
+              paymentMethodId: customerStatusResponse.PaymentMethods[0].id,
+            });
 
-              // otherwise, prompt them to save a card
-            } else {
-              that.setState({
-                currentFlowStage: 'confirmingCard',
-              });
+            // otherwise, prompt them to save a card
+          } else {
+            that.setState({
+              currentFlowStage: 'confirmingCard',
+            });
 
-              // get a payment method secret for frontend
-              Lbryio.call(
-                'customer',
-                'setup',
-                {
-                  environment: stripeEnvironment,
-                },
-                'post'
-              ).then((customerSetupResponse) => {
-                clientSecret = customerSetupResponse.client_secret;
-
-                // instantiate stripe elements
-                setupStripe();
-              });
-            }
-
-            // get customer transactions
+            // get a payment method secret for frontend
             Lbryio.call(
               'customer',
-              'list',
+              'setup',
               {
                 environment: stripeEnvironment,
               },
               'post'
-            ).then((customerTransactionsResponse) => {
-              that.setState({
-                customerTransactions: customerTransactionsResponse,
-              });
+            ).then((customerSetupResponse) => {
+              clientSecret = customerSetupResponse.client_secret;
+
+              // instantiate stripe elements
+              setupStripe();
             });
-            // if the status call fails, either an actual error or need to run setup first
-          })
-          .catch(function (error) {
-            // errorString passed from the API (with a 403 error)
-            const errorString = 'user as customer is not setup yet';
+          }
 
-            // if it's beamer's error indicating the account is not linked yet
-            if (error.message && error.message.indexOf(errorString) > -1) {
-              // send them to save a card
-              that.setState({
-                currentFlowStage: 'confirmingCard',
-              });
-
-              // get a payment method secret for frontend
-              Lbryio.call(
-                'customer',
-                'setup',
-                {
-                  environment: stripeEnvironment,
-                },
-                'post'
-              ).then((customerSetupResponse) => {
-                clientSecret = customerSetupResponse.client_secret;
-
-                // instantiate stripe elements
-                setupStripe();
-              });
-              // 500 error from the backend being down
-            } else if (error === 'internal_apis_down') {
-              doToast({ message: APIS_DOWN_ERROR_RESPONSE, isError: true });
-            } else {
-              // probably an error from stripe
-              doToast({ message: CARD_SETUP_ERROR_RESPONSE, isError: true });
-            }
+          // get customer transactions
+          Lbryio.call(
+            'customer',
+            'list',
+            {
+              environment: stripeEnvironment,
+            },
+            'post'
+          ).then((customerTransactionsResponse) => {
+            that.setState({
+              customerTransactions: customerTransactionsResponse,
+            });
           });
-      }
+          // if the status call fails, either an actual error or need to run setup first
+        })
+        .catch(function (error) {
+          // errorString passed from the API (with a 403 error)
+          const errorString = 'user as customer is not setup yet';
+
+          // if it's beamer's error indicating the account is not linked yet
+          if (error.message && error.message.indexOf(errorString) > -1) {
+            // send them to save a card
+            that.setState({
+              currentFlowStage: 'confirmingCard',
+            });
+
+            // get a payment method secret for frontend
+            Lbryio.call(
+              'customer',
+              'setup',
+              {
+                environment: stripeEnvironment,
+              },
+              'post'
+            ).then((customerSetupResponse) => {
+              clientSecret = customerSetupResponse.client_secret;
+
+              // instantiate stripe elements
+              setupStripe();
+            });
+            // 500 error from the backend being down
+          } else if (error === 'internal_apis_down') {
+            doToast({ message: APIS_DOWN_ERROR_RESPONSE, isError: true });
+          } else {
+            // probably an error from stripe
+            doToast({ message: CARD_SETUP_ERROR_RESPONSE, isError: true });
+          }
+        });
     }, 250);
 
     function setupStripe() {
diff --git a/ui/page/show/view.jsx b/ui/page/show/view.jsx
index 140468b5e..10fd38710 100644
--- a/ui/page/show/view.jsx
+++ b/ui/page/show/view.jsx
@@ -1,5 +1,5 @@
 // @flow
-import { DOMAIN, ENABLE_NO_SOURCE_CLAIMS } from 'config';
+import { DOMAIN } from 'config';
 import * as PAGES from 'constants/pages';
 import React, { useEffect } from 'react';
 import { lazyImport } from 'util/lazyImport';
@@ -199,7 +199,7 @@ function ShowPage(props: Props) {
           />
         </Page>
       );
-    } else if (isLivestream && ENABLE_NO_SOURCE_CLAIMS) {
+    } else if (isLivestream) {
       innerContent = <LivestreamPage uri={uri} />;
     } else {
       innerContent = <FilePage uri={uri} location={location} />;
diff --git a/ui/page/wallet/view.jsx b/ui/page/wallet/view.jsx
index d056e74d9..38332f361 100644
--- a/ui/page/wallet/view.jsx
+++ b/ui/page/wallet/view.jsx
@@ -12,8 +12,8 @@ import * as PAGES from 'constants/pages';
 import Spinner from 'component/spinner';
 import YrblWalletEmpty from 'component/yrblWalletEmpty';
 import { Lbryio } from 'lbryinc';
+import { STRIPE_PUBLIC_KEY } from 'config';
 import { Tabs, TabList, Tab, TabPanels, TabPanel } from 'component/common/tabs';
-import { getStripeEnvironment } from 'util/stripe';
 
 const TAB_QUERY = 'tab';
 
@@ -23,7 +23,12 @@ const TABS = {
   PAYMENT_HISTORY: 'fiat-payment-history',
 };
 
-let stripeEnvironment = getStripeEnvironment();
+let stripeEnvironment = 'test';
+// if the key contains pk_live it's a live key
+// update the environment for the calls to the backend to indicate which environment to hit
+if (STRIPE_PUBLIC_KEY.indexOf('pk_live') > -1) {
+  stripeEnvironment = 'live';
+}
 
 type Props = {
   history: { action: string, push: (string) => void, replace: (string) => void },
@@ -112,11 +117,8 @@ const WalletPage = (props: Props) => {
 
   // calculate account transactions section
   React.useEffect(() => {
-    (async function () {
+    (async function() {
       try {
-        if (!stripeEnvironment) {
-          return;
-        }
         const response = await getAccountStatus();
 
         setAccountStatusResponse(response);
@@ -129,27 +131,23 @@ const WalletPage = (props: Props) => {
         console.log(err);
       }
     })();
-  }, [stripeEnvironment]);
+  }, []);
 
   // populate customer payment data
   React.useEffect(() => {
-    (async function () {
+    (async function() {
       try {
         // get card payments customer has made
-        if (!stripeEnvironment) {
-          return;
-        }
         let customerTransactionResponse = await getPaymentHistory();
-        if (customerTransactionResponse && customerTransactionResponse.length) {
-          customerTransactionResponse.reverse();
-        }
+
+        customerTransactionResponse.reverse();
 
         setCustomerTransactions(customerTransactionResponse);
       } catch (err) {
         console.log(err);
       }
     })();
-  }, [stripeEnvironment]);
+  }, []);
 
   // @endif
 
@@ -159,80 +157,77 @@ const WalletPage = (props: Props) => {
 
   return (
     <>
-      {stripeEnvironment && (
-        <Page>
-          <Tabs onChange={onTabChange} index={tabIndex}>
-            <TabList className="tabs__list--collection-edit-page">
-              <Tab>{__('LBRY Credits')}</Tab>
-              <Tab>{__('Account History')}</Tab>
-              <Tab>{__('Payment History')}</Tab>
-            </TabList>
-            <TabPanels>
-              <TabPanel>
-                <div className="section card-stack">
-                  <div className="lbc-transactions">
-                    {/* if the transactions are loading */}
-                    {loading && (
-                      <div className="main--empty">
-                        <Spinner delayed />
-                      </div>
-                    )}
-                    {/* when the transactions are finished loading */}
-                    {!loading && (
-                      <>
-                        {showIntro ? (
-                          <YrblWalletEmpty includeWalletLink />
-                        ) : (
-                          <div className="card-stack">
-                            <WalletBalance />
-                            <TxoList search={search} />
-                          </div>
-                        )}
-                      </>
-                    )}
-                  </div>
+      {/* @if TARGET='web' */}
+      <Page>
+        <Tabs onChange={onTabChange} index={tabIndex}>
+          <TabList className="tabs__list--collection-edit-page">
+            <Tab>{__('LBRY Credits')}</Tab>
+            <Tab>{__('Account History')}</Tab>
+            <Tab>{__('Payment History')}</Tab>
+          </TabList>
+          <TabPanels>
+            <TabPanel>
+              <div className="section card-stack">
+                <div className="lbc-transactions">
+                  {/* if the transactions are loading */}
+                  {loading && (
+                    <div className="main--empty">
+                      <Spinner delayed />
+                    </div>
+                  )}
+                  {/* when the transactions are finished loading */}
+                  {!loading && (
+                    <>
+                      {showIntro ? (
+                        <YrblWalletEmpty includeWalletLink />
+                      ) : (
+                        <div className="card-stack">
+                          <WalletBalance />
+                          <TxoList search={search} />
+                        </div>
+                      )}
+                    </>
+                  )}
                 </div>
-              </TabPanel>
-              <TabPanel>
-                <div className="section card-stack">
-                  <WalletFiatBalance accountDetails={accountStatusResponse} />
-                  <WalletFiatAccountHistory transactions={accountTransactionResponse} />
-                </div>
-              </TabPanel>
-              <TabPanel>
-                <div className="section card-stack">
-                  <WalletFiatPaymentBalance
-                    transactions={customerTransactions}
-                    accountDetails={accountStatusResponse}
-                  />
-                  <WalletFiatPaymentHistory transactions={customerTransactions} />
-                </div>
-              </TabPanel>
-            </TabPanels>
-          </Tabs>
-        </Page>
-      )}
-      {!stripeEnvironment && (
-        <Page>
-          {loading && (
-            <div className="main--empty">
-              <Spinner delayed />
-            </div>
-          )}
-          {!loading && (
-            <>
-              {showIntro ? (
-                <YrblWalletEmpty includeWalletLink />
-              ) : (
-                <div className="card-stack">
-                  <WalletBalance />
-                  <TxoList search={search} />
-                </div>
-              )}
-            </>
-          )}
-        </Page>
-      )}
+              </div>
+            </TabPanel>
+            <TabPanel>
+              <div className="section card-stack">
+                <WalletFiatBalance accountDetails={accountStatusResponse} />
+                <WalletFiatAccountHistory transactions={accountTransactionResponse} />
+              </div>
+            </TabPanel>
+            <TabPanel>
+              <div className="section card-stack">
+                <WalletFiatPaymentBalance transactions={customerTransactions} accountDetails={accountStatusResponse} />
+                <WalletFiatPaymentHistory transactions={customerTransactions} />
+              </div>
+            </TabPanel>
+          </TabPanels>
+        </Tabs>
+      </Page>
+      {/* @endif */}
+      {/* @if TARGET='app' */}
+      <Page>
+        {loading && (
+          <div className="main--empty">
+            <Spinner delayed />
+          </div>
+        )}
+        {!loading && (
+          <>
+            {showIntro ? (
+              <YrblWalletEmpty includeWalletLink />
+            ) : (
+              <div className="card-stack">
+                <WalletBalance />
+                <TxoList search={search} />
+              </div>
+            )}
+          </>
+        )}
+      </Page>
+      {/* @endif */}
     </>
   );
 };
diff --git a/ui/util/stripe.js b/ui/util/stripe.js
deleted file mode 100644
index 09a72308b..000000000
--- a/ui/util/stripe.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// @flow
-import { STRIPE_PUBLIC_KEY } from 'config';
-import * as STRIPE_CONSTS from 'constants/stripe';
-export function getStripeEnvironment() {
-  if (STRIPE_PUBLIC_KEY) {
-    if (STRIPE_PUBLIC_KEY.indexOf('pk_live') > -1) {
-      return STRIPE_CONSTS.LIVE;
-    } else {
-      return STRIPE_CONSTS.TEST;
-    }
-  }
-  return null;
-}