From 703f16e9a108b8022fdb61ef65b397fe5fe8fef6 Mon Sep 17 00:00:00 2001 From: Thomas Zarebczan <thomas.zarebczan@gmail.com> Date: Wed, 11 Jul 2018 14:59:59 -0400 Subject: [PATCH 1/2] Remove check for div One of these conditions (including tipping) will always apply, no need to hide the div. --- src/renderer/page/file/view.jsx | 54 ++++++++++++++++----------------- 1 file changed, 26 insertions(+), 28 deletions(-) diff --git a/src/renderer/page/file/view.jsx b/src/renderer/page/file/view.jsx index df7f0f46f..129aa38ee 100644 --- a/src/renderer/page/file/view.jsx +++ b/src/renderer/page/file/view.jsx @@ -203,34 +203,32 @@ class FilePage extends React.Component<Props> { <UriIndicator uri={uri} link /> </div> <div className="card__actions card__actions--no-margin card__actions--between"> - {(!claimIsMine || subscriptionUri || speechSharable) && ( - <div className="card__actions"> - {claimIsMine ? ( - <Button - button="primary" - icon={icons.EDIT} - label={__('Edit')} - onClick={() => { - prepareEdit(claim, editUri); - navigate('/publish'); - }} - /> - ) : ( - <SubscribeButton uri={subscriptionUri} channelName={channelName} /> - )} - {!claimIsMine && ( - <Button - button="alt" - icon={icons.GIFT} - label={__('Enjoy this? Send a tip')} - onClick={() => openModal({ id: MODALS.SEND_TIP }, { uri })} - /> - )} - {speechSharable && ( - <ViewOnWebButton claimId={claim.claim_id} claimName={claim.name} /> - )} - </div> - )} + <div className="card__actions"> + {claimIsMine ? ( + <Button + button="primary" + icon={icons.EDIT} + label={__('Edit')} + onClick={() => { + prepareEdit(claim, editUri); + navigate('/publish'); + }} + /> + ) : ( + <SubscribeButton uri={subscriptionUri} channelName={channelName} /> + )} + {!claimIsMine && ( + <Button + button="alt" + icon={icons.GIFT} + label={__('Enjoy this? Send a tip')} + onClick={() => openModal({ id: MODALS.SEND_TIP }, { uri })} + /> + )} + {speechSharable && ( + <ViewOnWebButton claimId={claim.claim_id} claimName={claim.name} /> + )} + </div> <div className="card__actions"> <FileDownloadLink uri={uri} /> From 30ff832f3a689991c94d5981a52e2bdc0e62e9e8 Mon Sep 17 00:00:00 2001 From: Thomas Zarebczan <tzarebczan@users.noreply.github.com> Date: Wed, 11 Jul 2018 15:09:17 -0400 Subject: [PATCH 2/2] Update CHANGELOG.md add changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f8c76f3d1..369ac9950 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,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)) * 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)) + * Edit option missing from certain published claims ([#175](https://github.com/lbryio/lbry-desktop/issues/1756)) ### Changed * Show claim name, instead of URI, when loading a channel([#1711](https://github.com/lbryio/lbry-app/pull/1711))