+ {__('Read our')} {__('FAQ')}{' '} + {__('to learn more about LBRY Rewards')}. +
- {__( - 'Your LBRY update is ready. Restart LBRY now to use it!' - )} -
+{__('Your LBRY update is ready. Restart LBRY now to use it!')}
{__('Want to know what has changed?')} See the{' '}
.
diff --git a/src/renderer/modal/modalAutoUpdateDownloaded/index.js b/src/renderer/modal/modalAutoUpdateDownloaded/index.js
index 7283489aa..855d556df 100644
--- a/src/renderer/modal/modalAutoUpdateDownloaded/index.js
+++ b/src/renderer/modal/modalAutoUpdateDownloaded/index.js
@@ -1,7 +1,7 @@
-import React from "react";
-import { connect } from "react-redux";
-import { doCloseModal, doAutoUpdateDeclined } from "redux/actions/app";
-import ModalAutoUpdateDownloaded from "./view";
+import React from 'react';
+import { connect } from 'react-redux';
+import { doCloseModal, doAutoUpdateDeclined } from 'redux/actions/app';
+import ModalAutoUpdateDownloaded from './view';
const perform = dispatch => ({
closeModal: () => dispatch(doCloseModal()),
diff --git a/src/renderer/modal/modalAutoUpdateDownloaded/view.jsx b/src/renderer/modal/modalAutoUpdateDownloaded/view.jsx
index fda5ed519..c067c24ba 100644
--- a/src/renderer/modal/modalAutoUpdateDownloaded/view.jsx
+++ b/src/renderer/modal/modalAutoUpdateDownloaded/view.jsx
@@ -1,9 +1,9 @@
-import React from "react";
-import { Modal } from "modal/modal";
-import { Line } from "rc-progress";
-import Link from "component/link/index";
+import React from 'react';
+import { Modal } from 'modal/modal';
+import { Line } from 'rc-progress';
+import Link from 'component/link/index';
-const { ipcRenderer } = require("electron");
+const { ipcRenderer } = require('electron');
class ModalAutoUpdateDownloaded extends React.PureComponent {
render() {
@@ -13,20 +13,20 @@ class ModalAutoUpdateDownloaded extends React.PureComponent {
{__(
'A new version of LBRY has been released, downloaded, and is ready for you to use pending a restart.'
diff --git a/src/renderer/modal/modalEmailCollection/view.jsx b/src/renderer/modal/modalEmailCollection/view.jsx
index a17ecf7df..1418114d3 100644
--- a/src/renderer/modal/modalEmailCollection/view.jsx
+++ b/src/renderer/modal/modalEmailCollection/view.jsx
@@ -30,7 +30,12 @@ class ModalEmailCollection extends React.PureComponent {
{__("LBRY Leveled Up")}
+ {__('LBRY Leveled Up')}
Can We Stay In Touch?
- {this.renderInner()}
+ {this.renderInner()}
+
+
+ {`${__('Your email may be used to sync usage data across devices.')} `}
+
+
{`${__(
- 'This information is disclosed only to LBRY, Inc. and not to the LBRY network. It is only required to earn LBRY rewards.'
+ 'This information is disclosed only to LBRY, Inc. and not to the LBRY network. It is only required to earn LBRY rewards and may be used to sync usage data across devices.'
)} `}
navigate('/discover')} label={__('Return home')} />.
diff --git a/src/renderer/page/file/index.js b/src/renderer/page/file/index.js
index 4984ed812..37fb13c7f 100644
--- a/src/renderer/page/file/index.js
+++ b/src/renderer/page/file/index.js
@@ -4,6 +4,7 @@ import { doFetchFileInfo } from 'redux/actions/file_info';
import { makeSelectFileInfoForUri } from 'redux/selectors/file_info';
import { selectRewardContentClaimIds } from 'redux/selectors/content';
import { doFetchCostInfoForUri } from 'redux/actions/cost_info';
+import { checkSubscriptionLatest } from 'redux/actions/subscriptions';
import {
makeSelectClaimForUri,
makeSelectContentTypeForUri,
@@ -13,6 +14,7 @@ import { makeSelectCostInfoForUri } from 'redux/selectors/cost_info';
import { selectShowNsfw } from 'redux/selectors/settings';
import FilePage from './view';
import { makeSelectCurrentParam } from 'redux/selectors/navigation';
+import { selectSubscriptions } from 'redux/selectors/subscriptions';
const select = (state, props) => ({
claim: makeSelectClaimForUri(props.uri)(state),
@@ -23,12 +25,15 @@ const select = (state, props) => ({
tab: makeSelectCurrentParam('tab')(state),
fileInfo: makeSelectFileInfoForUri(props.uri)(state),
rewardedContentClaimIds: selectRewardContentClaimIds(state, props),
+ subscriptions: selectSubscriptions(state),
});
const perform = dispatch => ({
navigate: (path, params) => dispatch(doNavigate(path, params)),
fetchFileInfo: uri => dispatch(doFetchFileInfo(uri)),
fetchCostInfo: uri => dispatch(doFetchCostInfoForUri(uri)),
+ checkSubscriptionLatest: (subscription, uri) =>
+ dispatch(checkSubscriptionLatest(subscription, uri)),
});
export default connect(select, perform)(FilePage);
diff --git a/src/renderer/page/file/view.jsx b/src/renderer/page/file/view.jsx
index e248ee5d6..069a0dfdc 100644
--- a/src/renderer/page/file/view.jsx
+++ b/src/renderer/page/file/view.jsx
@@ -17,6 +17,7 @@ class FilePage extends React.PureComponent {
componentDidMount() {
this.fetchFileInfo(this.props);
this.fetchCostInfo(this.props);
+ this.checkSubscriptionLatest(this.props);
}
componentWillReceiveProps(nextProps) {
@@ -35,6 +36,28 @@ class FilePage extends React.PureComponent {
}
}
+ checkSubscriptionLatest(props) {
+ if (
+ props.subscriptions
+ .map(subscription => subscription.channelName)
+ .indexOf(props.claim.channel_name) !== -1
+ ) {
+ props.checkSubscriptionLatest(
+ {
+ channelName: props.claim.channel_name,
+ uri: buildURI(
+ {
+ contentName: props.claim.channel_name,
+ claimId: props.claim.value.publisherSignature.certificateId,
+ },
+ false
+ ),
+ },
+ buildURI({ contentName: props.claim.name, claimId: props.claim.claim_id }, false)
+ );
+ }
+ }
+
render() {
const {
claim,
diff --git a/src/renderer/page/settings/view.jsx b/src/renderer/page/settings/view.jsx
index 0b061e87a..fe704b906 100644
--- a/src/renderer/page/settings/view.jsx
+++ b/src/renderer/page/settings/view.jsx
@@ -14,6 +14,8 @@ class SettingsPage extends React.PureComponent {
this.state = {
clearingCache: false,
};
+
+ this.onAutomaticDarkModeChange = this.onAutomaticDarkModeChange.bind(this);
}
clearCache() {
@@ -62,11 +64,16 @@ class SettingsPage extends React.PureComponent {
onThemeChange(event) {
const { value } = event.target;
+
+ if (value === 'dark') {
+ this.onAutomaticDarkModeChange(false);
+ }
+
this.props.setClientSetting(settings.THEME, value);
}
- onAutomaticDarkModeChange(event) {
- this.props.setClientSetting(settings.AUTOMATIC_DARK_MODE_ENABLED, event.target.checked);
+ onAutomaticDarkModeChange(value) {
+ this.props.setClientSetting(settings.AUTOMATIC_DARK_MODE_ENABLED, value);
}
onInstantPurchaseEnabledChange(enabled) {
@@ -143,6 +150,7 @@ class SettingsPage extends React.PureComponent {
);
}
+
return (