From b98301d28d0afbdaf0ba91c2218c2f388274535d Mon Sep 17 00:00:00 2001 From: Sean Yesmunt Date: Mon, 4 Feb 2019 16:19:09 -0500 Subject: [PATCH 1/2] fix: show 'no preview available' for files correctly --- src/renderer/component/fileViewer/internal/player.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/renderer/component/fileViewer/internal/player.jsx b/src/renderer/component/fileViewer/internal/player.jsx index 44407ae24..a9eaf94b6 100644 --- a/src/renderer/component/fileViewer/internal/player.jsx +++ b/src/renderer/component/fileViewer/internal/player.jsx @@ -283,8 +283,8 @@ class MediaPlayer extends React.PureComponent { const isLoadingFile = !fileSource && isFileType; const isLbryPackage = /application\/x(-ext)?-lbry$/.test(contentType); const isUnsupported = - !isLbryPackage && (!this.supportedType() && !isFileType && !isPlayableType); - + (mediaType === 'application' && !isLbryPackage) || + (!this.supportedType() && !isFileType && !isPlayableType); // Media (audio, video) const isUnplayable = isPlayableType && unplayable; const isLoadingMetadata = isPlayableType && (!hasMetadata && !unplayable); From f44c02e099265b2245b175bbc0208225794d1390 Mon Sep 17 00:00:00 2001 From: Sean Yesmunt Date: Mon, 4 Feb 2019 16:36:59 -0500 Subject: [PATCH 2/2] update: add rewards to sidebar links --- src/renderer/redux/selectors/app.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/renderer/redux/selectors/app.js b/src/renderer/redux/selectors/app.js index 7ba299e86..d849f4bdb 100644 --- a/src/renderer/redux/selectors/app.js +++ b/src/renderer/redux/selectors/app.js @@ -118,7 +118,6 @@ export const selectNavLinks = createSelector( page === PAGES.WALLET || page === PAGES.SEND || page === PAGES.GET_CREDITS || - page === PAGES.REWARDS || page === PAGES.HISTORY || page === PAGES.BACKUP; @@ -177,9 +176,6 @@ export const selectNavLinks = createSelector( { ...buildLink('Get Credits', PAGES.GET_CREDITS), }, - { - ...buildLink('Rewards', PAGES.REWARDS), - }, { ...buildLink('Backup', PAGES.BACKUP), }, @@ -208,6 +204,11 @@ export const selectNavLinks = createSelector( ...buildLink('Invite', PAGES.INVITE), icon: ICONS.INVITE, }, + { + ...buildLink('Rewards', PAGES.REWARDS), + // This probably shouldn't use the "FEATURED" icon, but not sure what else to use + icon: ICONS.FEATURED, + }, { ...buildLink('Downloads', PAGES.DOWNLOADED), icon: ICONS.LOCAL,