Merge pull request #1596 from lbryio/release-0-22-0

Merge 'release-0-22-0' into master
This commit is contained in:
Sean Yesmunt 2018-06-15 00:55:37 -04:00 committed by GitHub
commit f9dcee5604
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 7 deletions

View file

@ -1,6 +1,6 @@
{
"name": "LBRY",
"version": "0.22.0-rc.10",
"version": "0.22.0-rc.11",
"description": "A browser for the LBRY network, a digital marketplace controlled by its users.",
"keywords": [
"lbry"
@ -48,7 +48,7 @@
"formik": "^0.10.4",
"hast-util-sanitize": "^1.1.2",
"keytar": "^4.2.1",
"lbry-redux": "lbryio/lbry-redux#52ffd4c6bdf699d1d0bfebe905fb4cb3a95cf553",
"lbry-redux": "lbryio/lbry-redux#1739929ecf0eb9eca9ba9cc64fd5b5f2e59c4978",
"localforage": "^1.7.1",
"mixpanel-browser": "^2.17.1",
"moment": "^2.22.0",

View file

@ -1,6 +1,6 @@
// @flow
import * as React from 'react';
import { isNameValid, buildURI, regexInvalidURI, STATUSES } from 'lbry-redux';
import { isNameValid, buildURI, regexInvalidURI, THUMBNAIL_STATUSES } from 'lbry-redux';
import { Form, FormField, FormRow, FormFieldPrice, Submit } from 'component/common/form';
import Button from 'component/button';
import ChannelSection from 'component/selectChannel';
@ -363,7 +363,7 @@ class PublishForm extends React.PureComponent<Props> {
<section className="card card--section">
<div className="card__title">{__('Thumbnail')}</div>
<div className="card__subtitle">
{uploadThumbnailStatus === STATUSES.API_DOWN ? (
{uploadThumbnailStatus === THUMBNAIL_STATUSES.API_DOWN ? (
__('Enter a url for your thumbnail.')
) : (
<React.Fragment>
@ -567,7 +567,9 @@ class PublishForm extends React.PureComponent<Props> {
<Submit
label={submitLabel}
disabled={
formDisabled || !formValid || uploadThumbnailStatus === STATUSES.IN_PROGRESS
formDisabled ||
!formValid ||
uploadThumbnailStatus === THUMBNAIL_STATUSES.IN_PROGRESS
}
/>
<Button button="alt" onClick={this.handleCancelPublish} label={__('Cancel')} />

View file

@ -5564,9 +5564,9 @@ lazy-val@^1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.3.tgz#bb97b200ef00801d94c317e29dc6ed39e31c5edc"
lbry-redux@lbryio/lbry-redux#52ffd4c6bdf699d1d0bfebe905fb4cb3a95cf553:
lbry-redux@lbryio/lbry-redux#1739929ecf0eb9eca9ba9cc64fd5b5f2e59c4978:
version "0.0.1"
resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/52ffd4c6bdf699d1d0bfebe905fb4cb3a95cf553"
resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/1739929ecf0eb9eca9ba9cc64fd5b5f2e59c4978"
dependencies:
proxy-polyfill "0.1.6"
reselect "^3.0.0"