diff --git a/package.json b/package.json index 97ab4b83e..00bd237da 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "LBRY", - "version": "0.31.1", + "version": "0.32.0-rc.1", "description": "A browser for the LBRY network, a digital marketplace controlled by its users.", "keywords": [ "lbry" diff --git a/src/ui/component/channelContent/view.jsx b/src/ui/component/channelContent/view.jsx index 83cc3378a..3f129b45a 100644 --- a/src/ui/component/channelContent/view.jsx +++ b/src/ui/component/channelContent/view.jsx @@ -14,7 +14,6 @@ type Props = { claimsInChannel: Array, channelIsMine: boolean, fetchClaims: (string, number) => void, - location: UrlLocation, }; function ChannelContent(props: Props) { diff --git a/src/ui/component/common/form-components/form-field.jsx b/src/ui/component/common/form-components/form-field.jsx index 3dbfcb916..fde302338 100644 --- a/src/ui/component/common/form-components/form-field.jsx +++ b/src/ui/component/common/form-components/form-field.jsx @@ -1,16 +1,12 @@ // @flow import type { ElementRef } from 'react'; -import React, { Suspense } from 'react'; +import React from 'react'; import ReactDOMServer from 'react-dom/server'; -import MarkdownPreview from 'component/common/markdown-preview'; import 'easymde/dist/easymde.min.css'; import Toggle from 'react-toggle'; import { openEditorMenu, stopContextMenu } from 'util/context-menu'; - -const SimpleMDE = React.lazy(() => - import(/* webpackChunkName: "SimpleMDE" */ - 'react-simplemde-editor') -); +import SimpleMDE from 'react-simplemde-editor'; +import MarkdownPreview from 'component/common/markdown-preview-internal'; type Props = { name: string, @@ -137,21 +133,20 @@ export class FormField extends React.PureComponent {
- }> - ; - return ReactDOMServer.renderToString(preview); - }, - }} - /> - + ; + return ReactDOMServer.renderToString(preview); + }, + }} + />
); diff --git a/src/ui/component/common/paginate.jsx b/src/ui/component/common/paginate.jsx index 7c4635a03..c30be815f 100644 --- a/src/ui/component/common/paginate.jsx +++ b/src/ui/component/common/paginate.jsx @@ -40,12 +40,10 @@ function Paginate(props: Props) { } } - if (totalPages <= 1 || loading) { - return null; - } - return ( -
+ // Hide the paginate controls if we are loading or there is only one page + // It should still be rendered to trigger the onPageChange callback + any, }, }; class MediaPlayer extends React.PureComponent { static SANDBOX_TYPES = ['application/x-lbry', 'application/x-ext-lbry']; - static FILE_MEDIA_TYPES = ['text', 'script', 'e-book', 'comic-book', 'document', '3D-file', 'video', 'audio']; + static FILE_MEDIA_TYPES = [ + 'text', + 'script', + 'e-book', + 'comic-book', + 'document', + '3D-file', + // @if TARGET='web' + 'video', + 'audio', + // @endif + ]; static SANDBOX_SET_BASE_URL = 'http://localhost:5278/set/'; static SANDBOX_CONTENT_BASE_URL = 'http://localhost:5278'; @@ -276,6 +289,10 @@ class MediaPlayer extends React.PureComponent { contentType, downloadPath, fileType: path.extname(fileName).substring(1), + // Readable stream from file + // @if TARGET='app' + stream: opts => fs.createReadStream(downloadPath, opts), + // @endif }; // Update state diff --git a/src/ui/component/navigationHistory/view.jsx b/src/ui/component/navigationHistory/view.jsx index 41861a20d..0b8642dae 100644 --- a/src/ui/component/navigationHistory/view.jsx +++ b/src/ui/component/navigationHistory/view.jsx @@ -87,7 +87,7 @@ class UserHistoryPage extends React.PureComponent { )} diff --git a/src/ui/component/transactionList/view.jsx b/src/ui/component/transactionList/view.jsx index 05dc7adb3..ae9d63b52 100644 --- a/src/ui/component/transactionList/view.jsx +++ b/src/ui/component/transactionList/view.jsx @@ -2,7 +2,6 @@ import * as icons from 'constants/icons'; import * as MODALS from 'constants/modal_types'; import * as React from 'react'; -import { List } from 'react-virtualized'; import { FormField, Form } from 'component/common/form'; import Button from 'component/button'; import FileExporter from 'component/common/file-exporter'; @@ -103,7 +102,7 @@ class TransactionList extends React.PureComponent { )} - {!transactionList.length &&

{emptyMessage || __('No transactions to list.')}

} + {!transactionList.length &&

{emptyMessage || __('No transactions to list.')}

} {!!transactionList.length && ( diff --git a/src/ui/component/transactionListRecent/view.jsx b/src/ui/component/transactionListRecent/view.jsx index 28e27dc83..da6578aa2 100644 --- a/src/ui/component/transactionListRecent/view.jsx +++ b/src/ui/component/transactionListRecent/view.jsx @@ -31,11 +31,6 @@ class TransactionListRecent extends React.PureComponent { {__('Recent Transactions')} - -

- {__('To view all of your transactions, navigate to the')}{' '} -