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

Merge pull request #1867 from lbryio/thumnail-loading-message

Browse source 
feat: add thumbnail loading to list of help errors
This commit is contained in:
Sean Yesmunt 2018-08-13 14:57:59 -04:00 committed by GitHub
commit bb9b3b5365
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -24,6 +24,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
* **Wallet -> Get Credits** page now shows correct ShapeShift status when it's avialable ([#1836](https://github.com/lbryio/lbry-desktop/issues/1836)) * **Wallet -> Get Credits** page now shows correct ShapeShift status when it's avialable ([#1836](https://github.com/lbryio/lbry-desktop/issues/1836))
* Fix middle click link error ([#1843](https://github.com/lbryio/lbry-desktop/issues/1843)} * Fix middle click link error ([#1843](https://github.com/lbryio/lbry-desktop/issues/1843)}
* Problem with search auto-complete menu when scrolling over file viewer ([#1847](https://github.com/lbryio/lbry-desktop/issues/1847)) * Problem with search auto-complete menu when scrolling over file viewer ([#1847](https://github.com/lbryio/lbry-desktop/issues/1847))
* Show label when publish button is disabled while uploading thumbnail to spee.ch ([#1867](https://github.com/lbryio/lbry-desktop/pull/1867))
## [0.23.0] - 2018-07-25 ## [0.23.0] - 2018-07-25

6
src/renderer/component/publishForm/view.jsx
View file

@ -254,10 +254,11 @@ class PublishForm extends React.PureComponent<Props> {
editingURI, editingURI,
isStillEditing, isStillEditing,
filePath, filePath,
uploadThumbnailStatus,
} = this.props; } = this.props;
// If they are editing, they don't need a new file chosen // If they are editing, they don't need a new file chosen
const formValidLessFile = name && !nameError && title && bid && !bidError && tosAccepted; const formValidLessFile = name && !nameError && title && bid && !bidError && tosAccepted && !(uploadThumbnailStatus === THUMBNAIL_STATUSES.IN_PROGRESS);
return editingURI && !filePath ? isStillEditing && formValidLessFile : formValidLessFile; return editingURI && !filePath ? isStillEditing && formValidLessFile : formValidLessFile;
} }
@ -272,6 +273,7 @@ class PublishForm extends React.PureComponent<Props> {
editingURI, editingURI,
filePath, filePath,
isStillEditing, isStillEditing,
uploadThumbnailStatus,
} = this.props; } = this.props;
const isFormValid = this.checkIsFormValid(); const isFormValid = this.checkIsFormValid();
@ -286,6 +288,8 @@ class PublishForm extends React.PureComponent<Props> {
{name && nameError && <div>{__('The URL you created is not valid')}</div>} {name && nameError && <div>{__('The URL you created is not valid')}</div>}
{!bid && <div>{__('A bid amount is required')}</div>} {!bid && <div>{__('A bid amount is required')}</div>}
{!!bid && bidError && <div>{bidError}</div>} {!!bid && bidError && <div>{bidError}</div>}
{uploadThumbnailStatus === THUMBNAIL_STATUSES.IN_PROGRESS
&& <div>{__('Please wait for thumbnail to finish uploading')}</div>}
{!tosAccepted && <div>{__('You must agree to the terms of service')}</div>} {!tosAccepted && <div>{__('You must agree to the terms of service')}</div>}
{!!editingURI && {!!editingURI &&
!isStillEditing && !isStillEditing &&

4
yarn.lock
View file

@ -5651,9 +5651,9 @@ lazy-val@^1.0.3:
version "1.0.3" version "1.0.3"
resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.3.tgz#bb97b200ef00801d94c317e29dc6ed39e31c5edc" resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.3.tgz#bb97b200ef00801d94c317e29dc6ed39e31c5edc"
lbry-redux@lbryio/lbry-redux#03c3354c12f7834e6ed63705ff19487669be32b9: lbry-redux@lbryio/lbry-redux#8794a775bf71e7b8b7d1ac44392196bb58a0042a:
version "0.0.1" version "0.0.1"
resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/03c3354c12f7834e6ed63705ff19487669be32b9" resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/8794a775bf71e7b8b7d1ac44392196bb58a0042a"
dependencies: dependencies:
proxy-polyfill "0.1.6" proxy-polyfill "0.1.6"
reselect "^3.0.0" reselect "^3.0.0"