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

1
static/app-strings.json
View file

@ -1010,6 +1010,7 @@
"Payment Type": "Payment Type", "Payment Type": "Payment Type",
"Purchase": "Purchase", "Purchase": "Purchase",
"No transactions.": "No transactions.", "No transactions.": "No transactions.",
"Status": "Status",
"Active": "Active", "Active": "Active",
"Historical": "Historical", "Historical": "Historical",
"Reposts": "Reposts", "Reposts": "Reposts",

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

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

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

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

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

@ -513,7 +513,6 @@ class SettingsPage extends React.PureComponent<Props, State> {
button="secondary" button="secondary"
label={__('Manage')} label={__('Manage')}
icon={ICONS.SETTINGS} icon={ICONS.SETTINGS}
disabled={userBlockedChannelsCount === 0}
navigate={`/$/${PAGES.BLOCKED}`} navigate={`/$/${PAGES.BLOCKED}`}
/> />
</div> </div>