From d51e52444c38200472f90f776ae3519abff7c206 Mon Sep 17 00:00:00 2001
From: infiinte-persistence <inf.persistence@gmail.com>
Date: Thu, 2 Jul 2020 00:58:54 +0800
Subject: [PATCH 1/6] Allow entering Blocked Page even for 0 blocked channels.

Issue 4447 (item 2)
---
 ui/page/settings/view.jsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ui/page/settings/view.jsx b/ui/page/settings/view.jsx
index 5f9c1d186..5159c18f7 100644
--- a/ui/page/settings/view.jsx
+++ b/ui/page/settings/view.jsx
@@ -513,7 +513,6 @@ class SettingsPage extends React.PureComponent<Props, State> {
                         button="secondary"
                         label={__('Manage')}
                         icon={ICONS.SETTINGS}
-                        disabled={userBlockedChannelsCount === 0}
                         navigate={`/$/${PAGES.BLOCKED}`}
                       />
                     </div>

From aede386c222b6dba2792addff649fee065ec516a Mon Sep 17 00:00:00 2001
From: eatdostacos <64234158+eatdostacos@users.noreply.github.com>
Date: Wed, 1 Jul 2020 13:14:39 -0700
Subject: [PATCH 2/6] Add/Correct Strings

---
 static/app-strings.json             | 1 +
 ui/component/commentCreate/view.jsx | 2 +-
 ui/component/txoList/view.jsx       | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/static/app-strings.json b/static/app-strings.json
index 0b4e5c295..2330c8e61 100644
--- a/static/app-strings.json
+++ b/static/app-strings.json
@@ -1010,6 +1010,7 @@
   "Payment Type": "Payment Type",
   "Purchase": "Purchase",
   "No transactions.": "No transactions.",
+  "Status":"Status",
   "Active": "Active",
   "Historical": "Historical",
   "Reposts": "Reposts",
diff --git a/ui/component/commentCreate/view.jsx b/ui/component/commentCreate/view.jsx
index b48806206..0c5386209 100644
--- a/ui/component/commentCreate/view.jsx
+++ b/ui/component/commentCreate/view.jsx
@@ -112,7 +112,7 @@ export function CommentCreate(props: Props) {
         disabled={channel === CHANNEL_NEW}
         type={advancedEditor && !isReply ? 'markdown' : 'textarea'}
         name={isReply ? 'content_reply' : 'content_description'}
-        label={isReply ? __('Replying as %reply_channel%', { reply_channel: channel }) : __('Comment')}
+        label={isReply ? __('Replying as %reply_channel%'), { reply_channel: channel }) : __('Comment')}
         quickActionLabel={isReply ? undefined : advancedEditor ? __('Simple Editor') : __('Advanced Editor')}
         quickActionHandler={isReply ? undefined : toggleEditorMode}
         onFocus={onTextareaFocus}
diff --git a/ui/component/txoList/view.jsx b/ui/component/txoList/view.jsx
index 43a8b22c7..f67a4dc33 100644
--- a/ui/component/txoList/view.jsx
+++ b/ui/component/txoList/view.jsx
@@ -230,7 +230,7 @@ function TxoList(props: Props) {
               {!hideStatus && (
                 <div>
                   <fieldset-section>
-                    <label>Status</label>
+                    label={__('Status')}
                     <div className={'txo__radios'}>
                       <Button
                         button="alt"

From dad10f11187a6a46d5b6f7d5f88bb4dfc7e064d5 Mon Sep 17 00:00:00 2001
From: eatdostacos <64234158+eatdostacos@users.noreply.github.com>
Date: Wed, 1 Jul 2020 13:52:41 -0700
Subject: [PATCH 3/6] small correction to string

---
 static/app-strings.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/static/app-strings.json b/static/app-strings.json
index 2330c8e61..d7b7784ec 100644
--- a/static/app-strings.json
+++ b/static/app-strings.json
@@ -1010,7 +1010,7 @@
   "Payment Type": "Payment Type",
   "Purchase": "Purchase",
   "No transactions.": "No transactions.",
-  "Status":"Status",
+  "Status": "Status",
   "Active": "Active",
   "Historical": "Historical",
   "Reposts": "Reposts",
@@ -1261,4 +1261,4 @@
   "Uncheck your email below if you want to stop receiving messages.": "Uncheck your email below if you want to stop receiving messages.",
   "Remove from Blocked List": "Remove from Blocked List",
   "Are you sure you want to remove this from the list?": "Are you sure you want to remove this from the list?"
-}
\ No newline at end of file
+}

From 16ea14887ced2a18087600cd1d465d6f04e752fa Mon Sep 17 00:00:00 2001
From: infiinte-persistence <inf.persistence@gmail.com>
Date: Thu, 2 Jul 2020 13:38:25 +0800
Subject: [PATCH 4/6] Inf-scroll: Change region to 'main' to ignore long
 tag/following list.

## Issue:
2789 `Infinite scrolling should activate at end of listed claims, not subscription list`
---
 ui/component/claimList/view.jsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ui/component/claimList/view.jsx b/ui/component/claimList/view.jsx
index b6d945dc3..0b38ee537 100644
--- a/ui/component/claimList/view.jsx
+++ b/ui/component/claimList/view.jsx
@@ -1,5 +1,5 @@
 // @flow
-import { MAIN_WRAPPER_CLASS } from 'component/app/view';
+import { MAIN_CLASS } from 'component/page/view';
 import type { Node } from 'react';
 import React, { useEffect } from 'react';
 import classnames from 'classnames';
@@ -71,10 +71,10 @@ export default function ClaimList(props: Props) {
   useEffect(() => {
     const handleScroll = debounce(e => {
       if (page && pageSize && onScrollBottom) {
-        const mainElWrapper = document.querySelector(`.${MAIN_WRAPPER_CLASS}`);
+        const mainEl = document.querySelector(`.${MAIN_CLASS}`);
 
-        if (mainElWrapper && !loading && urisLength >= pageSize) {
-          const contentWrapperAtBottomOfPage = mainElWrapper.getBoundingClientRect().bottom - 0.5 <= window.innerHeight;
+        if (mainEl && !loading && urisLength >= pageSize) {
+          const contentWrapperAtBottomOfPage = mainEl.getBoundingClientRect().bottom - 0.5 <= window.innerHeight;
 
           if (contentWrapperAtBottomOfPage) {
             onScrollBottom();

From 8fe618c5bea7732cbd99ee86ea06e25231a1b822 Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Thu, 2 Jul 2020 11:08:58 -0400
Subject: [PATCH 5/6] fix typo

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

diff --git a/ui/component/commentCreate/view.jsx b/ui/component/commentCreate/view.jsx
index 0c5386209..b48806206 100644
--- a/ui/component/commentCreate/view.jsx
+++ b/ui/component/commentCreate/view.jsx
@@ -112,7 +112,7 @@ export function CommentCreate(props: Props) {
         disabled={channel === CHANNEL_NEW}
         type={advancedEditor && !isReply ? 'markdown' : 'textarea'}
         name={isReply ? 'content_reply' : 'content_description'}
-        label={isReply ? __('Replying as %reply_channel%'), { reply_channel: channel }) : __('Comment')}
+        label={isReply ? __('Replying as %reply_channel%', { reply_channel: channel }) : __('Comment')}
         quickActionLabel={isReply ? undefined : advancedEditor ? __('Simple Editor') : __('Advanced Editor')}
         quickActionHandler={isReply ? undefined : toggleEditorMode}
         onFocus={onTextareaFocus}

From 8b266ebacb0fc4d3c9673a5ef4da22d0d61d681d Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Thu, 2 Jul 2020 11:39:12 -0400
Subject: [PATCH 6/6] fix typo

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

diff --git a/ui/component/txoList/view.jsx b/ui/component/txoList/view.jsx
index f67a4dc33..9fb82a486 100644
--- a/ui/component/txoList/view.jsx
+++ b/ui/component/txoList/view.jsx
@@ -230,7 +230,7 @@ function TxoList(props: Props) {
               {!hideStatus && (
                 <div>
                   <fieldset-section>
-                    label={__('Status')}
+                    <label>{__('Status')}</label>
                     <div className={'txo__radios'}>
                       <Button
                         button="alt"