From 537ca0fdf5259610ccf35ab742d25b62ed8b4c81 Mon Sep 17 00:00:00 2001
From: jessop <jessop@lbry.com>
Date: Fri, 17 Apr 2020 12:06:49 -0400
Subject: [PATCH 1/8] modify status hiding in txolist

---
 ui/component/txoList/view.jsx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/ui/component/txoList/view.jsx b/ui/component/txoList/view.jsx
index 2b637c1c3..61fbcc1a0 100644
--- a/ui/component/txoList/view.jsx
+++ b/ui/component/txoList/view.jsx
@@ -44,9 +44,7 @@ function TxoList(props: Props) {
   };
 
   const hideStatus =
-    type === TXO.SENT ||
-    (currentUrlParams.type === TXO.RECEIVED &&
-      (currentUrlParams.subtype === TXO.PAYMENT || currentUrlParams.subtype === TXO.PURCHASE));
+    type === TXO.SENT || (currentUrlParams.type === TXO.RECEIVED && currentUrlParams.subtype !== TXO.TIP);
 
   const params = {};
   if (currentUrlParams.type) {
-- 
2.45.3


From f77439708eb29eed7140dbc6e15b24e1e98fa97d Mon Sep 17 00:00:00 2001
From: SleepingFox <seanloganking@gmail.com>
Date: Thu, 2 Apr 2020 19:09:59 -0400
Subject: [PATCH 2/8] hidden label parent of button content

visually on the page, label needs to be centered inside of largestLabel
---
 ui/component/button/view.jsx          | 21 ++++++++++++++++-----
 ui/component/subscribeButton/view.jsx |  1 +
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/ui/component/button/view.jsx b/ui/component/button/view.jsx
index e99323388..d621f446d 100644
--- a/ui/component/button/view.jsx
+++ b/ui/component/button/view.jsx
@@ -14,6 +14,7 @@ type Props = {
   href: ?string,
   title: ?string,
   label: ?string,
+  largestLabel: ?string,
   icon: ?string,
   iconRight: ?string,
   disabled: ?boolean,
@@ -47,6 +48,7 @@ const Button = forwardRef<any, {}>((props: Props, ref: any) => {
     href,
     title,
     label,
+    largestLabel,
     icon,
     // This should rarely be used. Regular buttons should just use `icon`
     // `iconRight` is used for the header (home) button with the LBRY icon and external links that are displayed inline
@@ -90,8 +92,17 @@ const Button = forwardRef<any, {}>((props: Props, ref: any) => {
 
   const content = (
     <span className="button__content">
-      {icon && <Icon icon={icon} iconColor={iconColor} size={size} />}
-      {label && <span className="button__label">{label}</span>}
+      {icon && <Icon icon={icon} iconColor={iconColor} size={iconSize} />}
+      {
+        <p style={{ visibility: 'hidden' }}>
+          {largestLabel}
+          {label && (
+            <span className="button__label" style={{ visibility: 'visible' }}>
+              {label}
+            </span>
+          )}
+        </p>
+      }
       {children && children}
       {iconRight && <Icon icon={iconRight} iconColor={iconColor} size={size} />}
     </span>
@@ -127,7 +138,7 @@ const Button = forwardRef<any, {}>((props: Props, ref: any) => {
     return (
       <NavLink
         exact
-        onClick={e => {
+        onClick={(e) => {
           e.stopPropagation();
         }}
         to={`/$/${PAGES.AUTH}?redirect=${pathname}`}
@@ -147,7 +158,7 @@ const Button = forwardRef<any, {}>((props: Props, ref: any) => {
       to={path}
       title={title}
       disabled={disabled}
-      onClick={e => {
+      onClick={(e) => {
         e.stopPropagation();
         if (onClick) {
           onClick();
@@ -165,7 +176,7 @@ const Button = forwardRef<any, {}>((props: Props, ref: any) => {
       title={title}
       aria-label={description || label || title}
       className={combinedClassName}
-      onClick={e => {
+      onClick={(e) => {
         if (onClick) {
           e.stopPropagation();
           onClick(e);
diff --git a/ui/component/subscribeButton/view.jsx b/ui/component/subscribeButton/view.jsx
index 57ecda021..331c634a9 100644
--- a/ui/component/subscribeButton/view.jsx
+++ b/ui/component/subscribeButton/view.jsx
@@ -50,6 +50,7 @@ export default function SubscribeButton(props: Props) {
     <Button
       ref={buttonRef}
       iconColor="red"
+      largestLabel="TEST LABEL"
       icon={unfollowOverride ? ICONS.UNSUBSCRIBE : ICONS.SUBSCRIBE}
       button={'alt'}
       requiresAuth={IS_WEB}
-- 
2.45.3


From a7990e5babed8be93116d0968aa881caeb93b92a Mon Sep 17 00:00:00 2001
From: SleepingFox <seanloganking@gmail.com>
Date: Fri, 3 Apr 2020 19:29:39 -0400
Subject: [PATCH 3/8] Messy PoC

state jittering still seems to be an issue on rare occasion even though the button hitbox is no longer changing size.
---
 ui/component/button/view.jsx          | 36 +++++++++++++++++++--------
 ui/component/subscribeButton/view.jsx | 10 +++++++-
 2 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/ui/component/button/view.jsx b/ui/component/button/view.jsx
index d621f446d..a114c755d 100644
--- a/ui/component/button/view.jsx
+++ b/ui/component/button/view.jsx
@@ -91,17 +91,33 @@ const Button = forwardRef<any, {}>((props: Props, ref: any) => {
   const size = iconSize || (!label && !children) ? 18 : undefined; // Fall back to default
 
   const content = (
-    <span className="button__content">
-      {icon && <Icon icon={icon} iconColor={iconColor} size={iconSize} />}
+    <div className="button__content" style={{ border: `1px solid white` }}>
+      {/* style={{ border: `1px solid white` }} */}
+      <div style={{ border: `1px solid green` }}>
+        {icon && <Icon icon={icon} iconColor={iconColor} size={iconSize} />}
+      </div>
       {
-        <p style={{ visibility: 'hidden' }}>
-          {largestLabel}
-          {label && (
-            <span className="button__label" style={{ visibility: 'visible' }}>
-              {label}
-            </span>
-          )}
-        </p>
+        <div style={{ border: `1px solid blue` }}>
+          <span style={{ visibility: 'hidden' }}>
+            {largestLabel || label}
+            {label && (
+              //   <div style={{ position: 'absolute', left: 0, right: 0, bottom: 0, top: 0, margin: 'auto' }}>
+              <div
+                style={{
+                  position: 'relative',
+                  left: '50%',
+                  right: '50%',
+                  transform: `translate(-50%, -50%)`,
+                  border: `1px solid red`,
+                }}
+              >
+                <span className="button__label" style={{ visibility: 'visible' }}>
+                  {label}
+                </span>
+              </div>
+            )}
+          </span>
+        </div>
       }
       {children && children}
       {iconRight && <Icon icon={iconRight} iconColor={iconColor} size={size} />}
diff --git a/ui/component/subscribeButton/view.jsx b/ui/component/subscribeButton/view.jsx
index 331c634a9..fc6cf60df 100644
--- a/ui/component/subscribeButton/view.jsx
+++ b/ui/component/subscribeButton/view.jsx
@@ -46,11 +46,19 @@ export default function SubscribeButton(props: Props) {
   const unfollowOverride = isSubscribed && isHovering && __('Unfollow');
   const label = isMobile && shrinkOnMobile ? '' : unfollowOverride || subscriptionLabel;
 
+  let longestStr = __('Following');
+
+  if (__('Following').length < __('Unfollow').length) {
+    longestStr = __('Unfollow');
+  }
+
+  longestStr = longestStr + '-';
+
   return permanentUrl ? (
     <Button
       ref={buttonRef}
       iconColor="red"
-      largestLabel="TEST LABEL"
+      largestLabel={longestStr}
       icon={unfollowOverride ? ICONS.UNSUBSCRIBE : ICONS.SUBSCRIBE}
       button={'alt'}
       requiresAuth={IS_WEB}
-- 
2.45.3


From a63d850744f3b0fe9c20be5516955a18746b851b Mon Sep 17 00:00:00 2001
From: SleepingFox <seanloganking@gmail.com>
Date: Fri, 10 Apr 2020 20:24:23 -0400
Subject: [PATCH 4/8] Buttons no longer tall

---
 ui/component/button/view.jsx | 43 ++++++++++++++++++++++--------------
 1 file changed, 26 insertions(+), 17 deletions(-)

diff --git a/ui/component/button/view.jsx b/ui/component/button/view.jsx
index a114c755d..3165beaf8 100644
--- a/ui/component/button/view.jsx
+++ b/ui/component/button/view.jsx
@@ -91,34 +91,43 @@ const Button = forwardRef<any, {}>((props: Props, ref: any) => {
   const size = iconSize || (!label && !children) ? 18 : undefined; // Fall back to default
 
   const content = (
-    <div className="button__content" style={{ border: `1px solid white` }}>
-      {/* style={{ border: `1px solid white` }} */}
-      <div style={{ border: `1px solid green` }}>
-        {icon && <Icon icon={icon} iconColor={iconColor} size={iconSize} />}
-      </div>
-      {
-        <div style={{ border: `1px solid blue` }}>
-          <span style={{ visibility: 'hidden' }}>
-            {largestLabel || label}
-            {label && (
-              //   <div style={{ position: 'absolute', left: 0, right: 0, bottom: 0, top: 0, margin: 'auto' }}>
+    <span className="button__content" style={{ border: `1px solid green` }}>
+      {icon && <Icon icon={icon} iconColor={iconColor} size={size} />}
+
+      {label && (
+        <div style={{ position: 'relative', border: `1px solid red`, padding: 0, margin: 0, float: 'left' }}>
+          <div
+            style={{
+              position: 'relative',
+              left: '50%',
+              top: '50%',
+              transform: `translate(-50%, 0%)`,
+              border: `1px solid white`,
+              padding: 0,
+              margin: 0,
+            }}
+          >
+            <span style={{ visibility: 'hidden' }}>
+              {largestLabel || label}
               <div
                 style={{
-                  position: 'relative',
+                  position: 'absolute',
                   left: '50%',
-                  right: '50%',
+                  top: '50%',
                   transform: `translate(-50%, -50%)`,
-                  border: `1px solid red`,
+                  visibility: 'visible',
+                  border: `1px solid blue`,
                 }}
               >
                 <span className="button__label" style={{ visibility: 'visible' }}>
                   {label}
                 </span>
               </div>
-            )}
-          </span>
+            </span>
+          </div>
         </div>
-      }
+      )}
+
       {children && children}
       {iconRight && <Icon icon={iconRight} iconColor={iconColor} size={size} />}
     </span>
-- 
2.45.3


From 25fa777dd693d007983cce76f75efbc278013c7b Mon Sep 17 00:00:00 2001
From: SleepingFox <seanloganking@gmail.com>
Date: Fri, 10 Apr 2020 20:41:58 -0400
Subject: [PATCH 5/8] remove unused lines

---
 ui/component/button/view.jsx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/ui/component/button/view.jsx b/ui/component/button/view.jsx
index 3165beaf8..96fa900fe 100644
--- a/ui/component/button/view.jsx
+++ b/ui/component/button/view.jsx
@@ -95,7 +95,7 @@ const Button = forwardRef<any, {}>((props: Props, ref: any) => {
       {icon && <Icon icon={icon} iconColor={iconColor} size={size} />}
 
       {label && (
-        <div style={{ position: 'relative', border: `1px solid red`, padding: 0, margin: 0, float: 'left' }}>
+        <div style={{ position: 'relative', border: `1px solid red` }}>
           <div
             style={{
               position: 'relative',
@@ -103,8 +103,6 @@ const Button = forwardRef<any, {}>((props: Props, ref: any) => {
               top: '50%',
               transform: `translate(-50%, 0%)`,
               border: `1px solid white`,
-              padding: 0,
-              margin: 0,
             }}
           >
             <span style={{ visibility: 'hidden' }}>
-- 
2.45.3


From 6cc301dd35f2bf9ab2ace7c94277773edefdd047 Mon Sep 17 00:00:00 2001
From: SleepingFox <seanloganking@gmail.com>
Date: Fri, 10 Apr 2020 20:46:03 -0400
Subject: [PATCH 6/8] remove visible borders

---
 ui/component/button/view.jsx | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/ui/component/button/view.jsx b/ui/component/button/view.jsx
index 96fa900fe..1357bfdab 100644
--- a/ui/component/button/view.jsx
+++ b/ui/component/button/view.jsx
@@ -91,18 +91,17 @@ const Button = forwardRef<any, {}>((props: Props, ref: any) => {
   const size = iconSize || (!label && !children) ? 18 : undefined; // Fall back to default
 
   const content = (
-    <span className="button__content" style={{ border: `1px solid green` }}>
-      {icon && <Icon icon={icon} iconColor={iconColor} size={size} />}
+    <span className="button__content">
+      {icon && <Icon icon={icon} iconColor={iconColor} size={iconSize} />}
 
       {label && (
-        <div style={{ position: 'relative', border: `1px solid red` }}>
+        <div style={{ position: 'relative' }}>
           <div
             style={{
               position: 'relative',
               left: '50%',
               top: '50%',
               transform: `translate(-50%, 0%)`,
-              border: `1px solid white`,
             }}
           >
             <span style={{ visibility: 'hidden' }}>
@@ -113,8 +112,6 @@ const Button = forwardRef<any, {}>((props: Props, ref: any) => {
                   left: '50%',
                   top: '50%',
                   transform: `translate(-50%, -50%)`,
-                  visibility: 'visible',
-                  border: `1px solid blue`,
                 }}
               >
                 <span className="button__label" style={{ visibility: 'visible' }}>
-- 
2.45.3


From eb64079b9e4cce9a80c51b79ee3d73c2446a8e43 Mon Sep 17 00:00:00 2001
From: SleepingFox <seanloganking@gmail.com>
Date: Sun, 12 Apr 2020 15:10:47 -0400
Subject: [PATCH 7/8] fixed distance between button icon and label

---
 ui/component/button/view.jsx          | 6 ++----
 ui/component/subscribeButton/view.jsx | 2 --
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/ui/component/button/view.jsx b/ui/component/button/view.jsx
index 1357bfdab..a631763ad 100644
--- a/ui/component/button/view.jsx
+++ b/ui/component/button/view.jsx
@@ -95,7 +95,7 @@ const Button = forwardRef<any, {}>((props: Props, ref: any) => {
       {icon && <Icon icon={icon} iconColor={iconColor} size={iconSize} />}
 
       {label && (
-        <div style={{ position: 'relative' }}>
+        <div className="button__label" style={{ position: 'relative' }}>
           <div
             style={{
               position: 'relative',
@@ -114,9 +114,7 @@ const Button = forwardRef<any, {}>((props: Props, ref: any) => {
                   transform: `translate(-50%, -50%)`,
                 }}
               >
-                <span className="button__label" style={{ visibility: 'visible' }}>
-                  {label}
-                </span>
+                <span style={{ visibility: 'visible' }}>{label}</span>
               </div>
             </span>
           </div>
diff --git a/ui/component/subscribeButton/view.jsx b/ui/component/subscribeButton/view.jsx
index fc6cf60df..6aa00ab7b 100644
--- a/ui/component/subscribeButton/view.jsx
+++ b/ui/component/subscribeButton/view.jsx
@@ -52,8 +52,6 @@ export default function SubscribeButton(props: Props) {
     longestStr = __('Unfollow');
   }
 
-  longestStr = longestStr + '-';
-
   return permanentUrl ? (
     <Button
       ref={buttonRef}
-- 
2.45.3


From 3d6270b133590baf7a248da62c4cf95c6f7f78ca Mon Sep 17 00:00:00 2001
From: Jeremy Kauffman <jeremy@lbry.io>
Date: Fri, 17 Apr 2020 12:21:00 -0400
Subject: [PATCH 8/8] tag homepage campaign support

---
 ui/component/claimTilesDiscover/view.jsx |  4 +-
 ui/page/home/view.jsx                    | 58 ++++++++----------------
 2 files changed, 22 insertions(+), 40 deletions(-)

diff --git a/ui/component/claimTilesDiscover/view.jsx b/ui/component/claimTilesDiscover/view.jsx
index 0ba51fe05..fa3d9eb80 100644
--- a/ui/component/claimTilesDiscover/view.jsx
+++ b/ui/component/claimTilesDiscover/view.jsx
@@ -4,6 +4,7 @@ import { createNormalizedClaimSearchKey, MATURE_TAGS } from 'lbry-redux';
 import ClaimPreviewTile from 'component/claimPreviewTile';
 
 type Props = {
+  prefixUris?: Array<string>,
   uris: Array<string>,
   doClaimSearch: ({}) => void,
   showNsfw: boolean,
@@ -39,6 +40,7 @@ function ClaimTilesDiscover(props: Props) {
     pageSize = 8,
     releaseTime,
     claimType,
+    prefixUris,
     timestamp,
   } = props;
   const [hasSearched, setHasSearched] = React.useState(false);
@@ -92,7 +94,7 @@ function ClaimTilesDiscover(props: Props) {
   }
 
   const claimSearchCacheQuery = createNormalizedClaimSearchKey(options);
-  const uris = claimSearchByQuery[claimSearchCacheQuery] || [];
+  const uris = (prefixUris || []).concat(claimSearchByQuery[claimSearchCacheQuery] || []);
   const shouldPerformSearch = !hasSearched || uris.length === 0;
   // Don't use the query from createNormalizedClaimSearchKey for the effect since that doesn't include page & release_time
   const optionsStringForEffect = JSON.stringify(options);
diff --git a/ui/page/home/view.jsx b/ui/page/home/view.jsx
index 2fe50a1f9..6b4f1021c 100644
--- a/ui/page/home/view.jsx
+++ b/ui/page/home/view.jsx
@@ -7,7 +7,6 @@ import moment from 'moment';
 import Page from 'component/page';
 import Button from 'component/button';
 import ClaimTilesDiscover from 'component/claimTilesDiscover';
-import Icon from 'component/common/icon';
 import I18nMessage from 'component/i18nMessage';
 import { parseURI } from 'lbry-redux';
 import { toCapitalCase } from 'util/string';
@@ -118,6 +117,17 @@ function HomePage(props: Props) {
     },
   });
 
+  rowData.push({
+    title: '#covidcuts',
+    link: `/$/${PAGES.DISCOVER}?t=covidcuts&${CS.ORDER_BY_KEY}=${CS.ORDER_BY_NEW}`,
+    options: {
+      tags: ['covidcuts'],
+      orderBy: ['release_time'],
+      pageSize: 3,
+      prefixUris: ['lbry://@lbry#3f/covidcuts'],
+    },
+  });
+
   if (!showPersonalizedChannels) {
     rowData.push({
       title: 'Top Channels On LBRY',
@@ -129,50 +139,20 @@ function HomePage(props: Props) {
     });
   }
 
-  rowData.push(
-    {
-      title: 'Trending Classics',
-      link: `/$/${PAGES.DISCOVER}?${CS.ORDER_BY_KEY}=${CS.ORDER_BY_TRENDING}&${CS.FRESH_KEY}=${CS.FRESH_WEEK}`,
-      options: {
-        pageSize: 4,
-        claimType: ['stream'],
-        releaseTime: `<${Math.floor(
-          moment()
-            .subtract(6, 'month')
-            .startOf('day')
-            .unix()
-        )}`,
-      },
-    }
-    /* the cagematch will return in some form! - Jeremy
-  {
-    title: '#HomePageCageMatch',
-    link: `/$/${PAGES.DISCOVER}?t=homepagecagematch&${CS.ORDER_BY_KEY}=${CS.ORDER_BY_TOP}&${CS.FRESH_KEY}=${
-      CS.FRESH_ALL
-    }`,
-    help: (
-      <div className="claim-grid__help">
-        <Icon
-          icon={ICONS.HELP}
-          tooltip
-          customTooltipText={__(
-            'This is an experiment, and may be removed in the future. Publish something with the #homepagecagematch tag to battle for the top spot on the home page!'
-          )}
-        />
-      </div>
-    ),
+  rowData.push({
+    title: 'Trending Classics',
+    link: `/$/${PAGES.DISCOVER}?${CS.ORDER_BY_KEY}=${CS.ORDER_BY_TRENDING}&${CS.FRESH_KEY}=${CS.FRESH_WEEK}`,
     options: {
-      tags: ['homepagecagematch'],
-      orderBy: ['effective_amount'],
-      timestamp: `>${Math.floor(
+      pageSize: 4,
+      claimType: ['stream'],
+      releaseTime: `<${Math.floor(
         moment()
-          .subtract(1, 'week')
+          .subtract(6, 'month')
           .startOf('day')
           .unix()
       )}`,
     },
-    } */
-  );
+  });
 
   rowData.push({
     title: 'Latest From @lbrycast',
-- 
2.45.3