LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Projects Releases 238 Packages Wiki Activity

Merge branch 'master' into feat-newChannelCreate

Browse source
This commit is contained in:
jessopb 2020-07-03 10:53:16 -04:00 committed by GitHub
commit 64d67026cc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
static/app-strings.json
View file

@ -1010,6 +1010,7 @@
"Payment Type": "Payment Type",
"Purchase": "Purchase",
"No transactions.": "No transactions.",
"Status": "Status",
"Active": "Active",
"Historical": "Historical",
"Reposts": "Reposts",
@ -1289,4 +1290,4 @@
"You Followed Your First Channel!": "You Followed Your First Channel!",
"Awesome! You just followed your first first channel.": "Awesome! You just followed your first first channel.",
"After submitting, it will take a few minutes for your changes to be live for everyone.": "After submitting, it will take a few minutes for your changes to be live for everyone."
}
}

8
ui/component/claimList/view.jsx
View file

@ -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();

2
ui/component/txoList/view.jsx
View file

@ -230,7 +230,7 @@ function TxoList(props: Props) {
{!hideStatus && (
<div>
<fieldset-section>
<label>Status</label>
<label>{__('Status')}</label>
<div className={'txo__radios'}>
<Button
button="alt"

1
ui/page/settings/view.jsx
View file

@ -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>