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

fix 1549 #1552

Merged
tzarebczan merged 1 commit from issue-1549 into master 2018-06-05 18:12:15 +02:00
Conversation 0 Commits 1 Files changed 2 +7 -3
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/createWindow.js
View file

@ -64,8 +64,12 @@ export default appState => {
// path, so we just strip it off. // path, so we just strip it off.
// - In a URI with a claim ID, like lbry://channel#claimid, Windows interprets the hash mark as // - In a URI with a claim ID, like lbry://channel#claimid, Windows interprets the hash mark as
// an anchor and converts it to lbry://channel/#claimid. We remove the slash here as well. // an anchor and converts it to lbry://channel/#claimid. We remove the slash here as well.
// - ? also interpreted as an anchor, remove slash also.
if (process.platform === 'win32') { if (process.platform === 'win32') {
deepLinkingURI = deepLinkingURI.replace(/\/$/, '').replace('/#', '#'); deepLinkingURI = deepLinkingURI
.replace(/\/$/, '')
.replace('/#', '#')
.replace('/?', '?');
} }
} else { } else {
deepLinkingURI = appState.macDeepLinkingURI; deepLinkingURI = appState.macDeepLinkingURI;

4
src/renderer/page/rewards/view.jsx
View file

@ -49,7 +49,7 @@ class RewardsPage extends React.PureComponent<Props> {
renderPageHeader() { renderPageHeader() {
const { doAuth, navigate, user, daemonSettings } = this.props; const { doAuth, navigate, user, daemonSettings } = this.props;
if (user && !user.is_reward_approved && daemonSettings.share_usage_data) { if (user && !user.is_reward_approved && daemonSettings && daemonSettings.share_usage_data) {
if (!user.primary_email || !user.has_verified_email || !user.is_identity_verified) { if (!user.primary_email || !user.has_verified_email || !user.is_identity_verified) {
return ( return (
<section className="card card--section"> <section className="card card--section">
@ -98,7 +98,7 @@ class RewardsPage extends React.PureComponent<Props> {
renderUnclaimedRewards() { renderUnclaimedRewards() {
const { fetching, rewards, user, daemonSettings, navigate } = this.props; const { fetching, rewards, user, daemonSettings, navigate } = this.props;
if (!daemonSettings.share_usage_data) { if (daemonSettings && !daemonSettings.share_usage_data) {
return ( return (
<div className="card card--section"> <div className="card card--section">
<div className="card__title">{__('Disabled')}</div> <div className="card__title">{__('Disabled')}</div>