Merge pull request #2115 from lbryio/rc-fixes

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

View file

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

View file

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

View file

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

View file

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