Merge pull request from lbryio/fix-1756

Fix  - Remove check for div
This commit is contained in:
Sean Yesmunt 2018-07-11 20:14:39 -04:00 committed by GitHub
commit 97e2c1df53
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 28 deletions
CHANGELOG.md
src/renderer/page/file

View file

@ -33,6 +33,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
* Console errors when multiple downloads for same claim exist ([#1724](https://github.com/lbryio/lbry-app/pull/1724)) * Console errors when multiple downloads for same claim exist ([#1724](https://github.com/lbryio/lbry-app/pull/1724))
* App version in dev mode ([#1722](https://github.com/lbryio/lbry-app/pull/1722)) * App version in dev mode ([#1722](https://github.com/lbryio/lbry-app/pull/1722))
* Long URI name displays in transaction list/Help ([#1694](https://github.com/lbryio/lbry-app/pull/1694))/([#1692](https://github.com/lbryio/lbry-app/pull/1692)) * Long URI name displays in transaction list/Help ([#1694](https://github.com/lbryio/lbry-app/pull/1694))/([#1692](https://github.com/lbryio/lbry-app/pull/1692))
* Edit option missing from certain published claims ([#175](https://github.com/lbryio/lbry-desktop/issues/1756))
### Changed ### Changed
* Show claim name, instead of URI, when loading a channel([#1711](https://github.com/lbryio/lbry-app/pull/1711)) * Show claim name, instead of URI, when loading a channel([#1711](https://github.com/lbryio/lbry-app/pull/1711))

View file

@ -203,34 +203,32 @@ class FilePage extends React.Component<Props> {
<UriIndicator uri={uri} link /> <UriIndicator uri={uri} link />
</div> </div>
<div className="card__actions card__actions--no-margin card__actions--between"> <div className="card__actions card__actions--no-margin card__actions--between">
{(!claimIsMine || subscriptionUri || speechSharable) && ( <div className="card__actions">
<div className="card__actions"> {claimIsMine ? (
{claimIsMine ? ( <Button
<Button button="primary"
button="primary" icon={icons.EDIT}
icon={icons.EDIT} label={__('Edit')}
label={__('Edit')} onClick={() => {
onClick={() => { prepareEdit(claim, editUri);
prepareEdit(claim, editUri); navigate('/publish');
navigate('/publish'); }}
}} />
/> ) : (
) : ( <SubscribeButton uri={subscriptionUri} channelName={channelName} />
<SubscribeButton uri={subscriptionUri} channelName={channelName} /> )}
)} {!claimIsMine && (
{!claimIsMine && ( <Button
<Button button="alt"
button="alt" icon={icons.GIFT}
icon={icons.GIFT} label={__('Enjoy this? Send a tip')}
label={__('Enjoy this? Send a tip')} onClick={() => openModal({ id: MODALS.SEND_TIP }, { uri })}
onClick={() => openModal({ id: MODALS.SEND_TIP }, { uri })} />
/> )}
)} {speechSharable && (
{speechSharable && ( <ViewOnWebButton claimId={claim.claim_id} claimName={claim.name} />
<ViewOnWebButton claimId={claim.claim_id} claimName={claim.name} /> )}
)} </div>
</div>
)}
<div className="card__actions"> <div className="card__actions">
<FileDownloadLink uri={uri} /> <FileDownloadLink uri={uri} />