removeNags

This commit is contained in:
zeppi 2021-08-27 09:27:49 -04:00 committed by jessopb
parent 79be67831b
commit d4bab45809
3 changed files with 2 additions and 67 deletions

View file

@ -18,7 +18,6 @@ const select = (state) => ({
daemonSettings: selectDaemonSettings(state),
emailExists: selectEmailAlreadyExists(state),
user: selectUser(state),
currentTheme: makeSelectClientSetting(SETTINGS.THEME)(state),
});
const perform = (dispatch) => ({

View file

@ -12,8 +12,6 @@ import Card from 'component/common/card';
import ErrorText from 'component/common/error-text';
import Nag from 'component/common/nag';
import classnames from 'classnames';
import OdyseeLogoWithWhiteText from 'component/header/odysee_white.png';
import OdyseeLogoWithText from 'component/header/odysee.png';
import LoginGraphic from 'component/loginGraphic';
type Props = {
@ -29,7 +27,6 @@ type Props = {
clearEmailEntry: () => void,
interestedInYoutubSync: boolean,
doToggleInterestedInYoutubeSync: () => void,
currentTheme: string,
};
function UserEmailNew(props: Props) {
@ -44,7 +41,6 @@ function UserEmailNew(props: Props) {
emailExists,
interestedInYoutubSync,
doToggleInterestedInYoutubeSync,
currentTheme,
} = props;
const { share_usage_data: shareUsageData } = daemonSettings;
const { push, location } = useHistory();
@ -190,39 +186,9 @@ function UserEmailNew(props: Props) {
</Form>
</div>
}
nag={
<>
{IS_WEB && DOMAIN === 'lbry.tv' && (
<Nag
relative
message={
<I18nMessage
tokens={{
odysee: (
<Button button="link" label={__('odysee.com')} href="https://odysee.com?src=lbrytv-retired" />
),
}}
>
{__(
'lbry.tv is being retired in favor of %odysee% and new sign ups are disabled. Sign up on %odysee% instead'
)}
</I18nMessage>
}
/>
)}
{errorMessage && <Nag type="error" relative message={<ErrorText>{errorMessage}</ErrorText>} />}
</>
}
nag={<>{errorMessage && <Nag type="error" relative message={<ErrorText>{errorMessage}</ErrorText>} />}</>}
secondPane={SIMPLE_SITE && <LoginGraphic />}
/>
{IS_WEB && DOMAIN === 'lbry.tv' && (
<div className="signup__odysee-logo">
<Button href="https://odysee.com?src=lbrytv-retired">
<img src={currentTheme === 'light' ? OdyseeLogoWithText : OdyseeLogoWithWhiteText} />
</Button>
</div>
)}
</div>
);
}

View file

@ -1,15 +1,13 @@
// @flow
import * as ICONS from 'constants/icons';
import * as PAGES from 'constants/pages';
import { SITE_NAME, SIMPLE_SITE, DOMAIN, ENABLE_NO_SOURCE_CLAIMS } from 'config';
import { SITE_NAME, SIMPLE_SITE, ENABLE_NO_SOURCE_CLAIMS } from 'config';
import React from 'react';
import Page from 'component/page';
import Button from 'component/button';
import ClaimTilesDiscover from 'component/claimTilesDiscover';
import ClaimPreviewTile from 'component/claimPreviewTile';
import Icon from 'component/common/icon';
import I18nMessage from 'component/i18nMessage';
import LbcSymbol from 'component/common/lbc-symbol';
import WaitUntilOnPage from 'component/common/wait-until-on-page';
import useGetLivestreams from 'effects/use-get-livestreams';
import { GetLinksData } from 'util/buildHomepage';
@ -99,34 +97,6 @@ function HomePage(props: Props) {
return (
<Page fullWidthPage>
{IS_WEB && DOMAIN === 'lbry.tv' && (
<div className="notice-message--loud">
<h1 className="section__title">
<I18nMessage
tokens={{
odysee: <Button label={__('odysee.com')} button="link" href="https://odysee.com?src=lbrytv-retired" />,
}}
>
lbry.tv is being retired in favor of %odysee%
</I18nMessage>
</h1>
<p className="section__subtitle">
<I18nMessage
tokens={{
desktop_app: (
<Button label={__('desktop app')} button="link" href="https://lbry.com/get?src=lbrytv-retired" />
),
odysee: <Button label={__('odysee.com')} button="link" href="https://odysee.com?src=lbrytv-retired" />,
credits: <LbcSymbol />,
}}
>
You will have to switch to the %desktop_app% or %odysee% in the near future. Your existing login details
will work on %odysee% and all of your %credits% and other settings will be there.
</I18nMessage>
</p>
</div>
)}
{!SIMPLE_SITE && (authenticated || !IS_WEB) && !subscribedChannels.length && (
<div className="notice-message">
<h1 className="section__title">