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

Merge pull request #2115 from lbryio/rc-fixes

Browse source 
Rc fixes
This commit is contained in:
Sean Yesmunt 2018-11-20 17:27:02 -05:00 • committed by GitHub
commit bb0d89daaf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 27 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/renderer/component/selectThumbnail/view.jsx
View file

@ -122,28 +122,28 @@ class SelectThumbnail extends React.PureComponent<Props, State> {
onFileChosen={path => openModal(MODALS.CONFIRM_THUMBNAIL_UPLOAD, { path })} onFileChosen={path => openModal(MODALS.CONFIRM_THUMBNAIL_UPLOAD, { path })}
/> />
)} )}
{status === THUMBNAIL_STATUSES.COMPLETE && ( {status === THUMBNAIL_STATUSES.COMPLETE &&
<div className="column column--space-between"> thumbnail && (
<img <div className="column column--space-between">
className="column__item thumbnail-preview" <div
src={thumbnail} className="column__item thumbnail-preview"
alt={__('Thumbnail Preview')} style={{ backgroundImage: `url(${thumbnail})` }}
/> />
<div className="column__item"> <div className="column__item">
<p> <p>
Upload complete.{' '} Upload complete.{' '}
<Button button="link" href={thumbnail} label={__('View it on spee.ch')} />. <Button button="link" href={thumbnail} label={__('View it on spee.ch')} />.
</p> </p>
<div className="card__actions"> <div className="card__actions">
<Button <Button
button="link" button="link"
label={__('New thumbnail')} label={__('New thumbnail')}
onClick={resetThumbnailStatus} onClick={resetThumbnailStatus}
/> />
</div>
</div> </div>
</div> </div>
</div> )}
)}
</React.Fragment> </React.Fragment>
)} )}
{status === THUMBNAIL_STATUSES.READY && ( {status === THUMBNAIL_STATUSES.READY && (

1
src/renderer/component/wunderbar/view.jsx
View file

@ -123,7 +123,6 @@ class WunderBar extends React.PureComponent<Props> {
} else { } else {
this.props.doShowSnackBar({ this.props.doShowSnackBar({
message: __('Invalid LBRY URL entered. Only A-Z, a-z, and - allowed.'), message: __('Invalid LBRY URL entered. Only A-Z, a-z, and - allowed.'),
displayType: ['snackbar'],
}); });
} }
} catch (e) { } catch (e) {

5
src/renderer/page/report/view.jsx
View file

@ -33,9 +33,7 @@ class ReportPage extends React.Component {
// Display global notice // Display global notice
const action = doToast({ const action = doToast({
displayType: ['snackbar'],
message: __('Message received! Thanks for helping.'), message: __('Message received! Thanks for helping.'),
isError: false,
}); });
window.app.store.dispatch(action); window.app.store.dispatch(action);
}); });
@ -90,7 +88,8 @@ class ReportPage extends React.Component {
button="link" button="link"
href="https://github.com/lbryio/lbry-desktop/issues" href="https://github.com/lbryio/lbry-desktop/issues"
label={__('submit an issue on GitHub')} label={__('submit an issue on GitHub')}
/>. />
.
</p> </p>
<p> <p>
{__('Explore our')}{' '} {__('Explore our')}{' '}

11
src/renderer/redux/reducers/subscriptions.js
View file

@ -52,7 +52,7 @@ export default handleActions(
} }
return { return {
...state, ...state,
...unread, unread: { ...unread },
subscriptions: newSubscriptions, subscriptions: newSubscriptions,
}; };
}, },
@ -61,11 +61,10 @@ export default handleActions(
action: SetSubscriptionLatest action: SetSubscriptionLatest
): SubscriptionState => ({ ): SubscriptionState => ({
...state, ...state,
subscriptions: state.subscriptions.map( subscriptions: state.subscriptions.map(subscription =>
subscription => subscription.channelName === action.data.subscription.channelName
subscription.channelName === action.data.subscription.channelName ? { ...subscription, latest: action.data.uri }
? { ...subscription, latest: action.data.uri } : subscription
: subscription
), ),
}), }),
[ACTIONS.UPDATE_SUBSCRIPTION_UNREADS]: ( [ACTIONS.UPDATE_SUBSCRIPTION_UNREADS]: (