Skip to content

Commit

Permalink
FAQ stuff (#109)
Browse files Browse the repository at this point in the history
  • Loading branch information
tzarebczan committed Oct 21, 2021
1 parent d62f63a commit 23525b0
Show file tree
Hide file tree
Showing 30 changed files with 122 additions and 49 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -735,7 +735,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
### Added

- Channels page above Publishes which lists all your channels ([#2925](https://github.com/lbryio/lbry-desktop/pull/2925))
- YouTube channel claiming and transfer ([#2925](https://github.com/lbryio/lbry-desktop/pull/2925)). See our [YouTube FAQ](https://lbry.com/faq/youtube) for more information.
- YouTube channel claiming and transfer ([#2925](https://github.com/lbryio/lbry-desktop/pull/2925)). See our [YouTube FAQ](https://odysee.com/@OdyseeHelp:b/youtube-sync:b) for more information.
- New user sign in flow now includes automatic redeeming of 1 LBC and channel creation ([#2925](https://github.com/lbryio/lbry-desktop/pull/2925))
- Ability to save wallet encryption password ([#2925](https://github.com/lbryio/lbry-desktop/pull/2925))
- Sync your balance (only for users with new wallets) and preferences (subscriptions and tags) between devices ([#2925](https://github.com/lbryio/lbry-desktop/pull/2925)). See our [FAQ for more information](https://lbry.com/faq/account-sync)
Expand Down Expand Up @@ -890,7 +890,7 @@ This release includes a breaking change that will reset many of your settings. T

### Added

- New app design for better [content discovery](https://lbry.com/faq/trending) with infinite scroll ([#2477](https://github.com/lbryio/lbry-desktop/pull/2477))
- New app design for better [content discovery](https://odysee.com/@OdyseeHelp:b/OdyseeBasics:c) with infinite scroll ([#2477](https://github.com/lbryio/lbry-desktop/pull/2477))
- First implementation of comments ([#2510](https://github.com/lbryio/lbry-desktop/pull/2510))
- Ability to edit channels with new metadata and tags ([#2584](https://github.com/lbryio/lbry-desktop/pull/2584))
- Tagging content on publish page ([#2593](https://github.com/lbryio/lbry-desktop/pull/2593))
Expand Down
4 changes: 2 additions & 2 deletions ui/component/channelContent/view.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -125,11 +125,11 @@ function ChannelContent(props: Props) {
<section className="card card--section">
<p>
{__(
'In response to a complaint we received under the US Digital Millennium Copyright Act, we have blocked access to this channel from our applications.'
'In response to a complaint we received under the US Digital Millennium Copyright Act, we have blocked access to this channel from our applications. Content may also be blocked due to DMCA Red Flag rules which are obvious copyright violations we come across, are discussed in public channels, or reported to us.'
)}
</p>
<div className="section__actions">
<Button button="link" href="https://lbry.com/faq/dmca" label={__('Read More')} />
<Button button="link" href="https://odysee.com/@OdyseeHelp:b/copyright:f" label={__('Read More')} />
</div>
</section>
)}
Expand Down
4 changes: 2 additions & 2 deletions ui/component/fileValues/view.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class FileValues extends PureComponent<Props> {
<tr>
<td>
{__('Supports and Tips')}
<HelpLink href="https://lbry.com/faq/tipping" />
<HelpLink href="https://odysee.com/@OdyseeHelp:b/Monetization-of-Content:3" />
</td>
<td>
{claimIsMine && !pendingAmount && Boolean(supportsAmount) && (
Expand Down Expand Up @@ -80,7 +80,7 @@ class FileValues extends PureComponent<Props> {
<td>
<div>
{__('Total Staked Amount')}
<HelpLink href="https://lbry.com/faq/tipping" />
<HelpLink href="https://odysee.com/@OdyseeHelp:b/Monetization-of-Content:3" />
</div>
</td>
<td>
Expand Down
2 changes: 1 addition & 1 deletion ui/component/fileViewCount/view.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ function FileViewCount(props: Props) {
{!livestream &&
activeViewers === undefined &&
(viewCount !== 1 ? __('%view_count% views', { view_count: formattedViewCount }) : __('1 view'))}
{!SIMPLE_SITE && <HelpLink href="https://lbry.com/faq/views" />}
{!SIMPLE_SITE && <HelpLink href="https://odysee.com/@OdyseeHelp:b/OdyseeBasics:c" />}
</span>
);
}
Expand Down
6 changes: 5 additions & 1 deletion ui/component/inviteNew/view.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,11 @@ function InviteNew(props: Props) {
tokens={{
rewards_link: <Button button="link" navigate="/$/rewards" label={__('rewards')} />,
referral_faq_link: (
<Button button="link" label={__('FAQ')} href="https://lbry.com/faq/referrals" />
<Button
button="link"
label={__('FAQ')}
href="https://odysee.com/@OdyseeHelp:b/rewards-verification:3"
/>
),
}}
>
Expand Down
6 changes: 3 additions & 3 deletions ui/component/publishFile/view.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ function PublishFile(props: Props) {
return (
<p className="help--warning">
{__('Your video has a bitrate over 5 Mbps. We suggest transcoding to provide viewers the best experience.')}{' '}
<Button button="link" label={__('Upload Guide')} href="https://lbry.com/faq/video-publishing-guide" />
<Button button="link" label={__('Upload Guide')} href="https://odysee.com/@OdyseeHelp:b/uploadguide:1" />
</p>
);
}
Expand All @@ -261,7 +261,7 @@ function PublishFile(props: Props) {
{__(
'Your video may not be the best format. Use MP4s in H264/AAC format and a friendly bitrate (under 5 Mbps) and resolution (720p) for more reliable streaming.'
)}{' '}
<Button button="link" label={__('Upload Guide')} href="https://lbry.com/faq/video-publishing-guide" />
<Button button="link" label={__('Upload Guide')} href="https://odysee.com/@OdyseeHelp:b/uploadguide:1" />
</p>
);
}
Expand Down Expand Up @@ -299,7 +299,7 @@ function PublishFile(props: Props) {
{__(
'For video content, use MP4s in H264/AAC format and a friendly bitrate (under 5 Mbps) and resolution (720p) for more reliable streaming.'
)}{' '}
<Button button="link" label={__('Upload Guide')} href="https://lbry.com/faq/video-publishing-guide" />
<Button button="link" label={__('Upload Guide')} href="https://odysee.com/@OdyseeHelp:b/uploadguide:1" />
</p>
);
}
Expand Down
6 changes: 5 additions & 1 deletion ui/component/rewardSummary/view.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,11 @@ class RewardSummary extends React.Component<Props> {
navigate="/$/rewards"
label={hasRewards ? __('Claim Rewards') : __('View Rewards')}
/>
<Button button="link" label={__('Learn more')} href="https://lbry.com/faq/rewards" />
<Button
button="link"
label={__('Learn more')}
href="https://odysee.com/@OdyseeHelp:b/rewards-verification:3"
/>
</React.Fragment>
}
/>
Expand Down
2 changes: 1 addition & 1 deletion ui/component/searchTopClaim/view.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ export default function SearchTopClaim(props: Props) {
<div className="claim-preview__actions--header">
<a
className="media__uri"
href="https://lbry.com/faq/trending"
href="https://odysee.com/@OdyseeHelp:b/OdyseeBasics:c"
title={__('Learn more about LBRY Credits on %DOMAIN%', { DOMAIN })}
>
<LbcSymbol prefix={__('Most supported')} />
Expand Down
4 changes: 2 additions & 2 deletions ui/component/settingSystem/view.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ export default function SettingSystem(props: Props) {
<Button
button="link"
label={__('Learn more')}
href="https://lbry.com/faq/video-publishing-guide#automatic"
href="https://odysee.com/@OdyseeHelp:b/uploadguide:1"
/>
),
}}
Expand All @@ -281,7 +281,7 @@ export default function SettingSystem(props: Props) {
<Button
button="link"
label={__('Learn more')}
href="https://lbry.com/faq/video-publishing-guide#automatic"
href="https://odysee.com/@OdyseeHelp:b/uploadguide:1"
/>
),
}}
Expand Down
8 changes: 7 additions & 1 deletion ui/component/supportsLiquidate/view.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,13 @@ const SupportsLiquidate = (props: Props) => {
<p>
<I18nMessage
tokens={{
learn_more: <Button button="link" label={__('Learn More')} href="https://lbry.com/faq/tipping" />,
learn_more: (
<Button
button="link"
label={__('Learn More')}
href="https://odysee.com/@OdyseeHelp:b/Monetization-of-Content:3"
/>
),
}}
>
It's usually only worth unlocking what you intend to use immediately. %learn_more%
Expand Down
10 changes: 5 additions & 5 deletions ui/component/tagsSelect/view.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import Card from 'component/common/card';
type Props = {
showClose?: boolean,
followedTags: Array<Tag>,
doToggleTagFollowDesktop?: string => void,
doToggleTagFollowDesktop?: (string) => void,
suggestMature: boolean,
// Overrides
// The default component is for following tags
Expand All @@ -20,7 +20,7 @@ type Props = {
label?: string,
tagsChosen?: Array<Tag>,
onSelect?: (Array<Tag>) => void,
onRemove?: Tag => void,
onRemove?: (Tag) => void,
placeholder?: string,
disableAutoFocus?: boolean,
hideHeader?: boolean,
Expand Down Expand Up @@ -52,7 +52,7 @@ export default function TagsSelect(props: Props) {
const [hasClosed, setHasClosed] = usePersistedState('tag-select:has-closed', false);
const tagsToDisplay = tagsChosen || followedTags;
const tagCount = tagsToDisplay.length;
const hasMatureTag = tagsToDisplay.map(tag => tag.name).includes('mature');
const hasMatureTag = tagsToDisplay.map((tag) => tag.name).includes('mature');

function handleClose() {
setHasClosed(true);
Expand All @@ -64,7 +64,7 @@ export default function TagsSelect(props: Props) {
} else if (doToggleTagFollowDesktop) {
doToggleTagFollowDesktop(tag.name);

const wasFollowing = followedTags.map(tag => tag.name).includes(tag.name);
const wasFollowing = followedTags.map((tag) => tag.name).includes(tag.name);
const nowFollowing = !wasFollowing;
analytics.tagFollowEvent(tag.name, nowFollowing, 'tag-select');
}
Expand Down Expand Up @@ -94,7 +94,7 @@ export default function TagsSelect(props: Props) {
help !== false && (
<span>
{help || __("The tags you follow will change what's trending for you.")}{' '}
<Button button="link" label={__('Learn more')} href="https://lbry.com/faq/trending" />.
<Button button="link" label={__('Learn more')} href="https://odysee.com/@OdyseeHelp:b/OdyseeBasics:c" />.
</span>
)
}
Expand Down
2 changes: 1 addition & 1 deletion ui/component/txoList/view.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ function TxoList(props: Props) {
label={
<>
{__('Type')}
<HelpLink href="https://lbry.com/faq/transaction-types" />
<HelpLink href="https://odysee.com/@OdyseeHelp:b/Transactions-and-Wallet:7" />
</>
}
value={type || 'all'}
Expand Down
2 changes: 1 addition & 1 deletion ui/component/userEmailNew/view.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ function UserEmailNew(props: Props) {
label={
<React.Fragment>
{__('Share usage data with LBRY inc.')}{' '}
<Button button="link" href="https://lbry.com/faq/privacy-and-data" label={__('Learn More')} />
<Button button="link" href="https://odysee.com/$/privacypolicy" label={__('Learn More')} />
{!localShareUsageData && <span className="error__text"> ({__('Required')})</span>}
</React.Fragment>
}
Expand Down
20 changes: 17 additions & 3 deletions ui/component/userVerify/view.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,11 @@ class UserVerify extends React.PureComponent<Props> {
<I18nMessage
tokens={{
rewards_program: (
<Button button="link" label={__('other rewards')} href="https://lbry.com/faq/rewards" />
<Button
button="link"
label={__('other rewards')}
href="https://odysee.com/@OdyseeHelp:b/rewards-verification:3"
/>
),
Refresh: <Button onClick={() => fetchUser()} button="link" label={__('Refresh')} />,
Skip: <Button {...skipButtonProps} button="link" label={__('Skip')} />,
Expand Down Expand Up @@ -87,7 +91,12 @@ class UserVerify extends React.PureComponent<Props> {
/>
<p className="help">
{__('Standard messaging rates apply. Having trouble?')}{' '}
<Button button="link" href="https://lbry.com/faq/phone" label={__('Read more')} />.
<Button
button="link"
href="https://odysee.com/@OdyseeHelp:b/rewards-verification:3"
label={__('Read more')}
/>
.
</p>
</Fragment>
}
Expand All @@ -113,7 +122,12 @@ class UserVerify extends React.PureComponent<Props> {
/>
<p className="help">
{__('A $1 authorization may temporarily appear with your provider.')}{' '}
<Button button="link" href="https://lbry.com/faq/identity-requirements" label={__('Read more')} />.
<Button
button="link"
href="https://odysee.com/@OdyseeHelp:b/rewards-verification:3"
label={__('Read more')}
/>
.
</p>
</Fragment>
}
Expand Down
2 changes: 1 addition & 1 deletion ui/component/walletBalance/view.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ const WalletBalance = (props: Props) => {
}
/>
),
help: <HelpLink href="https://lbry.com/faq/transaction-types" />,
help: <HelpLink href="https://odysee.com/@OdyseeHelp:b/Transactions-and-Wallet:7" />,
}}
>
Your wallet has a lot of change lying around. Consolidating will speed up your transactions. This
Expand Down
8 changes: 7 additions & 1 deletion ui/component/walletSendTip/view.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,13 @@ function WalletSendTip(props: Props) {
<div className="section__subtitle">
{explainerText + ' '}
{/* {activeTab === TAB_FIAT && !hasCardSaved && <Button navigate={`/$/${PAGES.SETTINGS_STRIPE_CARD}`} label={__('Add A Card')} button="link" />} */}
{<Button label={__('Learn more')} button="link" href="https://lbry.com/faq/tipping" />}
{
<Button
label={__('Learn more')}
button="link"
href="https://odysee.com/@OdyseeHelp:b/Monetization-of-Content:3"
/>
}
</div>
</React.Fragment>
}
Expand Down
10 changes: 8 additions & 2 deletions ui/component/youtubeTransferStatus/view.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,9 @@ export default function YoutubeTransferStatus(props: Props) {
{isNotElligible && (
<I18nMessage
tokens={{
here: <Button button="link" href="https://lbry.com/faq/youtube" label={__('here')} />,
here: (
<Button button="link" href="https://odysee.com/@OdyseeHelp:b/youtube-sync:b" label={__('here')} />
),
email: SITE_HELP_EMAIL,
}}
>
Expand Down Expand Up @@ -224,7 +226,11 @@ export default function YoutubeTransferStatus(props: Props) {
: __('You will be able to claim your channel once it has finished syncing.')}{' '}
{youtubeImportPending &&
__('You will not be able to edit the channel or content until the transfer process completes.')}{' '}
<Button button="link" label={__('Learn More')} href="https://lbry.com/faq/youtube#transfer" />{' '}
<Button
button="link"
label={__('Learn More')}
href="https://odysee.com/@OdyseeHelp:b/youtube-sync:b#transfer"
/>{' '}
{addNewChannel && <Button button="link" label={__('Add Another Channel')} onClick={addNewChannel} />}
</p>
</>
Expand Down
8 changes: 7 additions & 1 deletion ui/modal/modalMassTipUnlock/view.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,13 @@ export default function ModalSupportsLiquidate(props: Props) {
<p>
<I18nMessage
tokens={{
learn_more: <Button button="link" label={__('Learn More')} href="https://lbry.com/faq/tipping" />,
learn_more: (
<Button
button="link"
label={__('Learn More')}
href="https://odysee.com/@OdyseeHelp:b/Monetization-of-Content:3"
/>
),
}}
>
It's usually only worth unlocking what you intend to use immediately. %learn_more%
Expand Down
10 changes: 7 additions & 3 deletions ui/modal/modalRewardCode/view.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ type Props = {
closeModal: () => void,
error: ?string,
rewardIsPending: boolean,
submitRewardCode: string => void,
submitRewardCode: (string) => void,
};

type State = {
Expand Down Expand Up @@ -48,7 +48,11 @@ class ModalRewardCode extends React.PureComponent<Props, State> {
tokens={{
lbc: <LbcSymbol prefix={__('Redeem a custom reward code for')} />,
learn_more: (
<Button button="link" href="https://lbry.com/faq/rewards#reward-code" label={__('Learn more')} />
<Button
button="link"
href="https://odysee.com/@OdyseeHelp:b/rewards-verification:3#reward-code"
label={__('Learn more')}
/>
),
}}
>
Expand All @@ -74,7 +78,7 @@ class ModalRewardCode extends React.PureComponent<Props, State> {
placeholder="0123abc"
error={error}
value={rewardCode}
onChange={e => this.setState({ rewardCode: e.target.value })}
onChange={(e) => this.setState({ rewardCode: e.target.value })}
/>
</Form>
<div className="card__actions">
Expand Down
2 changes: 1 addition & 1 deletion ui/modal/modalSetReferrer/view.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ class ModalSetReferrer extends React.PureComponent<Props, State> {
subtitle={
<React.Fragment>
{__('Did someone invite you to use lbry.tv? Tell us who and you both get a reward!')}
<HelpLink href="https://lbry.com/faq/referrals" />
<HelpLink href="https://odysee.com/@OdyseeHelp:b/rewards-verification:3" />
</React.Fragment>
}
actions={
Expand Down
8 changes: 7 additions & 1 deletion ui/page/buy/view.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,13 @@ export default function BuyPage(props: Props) {
const subtitle = (
<I18nMessage
tokens={{
learn_more: <Button button="link" label={__('Learn more')} href="https://lbry.com/faq/buy-lbc" />,
learn_more: (
<Button
button="link"
label={__('Learn more')}
href="https://odysee.com/@OdyseeHelp:b/BuyingSellingLBRYCredits:b"
/>
),
}}
>
LBRY, Inc. partners with Moonpay to provide the option to purchase LBRY Credits. %learn_more%.
Expand Down
2 changes: 1 addition & 1 deletion ui/page/channel/view.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ function ChannelPage(props: Props) {
<div className="channel__meta">
<span>
{formattedSubCount} {subCount !== 1 ? __('Followers') : __('Follower')}
<HelpLink href="https://lbry.com/faq/views" />
<HelpLink href="https://odysee.com/@OdyseeHelp:b/OdyseeBasics:c" />
</span>
{channelIsMine && (
<>
Expand Down
3 changes: 2 additions & 1 deletion ui/page/channels/view.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,8 @@ export default function ChannelsPage(props: Props) {
return (
<span className="claim-preview__custom-properties">
<span className="help--inline">
{__('Earnings per view')} <HelpLink href="https://lbry.com/faq/view-rewards" />
{__('Earnings per view')}{' '}
<HelpLink href="https://odysee.com/@OdyseeHelp:b/Monetization-of-Content:3" />
</span>

<span>
Expand Down
Loading

0 comments on commit 23525b0

Please sign in to comment.