diff --git a/src/ui/component/cardVerify/view.jsx b/src/ui/component/cardVerify/view.jsx index 47a511075..5531a1283 100644 --- a/src/ui/component/cardVerify/view.jsx +++ b/src/ui/component/cardVerify/view.jsx @@ -98,7 +98,7 @@ class CardVerify extends React.Component { componentWillUnmount() { if (this.loadPromise) { - this.loadPromise.cancel(); + this.loadPromise.reject(); } if (CardVerify.stripeHandler && this.state.open) { CardVerify.stripeHandler.close(); diff --git a/src/ui/component/claimListDiscover/view.jsx b/src/ui/component/claimListDiscover/view.jsx index b20b3ec5d..ed4dfed6a 100644 --- a/src/ui/component/claimListDiscover/view.jsx +++ b/src/ui/component/claimListDiscover/view.jsx @@ -57,7 +57,7 @@ function ClaimListDiscover(props: Props) { channel_ids?: Array, release_time?: string, not_tags?: Array, - } = { page_size: PAGE_SIZE, page }; + } = { page_size: PAGE_SIZE, page, no_totals: true }; const newTags = tagsString.split(','); const newChannelIds = channelsIdString.split(','); diff --git a/src/ui/component/commentCreate/view.jsx b/src/ui/component/commentCreate/view.jsx index 846d371bf..c1738ecba 100644 --- a/src/ui/component/commentCreate/view.jsx +++ b/src/ui/component/commentCreate/view.jsx @@ -49,6 +49,11 @@ export function CommentCreate(props: Props) { 'During the alpha, comments are not decentralized or censorship resistant (but we repeat ourselves).' )} +
  • + {__( + 'For the initial release, deleting or editing comments is not possible. Please be mindful of this when posting.' + )} +
  • {__( 'When the alpha ends, we will attempt to transition comments, but do not promise to do so. Any transition will likely involve publishing previous comments under a single archive handle.' diff --git a/src/ui/component/common/icon-custom.jsx b/src/ui/component/common/icon-custom.jsx index 059f51491..4057af42e 100644 --- a/src/ui/component/common/icon-custom.jsx +++ b/src/ui/component/common/icon-custom.jsx @@ -253,4 +253,10 @@ export const icons = { ), + [ICONS.SUPPORT]: buildIcon( + + + + + ), }; diff --git a/src/ui/component/publishFile/view.jsx b/src/ui/component/publishFile/view.jsx index d9c05baa2..b2bfb6e11 100644 --- a/src/ui/component/publishFile/view.jsx +++ b/src/ui/component/publishFile/view.jsx @@ -3,6 +3,7 @@ import React from 'react'; import { regexInvalidURI } from 'lbry-redux'; import classnames from 'classnames'; import FileSelector from 'component/common/file-selector'; +import Button from 'component/button'; type Props = { name: ?string, @@ -39,6 +40,12 @@ function PublishFile(props: Props) {
    + {!isStillEditing && ( +

    + {__('For video content, use MP4s in H264/AAC format for best compatibility.')}{' '} +

    + +
    + {__('Standard messaging rates apply. LBRY will not text or call you otherwise. Having trouble?')}{' '} +
    + + + +
    +
    +

    {__('2) Proof via Credit')}

    {`${__( 'If you have a valid credit or debit card, you can use it to instantly prove your humanity.' @@ -69,32 +98,6 @@ class UserVerify extends React.PureComponent {

    -
    -
    -

    {__('2) Proof via Phone')}

    -

    - {`${__('You will receive an SMS text message confirming that your phone number is correct.')}`} -

    -
    - -
    -
    -
    - -
    - {__('Standard messaging rates apply. Having trouble?')}{' '} -
    -
    -
    -

    {__('3) Proof via Chat')}

    diff --git a/src/ui/component/walletAddress/view.jsx b/src/ui/component/walletAddress/view.jsx index 7c5083f7c..ada798d42 100644 --- a/src/ui/component/walletAddress/view.jsx +++ b/src/ui/component/walletAddress/view.jsx @@ -71,9 +71,7 @@ class WalletAddress extends React.PureComponent {

    - {__( - 'You can generate a new address at any time, and any previous addresses will continue to work. Using multiple addresses can be helpful for keeping track of incoming payments from multiple sources.' - )} + {__('You can generate a new address at any time, and any previous addresses will continue to work.')}

    diff --git a/src/ui/component/walletSendTip/view.jsx b/src/ui/component/walletSendTip/view.jsx index 3ddc99c87..ceb53242c 100644 --- a/src/ui/component/walletSendTip/view.jsx +++ b/src/ui/component/walletSendTip/view.jsx @@ -5,6 +5,7 @@ import { FormField, Form } from 'component/common/form'; type Props = { uri: string, + claimIsMine: boolean, title: string, claim: StreamClaim, isPending: boolean, @@ -69,7 +70,7 @@ class WalletSendTip extends React.PureComponent { } render() { - const { title, isPending, uri, onCancel } = this.props; + const { title, isPending, uri, onCancel, claimIsMine } = this.props; const { tipAmount, tipError } = this.state; return ( @@ -98,7 +99,10 @@ class WalletSendTip extends React.PureComponent { } helper={

    - {__(`This will appear as a tip for "${title}".`)}{' '} + {claimIsMine + ? __('This will increase your overall bid amount for ') + : __('This will appear as a tip for ')} + {`"${title}" which will boost its ability to be discovered while active.`}{' '}

    -

    {__('Get Live Help')}

    +

    {__('Find Assistance')}

    {__('Live help is available most hours in the')} #help{' '} - {__('channel of our Discord chat room.')} + {__('channel of our Discord chat room. Or you can always email us at help@lbry.com.')}

    diff --git a/src/ui/page/rewards/view.jsx b/src/ui/page/rewards/view.jsx index 833e39d8e..010c437e1 100644 --- a/src/ui/page/rewards/view.jsx +++ b/src/ui/page/rewards/view.jsx @@ -35,11 +35,12 @@ class RewardsPage extends PureComponent { !IS_WEB && (
    -

    {__('Verification For Rewards')}

    +

    {__('Rewards Approval to Earn Credits (LBC)')}

    - {__('Rewards are for human beings only.')}{' '} - {__("You'll have to prove you're one of us before you can claim any rewards.")}{' '} - {__('This is optional.')} + {__( + 'This step is optional. You can continue to use this app without rewards, but LBC may be needed for some tasks.' + )}{' '} +

    diff --git a/src/ui/page/settings/view.jsx b/src/ui/page/settings/view.jsx index 0e15d2454..b36f00549 100644 --- a/src/ui/page/settings/view.jsx +++ b/src/ui/page/settings/view.jsx @@ -313,7 +313,12 @@ class SettingsPage extends React.PureComponent { name="share_usage_data" onChange={() => setDaemonSetting('share_usage_data', !daemonSettings.share_usage_data)} checked={daemonSettings.share_usage_data} - label={__('Help make LBRY better by contributing analytics and diagnostic data about my usage.')} + label={ + + {__('Help make LBRY better by contributing analytics and diagnostic data about my usage.')}{' '} +