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

A few tweaks

Browse source
This commit is contained in:
Thomas Zarebczan 2020-05-21 21:19:01 -04:00 • committed by Sean Yesmunt
parent 21f9fc7b31
commit 6d888b5121
7 changed files with 55 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
static/app-strings.json
View file

@ -1214,5 +1214,6 @@
"%duration% minutes ago": "%duration% minutes ago",
"%duration% minute ago": "%duration% minute ago",
"%duration% seconds ago": "%duration% seconds ago",
"%duration% second ago": "%duration% second ago"
}
"%duration% second ago": "%duration% second ago",
"Check your rewards page to see if you qualify for paid content reimbursement. Only content in this section qualifies.": "Check your rewards page to see if you qualify for paid content reimbursement. Only content in this section qualifies."
}

6
ui/component/creatorAnalytics/view.jsx
View file

@ -72,7 +72,7 @@ export default function CreatorAnalytics(props: Props) {
subtitle={
error === GENERIC_ERROR
? __(
'There are no stats for this channel. Make sure you are signed in with the correct email and have data sharing turned on.'
'There are no stats for this channel yet, it will take a few views. Make sure you are signed in with the correct email and have data sharing turned on.'
)
: __(
"You are not able to see this channel's stats. Make sure you are signed in with the correct email and have data sharing turned on."
@ -170,7 +170,7 @@ export default function CreatorAnalytics(props: Props) {
{stats.VideoURITopNew ? (
<Card
className="section"
title={__('Your Recent Content')}
title={__('Most Viewed Recent Content')}
body={
<React.Fragment>
<div className="card--inline">
@ -217,7 +217,7 @@ export default function CreatorAnalytics(props: Props) {
<Card
className="section"
title={__('Most Viewed Content')}
title={__('Most Viewed Content All Time')}
body={
<React.Fragment>
<div className="card--inline">

6
ui/component/transactionListTable/internal/txo-list-item.jsx
View file

@ -30,12 +30,12 @@ class TxoListItem extends React.PureComponent<Props, State> {
(this: any).getLink = this.getLink.bind(this);
}
getLink(type: string) {
getLink(type: string, tip: boolean) {
const { abandonState } = this.state;
if (this.state.abandonState === ABANDON_STATES.PENDING) {
return <Spinner type={'small'} />;
}
if (type === TXO.SUPPORT) {
if (tip && type === TXO.SUPPORT) {
return (
<Button
disabled={abandonState === ABANDON_STATES.DONE || abandonState === ABANDON_STATES.ERROR}
@ -123,7 +123,7 @@ class TxoListItem extends React.PureComponent<Props, State> {
(valueType && ((valueType === 'stream' && __('Publish')) || __(toCapitalCase(valueType)))) ||
(type && __(toCapitalCase(type)))}
</span>{' '}
{isRevokeable && this.getLink(type)}
{isRevokeable && this.getLink(type, isTip)}
</td>
<td>
{forClaim && <Button button="link" navigate={uri} label={claimName} disabled={!date} />}

1
ui/component/walletBalance/view.jsx
View file

@ -75,6 +75,7 @@ const WalletBalance = (props: Props) => {
<CreditAmount badge={false} amount={tipsBalance} precision={8} />
</strong>{' '}
{__('earned and bound in tips')}
<HelpLink href="https://lbry.com/faq/tipping" />
</h2>
</div>
</div>

26
ui/modal/modalRevokeClaim/view.jsx
View file

@ -17,26 +17,26 @@ type Props = {
export default function ModalRevokeClaim(props: Props) {
const { tx, claim, closeModal, abandonTxo, abandonClaim, cb } = props;
const { value_type: valueType, type, normalized_name: name } = tx || claim;
const { value_type: valueType, type, normalized_name: name, is_my_input: isSupport } = tx || claim;
const [channelName, setChannelName] = useState('');
function getButtonLabel(type: string) {
if (type === txnTypes.TIP) {
return 'Confirm Tip Unlock';
} else if (type === txnTypes.SUPPORT) {
function getButtonLabel(type: string, isSupport: boolean) {
if (isSupport && type === txnTypes.SUPPORT) {
return 'Confirm Support Revoke';
} else if (type === txnTypes.SUPPORT) {
return 'Confirm Tip Unlock';
}
return 'Confirm Claim Revoke';
}
function getMsgBody(type: string, name: string) {
if (type === txnTypes.TIP) {
function getMsgBody(type: string, isSupport: boolean, name: string) {
if (isSupport && type === txnTypes.SUPPORT) {
return (
<React.Fragment>
<p>{__('Are you sure you want to unlock these credits?')}</p>
<p>{__('Are you sure you want to remove this support?')}</p>
<p>
{__(
'These credits are permanently yours and can be unlocked at any time. Unlocking them allows you to spend them, but can hurt the performance of your content in lookups and search results. It is recommended you leave tips locked until you need or want to spend them.'
"These credits are permanently yours and can be removed at any time. Removing this support will reduce the claim's discoverability and return the LBC to your spendable balance."
)}
</p>
</React.Fragment>
@ -44,10 +44,10 @@ export default function ModalRevokeClaim(props: Props) {
} else if (type === txnTypes.SUPPORT) {
return (
<React.Fragment>
<p>{__('Are you sure you want to remove this support?')}</p>
<p>{__('Are you sure you want to unlock these credits?')}</p>
<p>
{__(
"These credits are permanently yours and can be removed at any time. Removing this support will reduce the claim's discoverability and return the LBC to your spendable balance."
'These credits are permanently yours and can be unlocked at any time. Unlocking them allows you to spend them, but can hurt the performance of your content in lookups and search results. It is recommended you leave tips locked until you need or want to spend them.'
)}
</p>
</React.Fragment>
@ -88,7 +88,7 @@ export default function ModalRevokeClaim(props: Props) {
closeModal();
}
const label = getButtonLabel(type);
const label = getButtonLabel(type, isSupport);
return (
<Modal
@ -102,7 +102,7 @@ export default function ModalRevokeClaim(props: Props) {
>
<Card
title={label}
body={getMsgBody(type, name)}
body={getMsgBody(type, isSupport, name)}
actions={
<div className="section__actions">
<Button button="primary" label={label} onClick={revokeClaim} />

15
ui/page/home/view.jsx
View file

@ -1,5 +1,6 @@
// @flow
import * as ICONS from 'constants/icons';
import Icon from 'component/common/icon';
import * as PAGES from 'constants/pages';
import * as CS from 'constants/claim_search';
import React from 'react';
@ -67,6 +68,7 @@ const PAID_BETA_CHANNEL_IDS_KEY = [
'8972a1bd06de5186e5e89292b05aac8aaa817791',
'5da63df97c8255ae94a88940695b8471657dd5a1',
'f3da2196b5151570d980b34d311ee0973225a68e',
'7644fdb8342624f6c647c79de25610801573fa68',
];
type Props = {
@ -94,10 +96,21 @@ function HomePage(props: Props) {
link: `/$/${PAGES.DISCOVER}?${CS.TAGS_KEY}=lbrytvpaidbeta&fee_amount=>0&${CS.CLAIM_TYPE}=${CS.CLAIM_STREAM}&${
CS.CHANNEL_IDS_KEY
}=${PAID_BETA_CHANNEL_IDS_KEY.join(',')}`,
help: (
<div className="claim-grid__help">
<Icon
icon={ICONS.HELP}
tooltip
customTooltipText={__(
'Check your rewards page to see if you qualify for paid content reimbursement. Only content in this section qualifies.'
)}
/>
</div>
),
options: {
feeAmount: '>0',
claimType: ['stream'],
tags: ['lbrytvpaidbeta'],
tags: ['lbrytvpaidbeta', 'lbry tvpaidbeta'],
pageSize: 8,
channelIds: PAID_BETA_CHANNEL_IDS_KEY,
},

24
ui/page/rewards/view.jsx
View file

@ -49,15 +49,27 @@ class RewardsPage extends PureComponent<Props> {
body={
<React.Fragment>
<p>
{__('This account must undergo review before you can participate in the rewards program.')}{' '}
{__('This can take anywhere from several minutes to several days.')}
{__(
'This account must undergo review before you can participate in the rewards program. Not all users and regions may qualify.'
)}{' '}
{__('This can take anywhere from a few hours to several days. Please be patient.')}
</p>
<p>{__('We apologize for this inconvenience, but have added this additional step to prevent fraud.')}</p>
<p>
{`${__('If you continue to see this message, send us an email to help@lbry.com.')} ${__(
'Please enjoy free content in the meantime!'
)}`}
{__(
'We apologize for this inconvenience, but have added this additional step to prevent abuse. Users on VPN or shared connections will continue to see this message and are not not eligible for Rewards.'
)}
</p>
<p>
<I18nMessage
tokens={{
rewards_faq: <Button button="link" label={__('Rewards FAQ')} href="https://lbry.com/faq/support" />,
}}
>
Please review the %rewards_faq% for eligibility, and send us an email to help@lbry.com if you continue
to see this message. You can continue to use LBRY without this feature.
</I18nMessage>
{`${__('Enjoy all the awesome free content in the meantime!')}`}
</p>
</React.Fragment>
}