diff --git a/ui/component/claimRepostButton/view.jsx b/ui/component/claimRepostButton/view.jsx
index 57aa58850..ce7f57e5f 100644
--- a/ui/component/claimRepostButton/view.jsx
+++ b/ui/component/claimRepostButton/view.jsx
@@ -6,15 +6,15 @@ import React from 'react';
import Button from 'component/button';
type Props = {
- uri: string,
- claim: StreamClaim,
- hasChannels: boolean,
- doOpenModal: (string, {}) => void,
- doToast: ({ message: string }) => void,
+ uri: string,
+ claim: StreamClaim,
+ hasChannels: boolean,
+ doOpenModal: (string, {}) => void,
+ doToast: ({ message: string }) => void,
};
export default function ClaimRepostButton(props: Props) {
- const { uri, claim, hasChannels, doOpenModal, doToast } = props;
+ const { uri, claim, hasChannels, doOpenModal, doToast } = props;
const [contentUri, setContentUri] = React.useState('');
const [repostUri, setRepostUri] = React.useState('');
@@ -27,7 +27,6 @@ export default function ClaimRepostButton(props: Props) {
claim.meta.reposted > 1 ? __(`%repost_total% Reposts`, { repost_total: claim.meta.reposted }) : __('Repost')
}
description={__('Repost')}
- requiresAuth={IS_WEB}
onClick={() => {
if (!hasChannels) {
doToast({
diff --git a/ui/component/claimSupportButton/view.jsx b/ui/component/claimSupportButton/view.jsx
index b867b4b07..5d6e94c88 100644
--- a/ui/component/claimSupportButton/view.jsx
+++ b/ui/component/claimSupportButton/view.jsx
@@ -28,7 +28,6 @@ export default function ClaimSupportButton(props: Props) {
icon={ICONS.LBC}
iconSize={fileAction ? 22 : undefined}
label={isRepost ? __('Support Repost') : __('Support --[button to support a claim]--')}
- requiresAuth={IS_WEB}
title={__('Support this claim')}
onClick={() => doOpenModal(MODALS.SEND_TIP, { uri, isSupport: true })}
/>
diff --git a/ui/component/collectionEdit/view.jsx b/ui/component/collectionEdit/view.jsx
index 108e21493..824a33878 100644
--- a/ui/component/collectionEdit/view.jsx
+++ b/ui/component/collectionEdit/view.jsx
@@ -1,5 +1,4 @@
// @flow
-import { DOMAIN } from 'config';
import React from 'react';
import classnames from 'classnames';
import Button from 'component/button';
@@ -90,7 +89,7 @@ function CollectionForm(props: Props) {
onDone,
} = props;
const activeChannelName = activeChannelClaim && activeChannelClaim.name;
- let prefix = IS_WEB ? `${DOMAIN}/` : 'lbry://';
+ let prefix = 'lbry://';
if (activeChannelName && !incognito) {
prefix += `${activeChannelName}/`;
}
diff --git a/ui/component/comment/index.js b/ui/component/comment/index.js
index b5c336522..81744b65f 100644
--- a/ui/component/comment/index.js
+++ b/ui/component/comment/index.js
@@ -9,7 +9,6 @@ import { doCommentUpdate, doCommentList } from 'redux/actions/comments';
import { makeSelectChannelIsMuted } from 'redux/selectors/blocked';
import { doToast } from 'redux/actions/notifications';
import { doSetPlayingUri } from 'redux/actions/content';
-import { selectUserVerifiedEmail } from 'redux/selectors/user';
import {
selectLinkedCommentAncestors,
selectOthersReactsForComment,
@@ -28,7 +27,7 @@ const select = (state, props) => {
claim: makeSelectClaimForUri(props.uri)(state),
thumbnail: props.authorUri && makeSelectThumbnailForUri(props.authorUri)(state),
channelIsBlocked: props.authorUri && makeSelectChannelIsMuted(props.authorUri)(state),
- commentingEnabled: IS_WEB ? Boolean(selectUserVerifiedEmail(state)) : true,
+ commentingEnabled: true,
othersReacts: selectOthersReactsForComment(state, reactionKey),
activeChannelClaim,
myChannels: selectMyChannelClaims(state),
diff --git a/ui/component/comment/view.jsx b/ui/component/comment/view.jsx
index 06afcf1f2..85c7f980d 100644
--- a/ui/component/comment/view.jsx
+++ b/ui/component/comment/view.jsx
@@ -314,13 +314,7 @@ function Comment(props: Props) {
textAreaMaxLength={FF_MAX_CHARS_IN_COMMENT}
/>
-
+
@@ -354,7 +348,6 @@ function Comment(props: Props) {
{threadDepth !== 0 && (
);
@@ -553,7 +553,6 @@ export function CommentCreate(props: Props) {
icon={activeTab === TAB_LBC ? ICONS.LBC : ICONS.FINANCE}
label={__('Review')}
onClick={() => setIsReviewingSupportComment(true)}
- requiresAuth={IS_WEB}
/>
)}
{!supportDisabled && !claimIsMine && (
diff --git a/ui/component/commentMenuList/index.js b/ui/component/commentMenuList/index.js
index ce91b592d..0db3c6465 100644
--- a/ui/component/commentMenuList/index.js
+++ b/ui/component/commentMenuList/index.js
@@ -3,7 +3,6 @@ import { doChannelMute } from 'redux/actions/blocked';
import { doCommentPin, doCommentModAddDelegate } from 'redux/actions/comments';
import { doOpenModal } from 'redux/actions/app';
import { doSetPlayingUri } from 'redux/actions/content';
-import { doToast } from 'redux/actions/notifications';
import { selectClaimIsMine, selectClaimForUri } from 'redux/selectors/claims';
import { selectActiveChannelClaim } from 'redux/selectors/app';
import { selectModerationDelegatorsById } from 'redux/selectors/comments';
@@ -28,7 +27,6 @@ const perform = (dispatch) => ({
pinComment: (commentId, claimId, remove) => dispatch(doCommentPin(commentId, claimId, remove)),
commentModAddDelegate: (modChanId, modChanName, creatorChannelClaim) =>
dispatch(doCommentModAddDelegate(modChanId, modChanName, creatorChannelClaim, true)),
- doToast: (props) => dispatch(doToast(props)),
});
export default connect(select, perform)(CommentMenuList);
diff --git a/ui/component/commentMenuList/view.jsx b/ui/component/commentMenuList/view.jsx
index 66170f6ef..83994eb0a 100644
--- a/ui/component/commentMenuList/view.jsx
+++ b/ui/component/commentMenuList/view.jsx
@@ -2,8 +2,6 @@
import { getChannelFromClaim } from 'util/claim';
import { MenuList, MenuItem } from '@reach/menu-button';
import { parseURI } from 'util/lbryURI';
-import { URL } from 'config';
-import { useHistory } from 'react-router';
import * as ICONS from 'constants/icons';
import * as MODALS from 'constants/modal_types';
import ChannelThumbnail from 'component/channelThumbnail';
@@ -54,7 +52,6 @@ function CommentMenuList(props: Props) {
disableEdit,
disableRemove,
supportAmount,
- doToast,
handleEditComment,
openModal,
clearPlayingUri,
@@ -64,10 +61,6 @@ function CommentMenuList(props: Props) {
setQuickReply,
} = props;
- const {
- location: { pathname, search },
- } = useHistory();
-
const contentChannelClaim = getChannelFromClaim(claim);
const activeModeratorInfo = activeChannelClaim && moderationDelegatorsById[activeChannelClaim.claim_id];
const activeChannelIsCreator = activeChannelClaim && activeChannelClaim.permanent_url === contentChannelPermanentUrl;
@@ -151,15 +144,6 @@ function CommentMenuList(props: Props) {
);
}
- function handleCopyCommentLink() {
- const urlParams = new URLSearchParams(search);
- urlParams.delete('lc');
- urlParams.append('lc', commentId);
- navigator.clipboard
- .writeText(`${URL}${pathname}?${urlParams.toString()}`)
- .then(() => doToast({ message: __('Link copied.') }));
- }
-
return (
{activeChannelIsCreator && {__('Creator tools')}
}
@@ -229,15 +213,6 @@ function CommentMenuList(props: Props) {
>
)}
- {IS_WEB && (
-
- )}
-
{activeChannelClaim && (
diff --git a/ui/component/commentReactions/view.jsx b/ui/component/commentReactions/view.jsx
index 8949b3d60..af3df9507 100644
--- a/ui/component/commentReactions/view.jsx
+++ b/ui/component/commentReactions/view.jsx
@@ -99,7 +99,6 @@ export default function CommentReactions(props: Props) {
return (
<>
{getCountForReact(REACTION_TYPES.LIKE)}}
/>
{
@@ -16,7 +15,7 @@ const select = (state, props) => {
fetchedReplies,
resolvedReplies,
claimIsMine: makeSelectClaimIsMine(props.uri)(state),
- userCanComment: IS_WEB ? Boolean(selectUserVerifiedEmail(state)) : true,
+ userCanComment: true,
myChannels: selectMyChannelClaims(state),
isFetchingByParentId: selectIsFetchingCommentsByParentId(state),
};
diff --git a/ui/component/common/hidden-nsfw.jsx b/ui/component/common/hidden-nsfw.jsx
index 8214dcf7e..b1f945a47 100644
--- a/ui/component/common/hidden-nsfw.jsx
+++ b/ui/component/common/hidden-nsfw.jsx
@@ -19,9 +19,7 @@ export default function HiddenNsfw(props: Props) {
- ),
+ settings: ,
}}
>
Content may be hidden on this %type% because of your %settings%.
diff --git a/ui/component/errorBoundary/view.jsx b/ui/component/errorBoundary/view.jsx
index e8e6b9619..1919e486d 100644
--- a/ui/component/errorBoundary/view.jsx
+++ b/ui/component/errorBoundary/view.jsx
@@ -61,9 +61,9 @@ class ErrorBoundary extends React.Component {
render() {
const { hasError } = this.state;
- const { sentryEventId, desktopErrorReported } = this.state;
+ const { desktopErrorReported } = this.state;
- const errorWasReported = IS_WEB ? sentryEventId !== null : desktopErrorReported;
+ const errorWasReported = desktopErrorReported;
if (hasError) {
return (
diff --git a/ui/component/fileReactions/view.jsx b/ui/component/fileReactions/view.jsx
index a07534bfd..d275a0088 100644
--- a/ui/component/fileReactions/view.jsx
+++ b/ui/component/fileReactions/view.jsx
@@ -82,7 +82,6 @@ function FileReactions(props: Props) {
onClick={() => doReactionLike(uri)}
/>
{
renderMode: makeSelectFileRenderModeForUri(props.uri)(state),
claim: makeSelectClaimForUri(props.uri)(state),
claimWasPurchased: makeSelectClaimWasPurchased(props.uri)(state),
- authenticated: selectUserVerifiedEmail(state),
collectionId,
};
};
diff --git a/ui/component/fileRenderInitiator/view.jsx b/ui/component/fileRenderInitiator/view.jsx
index a654ee967..38f1ecee5 100644
--- a/ui/component/fileRenderInitiator/view.jsx
+++ b/ui/component/fileRenderInitiator/view.jsx
@@ -31,7 +31,6 @@ type Props = {
renderMode: string,
claim: StreamClaim,
claimWasPurchased: boolean,
- authenticated: boolean,
videoTheaterMode: boolean,
collectionId: string,
};
@@ -50,7 +49,6 @@ export default function FileRenderInitiator(props: Props) {
renderMode,
costInfo,
claimWasPurchased,
- authenticated,
videoTheaterMode,
collectionId,
} = props;
@@ -91,10 +89,6 @@ export default function FileRenderInitiator(props: Props) {
}
}, [claimThumbnail, thumbnail]);
- function doAuthRedirect() {
- history.push(`/$/${PAGES.AUTH}?redirect=${encodeURIComponent(location.pathname)}`);
- }
-
// Wrap this in useCallback because we need to use it to the keyboard effect
// If we don't a new instance will be created for every render and react will think the dependencies have changed, which will add/remove the listener for every render
const viewFile = useCallback(
@@ -148,14 +142,12 @@ export default function FileRenderInitiator(props: Props) {
}
}
- const showAppNag = IS_WEB && RENDER_MODES.UNSUPPORTED_IN_THIS_APP.includes(renderMode);
- const disabled = showAppNag || (!fileInfo && insufficientCredits && !claimWasPurchased);
- const shouldRedirect = IS_WEB && !authenticated && !isFree;
+ const disabled = !fileInfo && insufficientCredits && !claimWasPurchased;
return (
- {showAppNag && (
-
- )}
- {!claimWasPurchased && insufficientCredits && !showAppNag && (
+ {!claimWasPurchased && insufficientCredits && (
{
}
}
- const loginButtons = (
-
-
-
-
- );
-
type BalanceButtonProps = { className: string };
const BalanceButton = (balanceButtonProps: BalanceButtonProps) => (
{
icon={ICONS.ARROW_LEFT}
/>
{backTitle && {isMobile ? simpleBackTitle || backTitle : backTitle}
}
- {authenticated || !IS_WEB ? (
-
- ) : (
- loginButtons
- )}
+
) : (
<>
@@ -288,68 +271,61 @@ const Header = (props: Props) => {
{!authHeader && !backout ? (
-
- {(!IS_WEB || authenticated) && (
-
- )}
-
- {IS_WEB && !authenticated && loginButtons}
-
- {(authenticated || !IS_WEB) && (
-