Rename default import/exports for clarity in text search (no functional change)
I believe it was just due to copy/pasting from another file and not renaming it.
This commit is contained in:
parent
e2de9bf9e7
commit
d97a23b699
22 changed files with 62 additions and 66 deletions
|
@ -14,7 +14,7 @@ import { withRouter } from 'react-router';
|
||||||
import { selectUserVerifiedEmail } from 'redux/selectors/user';
|
import { selectUserVerifiedEmail } from 'redux/selectors/user';
|
||||||
import { makeSelectClientSetting, selectShowMatureContent } from 'redux/selectors/settings';
|
import { makeSelectClientSetting, selectShowMatureContent } from 'redux/selectors/settings';
|
||||||
|
|
||||||
import ChannelPage from './view';
|
import ChannelContent from './view';
|
||||||
|
|
||||||
const select = (state, props) => {
|
const select = (state, props) => {
|
||||||
const { search } = props.location;
|
const { search } = props.location;
|
||||||
|
@ -37,4 +37,4 @@ const perform = (dispatch) => ({
|
||||||
doResolveUris: (uris, returnCachedUris) => dispatch(doResolveUris(uris, returnCachedUris)),
|
doResolveUris: (uris, returnCachedUris) => dispatch(doResolveUris(uris, returnCachedUris)),
|
||||||
});
|
});
|
||||||
|
|
||||||
export default withRouter(connect(select, perform)(ChannelPage));
|
export default withRouter(connect(select, perform)(ChannelContent));
|
||||||
|
|
|
@ -17,7 +17,7 @@ import {
|
||||||
} from 'lbry-redux';
|
} from 'lbry-redux';
|
||||||
import { doOpenModal } from 'redux/actions/app';
|
import { doOpenModal } from 'redux/actions/app';
|
||||||
import { doUpdateBlockListForPublishedChannel } from 'redux/actions/comments';
|
import { doUpdateBlockListForPublishedChannel } from 'redux/actions/comments';
|
||||||
import ChannelPage from './view';
|
import ChannelForm from './view';
|
||||||
|
|
||||||
const select = (state, props) => ({
|
const select = (state, props) => ({
|
||||||
claim: makeSelectClaimForUri(props.uri)(state),
|
claim: makeSelectClaimForUri(props.uri)(state),
|
||||||
|
@ -52,4 +52,4 @@ const perform = (dispatch) => ({
|
||||||
clearChannelErrors: () => dispatch(doClearChannelErrors()),
|
clearChannelErrors: () => dispatch(doClearChannelErrors()),
|
||||||
});
|
});
|
||||||
|
|
||||||
export default connect(select, perform)(ChannelPage);
|
export default connect(select, perform)(ChannelForm);
|
||||||
|
|
|
@ -10,7 +10,7 @@ type Props = {
|
||||||
doChannelUnmute: (string, boolean) => void,
|
doChannelUnmute: (string, boolean) => void,
|
||||||
};
|
};
|
||||||
|
|
||||||
function ChannelBlockButton(props: Props) {
|
function ChannelMuteButton(props: Props) {
|
||||||
const { uri, doChannelMute, doChannelUnmute, isMuted } = props;
|
const { uri, doChannelMute, doChannelUnmute, isMuted } = props;
|
||||||
|
|
||||||
function handleClick() {
|
function handleClick() {
|
||||||
|
@ -22,12 +22,8 @@ function ChannelBlockButton(props: Props) {
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Button
|
<Button button={isMuted ? 'alt' : 'secondary'} label={isMuted ? __('Unmute') : __('Mute')} onClick={handleClick} />
|
||||||
button={isMuted ? 'alt' : 'secondary'}
|
|
||||||
label={isMuted ? __('Unmute') : __('Mute')}
|
|
||||||
onClick={handleClick}
|
|
||||||
/>
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
export default ChannelBlockButton;
|
export default ChannelMuteButton;
|
||||||
|
|
|
@ -2,9 +2,9 @@ import { connect } from 'react-redux';
|
||||||
import { selectMyChannelClaims } from 'lbry-redux';
|
import { selectMyChannelClaims } from 'lbry-redux';
|
||||||
import { selectActiveChannelClaim, selectIncognito } from 'redux/selectors/app';
|
import { selectActiveChannelClaim, selectIncognito } from 'redux/selectors/app';
|
||||||
import { doSetActiveChannel, doSetIncognito } from 'redux/actions/app';
|
import { doSetActiveChannel, doSetIncognito } from 'redux/actions/app';
|
||||||
import SelectChannel from './view';
|
import ChannelSelector from './view';
|
||||||
|
|
||||||
const select = state => ({
|
const select = (state) => ({
|
||||||
channels: selectMyChannelClaims(state),
|
channels: selectMyChannelClaims(state),
|
||||||
activeChannelClaim: selectActiveChannelClaim(state),
|
activeChannelClaim: selectActiveChannelClaim(state),
|
||||||
incognito: selectIncognito(state),
|
incognito: selectIncognito(state),
|
||||||
|
@ -13,4 +13,4 @@ const select = state => ({
|
||||||
export default connect(select, {
|
export default connect(select, {
|
||||||
doSetActiveChannel,
|
doSetActiveChannel,
|
||||||
doSetIncognito,
|
doSetIncognito,
|
||||||
})(SelectChannel);
|
})(ChannelSelector);
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
import { connect } from 'react-redux';
|
import { connect } from 'react-redux';
|
||||||
import { doOpenModal } from 'redux/actions/app';
|
import { doOpenModal } from 'redux/actions/app';
|
||||||
import PlaylistAddButton from './view';
|
import CollectionAddButton from './view';
|
||||||
import { makeSelectClaimForUri } from 'lbry-redux';
|
import { makeSelectClaimForUri } from 'lbry-redux';
|
||||||
|
|
||||||
const select = (state, props) => ({
|
const select = (state, props) => ({
|
||||||
|
@ -9,4 +9,4 @@ const select = (state, props) => ({
|
||||||
|
|
||||||
export default connect(select, {
|
export default connect(select, {
|
||||||
doOpenModal,
|
doOpenModal,
|
||||||
})(PlaylistAddButton);
|
})(CollectionAddButton);
|
||||||
|
|
|
@ -19,7 +19,7 @@ import {
|
||||||
} from 'lbry-redux';
|
} from 'lbry-redux';
|
||||||
import { doOpenModal } from 'redux/actions/app';
|
import { doOpenModal } from 'redux/actions/app';
|
||||||
|
|
||||||
import CollectionPage from './view';
|
import CollectionForm from './view';
|
||||||
import { selectActiveChannelClaim, selectIncognito } from 'redux/selectors/app';
|
import { selectActiveChannelClaim, selectIncognito } from 'redux/selectors/app';
|
||||||
|
|
||||||
const select = (state, props) => ({
|
const select = (state, props) => ({
|
||||||
|
@ -50,4 +50,4 @@ const perform = (dispatch) => ({
|
||||||
clearCollectionErrors: () => dispatch({ type: LBRY_REDUX_ACTIONS.CLEAR_COLLECTION_ERRORS }),
|
clearCollectionErrors: () => dispatch({ type: LBRY_REDUX_ACTIONS.CLEAR_COLLECTION_ERRORS }),
|
||||||
});
|
});
|
||||||
|
|
||||||
export default connect(select, perform)(CollectionPage);
|
export default connect(select, perform)(CollectionForm);
|
||||||
|
|
|
@ -15,7 +15,7 @@ type Props = {
|
||||||
collectionId: string,
|
collectionId: string,
|
||||||
};
|
};
|
||||||
|
|
||||||
function ClaimMenuList(props: Props) {
|
function CollectionMenuList(props: Props) {
|
||||||
const { inline = false, collectionId, collectionName, doOpenModal } = props;
|
const { inline = false, collectionId, collectionName, doOpenModal } = props;
|
||||||
|
|
||||||
const { push } = useHistory();
|
const { push } = useHistory();
|
||||||
|
@ -65,4 +65,4 @@ function ClaimMenuList(props: Props) {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
export default ClaimMenuList;
|
export default CollectionMenuList;
|
||||||
|
|
|
@ -14,7 +14,7 @@ type Props = {
|
||||||
collectionItemUrls: Array<string>,
|
collectionItemUrls: Array<string>,
|
||||||
};
|
};
|
||||||
|
|
||||||
function CollectionPreviewTileOverlay(props: Props) {
|
function CollectionPreviewOverlay(props: Props) {
|
||||||
const { collectionItemUrls } = props;
|
const { collectionItemUrls } = props;
|
||||||
|
|
||||||
if (collectionItemUrls && collectionItemUrls.length > 0) {
|
if (collectionItemUrls && collectionItemUrls.length > 0) {
|
||||||
|
@ -39,4 +39,4 @@ function CollectionPreviewTileOverlay(props: Props) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
export default withRouter(CollectionPreviewTileOverlay);
|
export default withRouter(CollectionPreviewOverlay);
|
||||||
|
|
|
@ -22,7 +22,7 @@ type Props = {
|
||||||
supportAmount: number,
|
supportAmount: number,
|
||||||
};
|
};
|
||||||
|
|
||||||
function Comment(props: Props) {
|
function LivestreamComment(props: Props) {
|
||||||
const { claim, uri, authorUri, message, commentIsMine, commentId, stakedLevel, supportAmount } = props;
|
const { claim, uri, authorUri, message, commentIsMine, commentId, stakedLevel, supportAmount } = props;
|
||||||
const [mouseIsHovering, setMouseHover] = React.useState(false);
|
const [mouseIsHovering, setMouseHover] = React.useState(false);
|
||||||
const commentByOwnerOfContent = claim && claim.signing_channel && claim.signing_channel.permanent_url === authorUri;
|
const commentByOwnerOfContent = claim && claim.signing_channel && claim.signing_channel.permanent_url === authorUri;
|
||||||
|
@ -85,4 +85,4 @@ function Comment(props: Props) {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
export default Comment;
|
export default LivestreamComment;
|
||||||
|
|
|
@ -8,7 +8,7 @@ import {
|
||||||
makeSelectSuperChatsForUri,
|
makeSelectSuperChatsForUri,
|
||||||
makeSelectSuperChatTotalAmountForUri,
|
makeSelectSuperChatTotalAmountForUri,
|
||||||
} from 'redux/selectors/comments';
|
} from 'redux/selectors/comments';
|
||||||
import LivestreamFeed from './view';
|
import LivestreamComments from './view';
|
||||||
|
|
||||||
const select = (state, props) => ({
|
const select = (state, props) => ({
|
||||||
claim: makeSelectClaimForUri(props.uri)(state),
|
claim: makeSelectClaimForUri(props.uri)(state),
|
||||||
|
@ -24,4 +24,4 @@ export default connect(select, {
|
||||||
doCommentSocketDisconnect,
|
doCommentSocketDisconnect,
|
||||||
doCommentList,
|
doCommentList,
|
||||||
doSuperChatList,
|
doSuperChatList,
|
||||||
})(LivestreamFeed);
|
})(LivestreamComments);
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
import { connect } from 'react-redux';
|
import { connect } from 'react-redux';
|
||||||
import LivestreamCurrent from './view';
|
import LivestreamList from './view';
|
||||||
|
|
||||||
const select = (state) => ({});
|
const select = (state) => ({});
|
||||||
|
|
||||||
export default connect(select)(LivestreamCurrent);
|
export default connect(select)(LivestreamList);
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
import { connect } from 'react-redux';
|
import { connect } from 'react-redux';
|
||||||
import { doOpenModal } from 'redux/actions/app';
|
import { doOpenModal } from 'redux/actions/app';
|
||||||
import ExternalLink from './view';
|
import MarkdownLink from './view';
|
||||||
|
|
||||||
const select = () => ({});
|
const select = () => ({});
|
||||||
const perform = dispatch => ({
|
const perform = (dispatch) => ({
|
||||||
openModal: (modal, props) => dispatch(doOpenModal(modal, props)),
|
openModal: (modal, props) => dispatch(doOpenModal(modal, props)),
|
||||||
});
|
});
|
||||||
|
|
||||||
export default connect(select, perform)(ExternalLink);
|
export default connect(select, perform)(MarkdownLink);
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
import { connect } from 'react-redux';
|
import { connect } from 'react-redux';
|
||||||
import { SETTINGS } from 'lbry-redux';
|
import { SETTINGS } from 'lbry-redux';
|
||||||
import { makeSelectClientSetting } from 'redux/selectors/settings';
|
import { makeSelectClientSetting } from 'redux/selectors/settings';
|
||||||
import UserSignIn from './view';
|
import NagContinueFirstRun from './view';
|
||||||
|
|
||||||
const select = state => ({
|
const select = (state) => ({
|
||||||
followingAcknowledged: makeSelectClientSetting(SETTINGS.FOLLOWING_ACKNOWLEDGED)(state),
|
followingAcknowledged: makeSelectClientSetting(SETTINGS.FOLLOWING_ACKNOWLEDGED)(state),
|
||||||
firstRunStarted: makeSelectClientSetting(SETTINGS.FIRST_RUN_STARTED)(state),
|
firstRunStarted: makeSelectClientSetting(SETTINGS.FIRST_RUN_STARTED)(state),
|
||||||
});
|
});
|
||||||
|
|
||||||
export default connect(select)(UserSignIn);
|
export default connect(select)(NagContinueFirstRun);
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
import { connect } from 'react-redux';
|
import { connect } from 'react-redux';
|
||||||
import { selectUnseenNotificationCount } from 'redux/selectors/notifications';
|
import { selectUnseenNotificationCount } from 'redux/selectors/notifications';
|
||||||
import { selectUser } from 'redux/selectors/user';
|
import { selectUser } from 'redux/selectors/user';
|
||||||
import NotificationBubble from './view';
|
import NotificationHeaderButton from './view';
|
||||||
|
|
||||||
const select = (state) => ({
|
const select = (state) => ({
|
||||||
unseenCount: selectUnseenNotificationCount(state),
|
unseenCount: selectUnseenNotificationCount(state),
|
||||||
user: selectUser(state),
|
user: selectUser(state),
|
||||||
});
|
});
|
||||||
|
|
||||||
export default connect(select)(NotificationBubble);
|
export default connect(select)(NotificationHeaderButton);
|
||||||
|
|
|
@ -2,7 +2,7 @@ import { connect } from 'react-redux';
|
||||||
import { doChannelSubscribe } from 'redux/actions/subscriptions';
|
import { doChannelSubscribe } from 'redux/actions/subscriptions';
|
||||||
import { doToast } from 'redux/actions/notifications';
|
import { doToast } from 'redux/actions/notifications';
|
||||||
import { makeSelectNotificationsDisabled } from 'redux/selectors/subscriptions';
|
import { makeSelectNotificationsDisabled } from 'redux/selectors/subscriptions';
|
||||||
import SubscribeButton from './view';
|
import NotificationContentChannelMenu from './view';
|
||||||
|
|
||||||
const select = (state, props) => ({
|
const select = (state, props) => ({
|
||||||
notificationsDisabled: makeSelectNotificationsDisabled(props.uri)(state),
|
notificationsDisabled: makeSelectNotificationsDisabled(props.uri)(state),
|
||||||
|
@ -11,4 +11,4 @@ const select = (state, props) => ({
|
||||||
export default connect(select, {
|
export default connect(select, {
|
||||||
doChannelSubscribe,
|
doChannelSubscribe,
|
||||||
doToast,
|
doToast,
|
||||||
})(SubscribeButton);
|
})(NotificationContentChannelMenu);
|
||||||
|
|
|
@ -1,18 +1,18 @@
|
||||||
import { connect } from 'react-redux';
|
import { connect } from 'react-redux';
|
||||||
import { selectPublishFormValues, doUpdatePublishForm } from 'lbry-redux';
|
import { selectPublishFormValues, doUpdatePublishForm } from 'lbry-redux';
|
||||||
import PublishPage from './view';
|
import PublishAdditionalOptions from './view';
|
||||||
import { selectUser, selectAccessToken } from 'redux/selectors/user';
|
import { selectUser, selectAccessToken } from 'redux/selectors/user';
|
||||||
import { doFetchAccessToken } from 'redux/actions/user';
|
import { doFetchAccessToken } from 'redux/actions/user';
|
||||||
|
|
||||||
const select = state => ({
|
const select = (state) => ({
|
||||||
...selectPublishFormValues(state),
|
...selectPublishFormValues(state),
|
||||||
accessToken: selectAccessToken(state),
|
accessToken: selectAccessToken(state),
|
||||||
user: selectUser(state),
|
user: selectUser(state),
|
||||||
});
|
});
|
||||||
|
|
||||||
const perform = dispatch => ({
|
const perform = (dispatch) => ({
|
||||||
updatePublishForm: value => dispatch(doUpdatePublishForm(value)),
|
updatePublishForm: (value) => dispatch(doUpdatePublishForm(value)),
|
||||||
fetchAccessToken: () => dispatch(doFetchAccessToken()),
|
fetchAccessToken: () => dispatch(doFetchAccessToken()),
|
||||||
});
|
});
|
||||||
|
|
||||||
export default connect(select, perform)(PublishPage);
|
export default connect(select, perform)(PublishAdditionalOptions);
|
||||||
|
|
|
@ -4,7 +4,7 @@ import { doFetchRecommendedContent } from 'redux/actions/search';
|
||||||
import { makeSelectRecommendedContentForUri, selectIsSearching } from 'redux/selectors/search';
|
import { makeSelectRecommendedContentForUri, selectIsSearching } from 'redux/selectors/search';
|
||||||
import { selectUserVerifiedEmail } from 'redux/selectors/user';
|
import { selectUserVerifiedEmail } from 'redux/selectors/user';
|
||||||
import { makeSelectNextUnplayedRecommended } from 'redux/selectors/content';
|
import { makeSelectNextUnplayedRecommended } from 'redux/selectors/content';
|
||||||
import RecommendedVideos from './view';
|
import RecommendedContent from './view';
|
||||||
|
|
||||||
const select = (state, props) => ({
|
const select = (state, props) => ({
|
||||||
mature: makeSelectClaimIsNsfw(props.uri)(state),
|
mature: makeSelectClaimIsNsfw(props.uri)(state),
|
||||||
|
@ -19,4 +19,4 @@ const perform = (dispatch) => ({
|
||||||
doFetchRecommendedContent: (uri, mature) => dispatch(doFetchRecommendedContent(uri, mature)),
|
doFetchRecommendedContent: (uri, mature) => dispatch(doFetchRecommendedContent(uri, mature)),
|
||||||
});
|
});
|
||||||
|
|
||||||
export default connect(select, perform)(RecommendedVideos);
|
export default connect(select, perform)(RecommendedContent);
|
||||||
|
|
|
@ -17,10 +17,10 @@ import {
|
||||||
selectFindingFFmpeg,
|
selectFindingFFmpeg,
|
||||||
} from 'redux/selectors/settings';
|
} from 'redux/selectors/settings';
|
||||||
import { doWalletStatus, selectWalletIsEncrypted, SETTINGS } from 'lbry-redux';
|
import { doWalletStatus, selectWalletIsEncrypted, SETTINGS } from 'lbry-redux';
|
||||||
import SettingsPage from './view';
|
import SettingsAdvancedPage from './view';
|
||||||
import { selectUserVerifiedEmail } from 'redux/selectors/user';
|
import { selectUserVerifiedEmail } from 'redux/selectors/user';
|
||||||
|
|
||||||
const select = state => ({
|
const select = (state) => ({
|
||||||
daemonSettings: selectDaemonSettings(state),
|
daemonSettings: selectDaemonSettings(state),
|
||||||
allowAnalytics: selectAllowAnalytics(state),
|
allowAnalytics: selectAllowAnalytics(state),
|
||||||
isAuthenticated: selectUserVerifiedEmail(state),
|
isAuthenticated: selectUserVerifiedEmail(state),
|
||||||
|
@ -34,18 +34,18 @@ const select = state => ({
|
||||||
syncEnabled: makeSelectClientSetting(SETTINGS.ENABLE_SYNC)(state),
|
syncEnabled: makeSelectClientSetting(SETTINGS.ENABLE_SYNC)(state),
|
||||||
});
|
});
|
||||||
|
|
||||||
const perform = dispatch => ({
|
const perform = (dispatch) => ({
|
||||||
setDaemonSetting: (key, value) => dispatch(doSetDaemonSetting(key, value)),
|
setDaemonSetting: (key, value) => dispatch(doSetDaemonSetting(key, value)),
|
||||||
clearDaemonSetting: key => dispatch(doClearDaemonSetting(key)),
|
clearDaemonSetting: (key) => dispatch(doClearDaemonSetting(key)),
|
||||||
clearCache: () => dispatch(doClearCache()),
|
clearCache: () => dispatch(doClearCache()),
|
||||||
setClientSetting: (key, value) => dispatch(doSetClientSetting(key, value)),
|
setClientSetting: (key, value) => dispatch(doSetClientSetting(key, value)),
|
||||||
encryptWallet: () => dispatch(doNotifyEncryptWallet()),
|
encryptWallet: () => dispatch(doNotifyEncryptWallet()),
|
||||||
decryptWallet: () => dispatch(doNotifyDecryptWallet()),
|
decryptWallet: () => dispatch(doNotifyDecryptWallet()),
|
||||||
updateWalletStatus: () => dispatch(doWalletStatus()),
|
updateWalletStatus: () => dispatch(doWalletStatus()),
|
||||||
confirmForgetPassword: modalProps => dispatch(doNotifyForgetPassword(modalProps)),
|
confirmForgetPassword: (modalProps) => dispatch(doNotifyForgetPassword(modalProps)),
|
||||||
findFFmpeg: () => dispatch(doFindFFmpeg()),
|
findFFmpeg: () => dispatch(doFindFFmpeg()),
|
||||||
enterSettings: () => dispatch(doEnterSettingsPage()),
|
enterSettings: () => dispatch(doEnterSettingsPage()),
|
||||||
exitSettings: () => dispatch(doExitSettingsPage()),
|
exitSettings: () => dispatch(doExitSettingsPage()),
|
||||||
});
|
});
|
||||||
|
|
||||||
export default connect(select, perform)(SettingsPage);
|
export default connect(select, perform)(SettingsAdvancedPage);
|
||||||
|
|
|
@ -38,7 +38,7 @@ type DaemonSettings = {
|
||||||
|
|
||||||
type Props = {
|
type Props = {
|
||||||
setDaemonSetting: (string, ?SetDaemonSettingArg) => void,
|
setDaemonSetting: (string, ?SetDaemonSettingArg) => void,
|
||||||
clearDaemonSetting: string => void,
|
clearDaemonSetting: (string) => void,
|
||||||
setClientSetting: (string, SetDaemonSettingArg) => void,
|
setClientSetting: (string, SetDaemonSettingArg) => void,
|
||||||
daemonSettings: DaemonSettings,
|
daemonSettings: DaemonSettings,
|
||||||
isAuthenticated: boolean,
|
isAuthenticated: boolean,
|
||||||
|
@ -64,7 +64,7 @@ type State = {
|
||||||
storedPassword: boolean,
|
storedPassword: boolean,
|
||||||
};
|
};
|
||||||
|
|
||||||
class SettingsPage extends React.PureComponent<Props, State> {
|
class SettingsAdvancedPage extends React.PureComponent<Props, State> {
|
||||||
constructor(props: Props) {
|
constructor(props: Props) {
|
||||||
super(props);
|
super(props);
|
||||||
|
|
||||||
|
@ -98,7 +98,7 @@ class SettingsPage extends React.PureComponent<Props, State> {
|
||||||
|
|
||||||
if (isAuthenticated || !IS_WEB) {
|
if (isAuthenticated || !IS_WEB) {
|
||||||
this.props.updateWalletStatus();
|
this.props.updateWalletStatus();
|
||||||
getPasswordFromCookie().then(p => {
|
getPasswordFromCookie().then((p) => {
|
||||||
if (typeof p === 'string') {
|
if (typeof p === 'string') {
|
||||||
this.setState({ storedPassword: true });
|
this.setState({ storedPassword: true });
|
||||||
}
|
}
|
||||||
|
@ -493,7 +493,7 @@ class SettingsPage extends React.PureComponent<Props, State> {
|
||||||
onChange={this.onMaxConnectionsChange}
|
onChange={this.onMaxConnectionsChange}
|
||||||
value={daemonSettings.max_connections_per_download}
|
value={daemonSettings.max_connections_per_download}
|
||||||
>
|
>
|
||||||
{connectionOptions.map(connectionOption => (
|
{connectionOptions.map((connectionOption) => (
|
||||||
<option key={connectionOption} value={connectionOption}>
|
<option key={connectionOption} value={connectionOption}>
|
||||||
{connectionOption}
|
{connectionOption}
|
||||||
</option>
|
</option>
|
||||||
|
@ -521,4 +521,4 @@ class SettingsPage extends React.PureComponent<Props, State> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export default SettingsPage;
|
export default SettingsAdvancedPage;
|
||||||
|
|
|
@ -2,15 +2,15 @@ import { connect } from 'react-redux';
|
||||||
import { doSetClientSetting } from 'redux/actions/settings';
|
import { doSetClientSetting } from 'redux/actions/settings';
|
||||||
import { selectosNotificationsEnabled } from 'redux/selectors/settings';
|
import { selectosNotificationsEnabled } from 'redux/selectors/settings';
|
||||||
import { selectUserVerifiedEmail } from 'redux/selectors/user';
|
import { selectUserVerifiedEmail } from 'redux/selectors/user';
|
||||||
import SettingsPage from './view';
|
import NotificationSettingsPage from './view';
|
||||||
|
|
||||||
const select = state => ({
|
const select = (state) => ({
|
||||||
osNotificationsEnabled: selectosNotificationsEnabled(state),
|
osNotificationsEnabled: selectosNotificationsEnabled(state),
|
||||||
isAuthenticated: Boolean(selectUserVerifiedEmail(state)),
|
isAuthenticated: Boolean(selectUserVerifiedEmail(state)),
|
||||||
});
|
});
|
||||||
|
|
||||||
const perform = dispatch => ({
|
const perform = (dispatch) => ({
|
||||||
setClientSetting: (key, value) => dispatch(doSetClientSetting(key, value)),
|
setClientSetting: (key, value) => dispatch(doSetClientSetting(key, value)),
|
||||||
});
|
});
|
||||||
|
|
||||||
export default connect(select, perform)(SettingsPage);
|
export default connect(select, perform)(NotificationSettingsPage);
|
||||||
|
|
|
@ -3,16 +3,16 @@ import { doSetClientSetting } from 'redux/actions/settings';
|
||||||
import { selectosNotificationsEnabled } from 'redux/selectors/settings';
|
import { selectosNotificationsEnabled } from 'redux/selectors/settings';
|
||||||
import { selectUserVerifiedEmail, selectUserEmail } from 'redux/selectors/user';
|
import { selectUserVerifiedEmail, selectUserEmail } from 'redux/selectors/user';
|
||||||
|
|
||||||
import SettingsPage from './view';
|
import SettingsStripeCard from './view';
|
||||||
|
|
||||||
const select = state => ({
|
const select = (state) => ({
|
||||||
osNotificationsEnabled: selectosNotificationsEnabled(state),
|
osNotificationsEnabled: selectosNotificationsEnabled(state),
|
||||||
isAuthenticated: Boolean(selectUserVerifiedEmail(state)),
|
isAuthenticated: Boolean(selectUserVerifiedEmail(state)),
|
||||||
email: selectUserEmail(state),
|
email: selectUserEmail(state),
|
||||||
});
|
});
|
||||||
|
|
||||||
const perform = dispatch => ({
|
const perform = (dispatch) => ({
|
||||||
setClientSetting: (key, value) => dispatch(doSetClientSetting(key, value)),
|
setClientSetting: (key, value) => dispatch(doSetClientSetting(key, value)),
|
||||||
});
|
});
|
||||||
|
|
||||||
export default connect(select, perform)(SettingsPage);
|
export default connect(select, perform)(SettingsStripeCard);
|
||||||
|
|
|
@ -35,7 +35,7 @@ if (STRIPE_PUBLIC_KEY.indexOf('pk_live') > -1) {
|
||||||
// scriptFailedToLoad: boolean,
|
// scriptFailedToLoad: boolean,
|
||||||
// };
|
// };
|
||||||
|
|
||||||
class CardVerify extends React.Component<Props, State> {
|
class SettingsStripeCard extends React.Component<Props, State> {
|
||||||
constructor(props) {
|
constructor(props) {
|
||||||
// :Props
|
// :Props
|
||||||
super(props);
|
super(props);
|
||||||
|
@ -472,6 +472,6 @@ class CardVerify extends React.Component<Props, State> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export default CardVerify;
|
export default SettingsStripeCard;
|
||||||
/* eslint-enable no-undef */
|
/* eslint-enable no-undef */
|
||||||
/* eslint-enable react/prop-types */
|
/* eslint-enable react/prop-types */
|
||||||
|
|
Loading…
Reference in a new issue