diff --git a/static/app-strings.json b/static/app-strings.json index cf1ce9e3a..09a708a54 100644 --- a/static/app-strings.json +++ b/static/app-strings.json @@ -233,9 +233,8 @@ "Access Token": "Access Token", "Backup your LBRY wallet": "Backup your LBRY wallet", "Your LBRY Credits, channels, and publishes are controllable by you and only you, via wallet file(s) stored locally on your computer.": "Your LBRY Credits, channels, and publishes are controllable by you and only you, via wallet file(s) stored locally on your computer.", - "Currently, there is no automatic wallet backup. If you lose access to these files, you will lose your credits permanently, as well as control of your channels and publishes.": "Currently, there is no automatic wallet backup. If you lose access to these files, you will lose your credits permanently, as well as control of your channels and publishes.", "However, it is fairly easy to back up manually. To backup your wallet, make a copy of the folder listed below:": "However, it is fairly easy to back up manually. To backup your wallet, make a copy of the folder listed below:", - "Access to these files is equivalent to having access to your credits, channels, and publishes. Keep any copies you make of your wallet in a secure place.": "Access to these files are equivalent to having access to your credits, channels, and publishes. Keep any copies you make of your wallet in a secure place.", + "Access to these files is equivalent to having access to your Credits, channels, and publishes. Keep any copies you make of your wallet in a secure place.": "Access to these files are equivalent to having access to your Credits, channels, and publishes. Keep any copies you make of your wallet in a secure place.", "see this article": "see this article", "A newer version of LBRY is available.": "A newer version of LBRY is available.", "Download now!": "Download now!", @@ -278,7 +277,7 @@ "You aren't following any tags, try searching for one.": "You aren't following any tags, try searching for one.", "Success": "Success", "File published": "File published", - "Upload something new": "Upload something new", + "Upload Something New": "Upload Something New", "New thumbnail": "New thumbnail", "Follow": "Follow", "Claim sequence must be a number.": "Claim sequence must be a number.", @@ -377,8 +376,8 @@ "Confirm Tip Unlock": "Confirm Tip Unlock", "Confirm Support Revoke": "Confirm Support Revoke", "Are you sure you want to remove this support?": "Are you sure you want to remove this support?", - "Are you sure you want to unlock these credits?": "Are you sure you want to unlock these credits?", - "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 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.", + "Are you sure you want to unlock these Credits?": "Are you sure you want to unlock these Credits?", + "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 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.", "Mature": "Mature", "Show mature content": "Show mature content", "Mature content may include nudity, intense sexuality, profanity, or other adult content. By displaying mature content, you are affirming you are of legal age to view mature content in your country or jurisdiction. ": "Mature content may include nudity, intense sexuality, profanity, or other adult content. By displaying mature content, you are affirming you are of legal age to view mature content in your country or jurisdiction. ", @@ -413,7 +412,6 @@ "Code": "Code", "Nothing here": "Nothing here", "Upload something and claim this spot!": "Upload something and claim this spot!", - "Currently, there is no automatic backup. If you lose access to these files, you will lose your credits, channels, and publishes.": "Currently, there is no automatic backup. If you lose access to these files, you will lose your credits, channels, and publishes.", "File Size": "File Size", "Starting...": "Starting...", "Spin Spin Sugar": "Spin Spin Sugar", @@ -471,7 +469,7 @@ "Remember Password": "Remember Password", "From": "From", "To": "To", - "Not enough credits": "Not enough credits", + "Not enough Credits": "Not enough Credits", "You have %credit_amount% in unclaimed rewards.": "You have %credit_amount% in unclaimed rewards.", "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.", "Read More": "Read More", @@ -486,7 +484,7 @@ "Live help is available most hours in the %channel% channel of our Discord chat room. Or you can always email us at help@lbry.com.": "Live help is available most hours in the %channel% channel of our Discord chat room. Or you can always email us at help@lbry.com.", "Your LBRY Credits, channels, and publishes are controllable by you and only you, via a wallet file stored locally on your computer.": "Your LBRY Credits, channels, and publishes are controllable by you and only you, via a wallet file stored locally on your computer.", "However, it is easy to back up manually. To backup your wallet, make a copy of the folder listed below:": "However, it is easy to back up manually. To backup your wallet, make a copy of the folder listed below:", - "Access to these files are equivalent to having access to your credits, channels, and publishes. Keep any copies you make of your wallet in a secure place. For more details on backing up and best practices %helpLink%.": "Access to these files are equivalent to having access to your credits, channels, and publishes. Keep any copies you make of your wallet in a secure place. For more details on backing up and best practices %helpLink%.", + "Access to these files are equivalent to having access to your Credits, channels, and publishes. Keep any copies you make of your wallet in a secure place. For more details on backing up and best practices %helpLink%.": "Access to these files are equivalent to having access to your Credits, channels, and publishes. Keep any copies you make of your wallet in a secure place. For more details on backing up and best practices %helpLink%.", "Your channels": "Your channels", "Add Tags": "Add Tags", "Available Balance": "Available Balance", @@ -751,7 +749,7 @@ "This content requires LBRY Desktop to display.": "This content requires LBRY Desktop to display.", "Get the App": "Get the App", "Get The App": "Get The App", - "You need more credits to purchase this.": "You need more credits to purchase this.", + "You need more Credits to purchase this.": "You need more Credits to purchase this.", "Open Rewards": "Open Rewards", "Read our %referral_faq_link% to learn more about rewards.": "Read our %referral_faq_link% to learn more about rewards.", "Recommended ratio is 1:1": "Recommended ratio is 1:1", @@ -1085,7 +1083,6 @@ "We will refund no questions asked within 30 days.": "We will refund no questions asked within 30 days.", "Buy": "Buy", "buy": "buy", - "Buy credits": "Buy credits", "Country": "Country", "Only some countries are eligible at this time. We are working to make this available to everyone.": "Only some countries are eligible at this time. We are working to make this available to everyone.", "Select your country": "Select your country", @@ -1140,7 +1137,6 @@ "Thanks for the feedback! You help make the app better for everyone.": "Thanks for the feedback! You help make the app better for everyone.", "Thanks for the feedback. Mark has been notified and is currently walking over to his computer to work on this.": "Thanks for the feedback. Mark has been notified and is currently walking over to his computer to work on this.", "Changelog": "Changelog", - "Supporting content requires credits": "Supporting content requires credits", "Boost your content": "Boost your content", "Send Revocable Support": "Send Revocable Support", "Send a %amount% Tip": "Send a %amount% Tip", diff --git a/ui/component/channelEdit/view.jsx b/ui/component/channelEdit/view.jsx index 4426202ca..e6c10b77e 100644 --- a/ui/component/channelEdit/view.jsx +++ b/ui/component/channelEdit/view.jsx @@ -238,7 +238,7 @@ function ChannelForm(props: Props) { {__('General')} - {__('LBRY Credit Details')} + {__('Credit Details')} {__('Tags')} {__('Other')} diff --git a/ui/component/fileRenderInitiator/view.jsx b/ui/component/fileRenderInitiator/view.jsx index 5e3be8223..fe58d23fb 100644 --- a/ui/component/fileRenderInitiator/view.jsx +++ b/ui/component/fileRenderInitiator/view.jsx @@ -135,7 +135,7 @@ export default function FileRenderInitiator(props: Props) { history.push(`/$/${PAGES.REWARDS}`)} /> diff --git a/ui/component/nagContinueFirstRun/index.js b/ui/component/nagContinueFirstRun/index.js index 967caa9a1..1d43e9fa1 100644 --- a/ui/component/nagContinueFirstRun/index.js +++ b/ui/component/nagContinueFirstRun/index.js @@ -1,7 +1,6 @@ import { connect } from 'react-redux'; import { SETTINGS } from 'lbry-redux'; import { makeSelectClientSetting } from 'redux/selectors/settings'; -import { doSetClientSetting, doSyncClientSettings } from 'redux/actions/settings'; import UserSignIn from './view'; const select = state => ({ @@ -9,9 +8,4 @@ const select = state => ({ firstRunStarted: makeSelectClientSetting(SETTINGS.FIRST_RUN_STARTED)(state), }); -const perform = dispatch => ({ - syncSettings: () => dispatch(doSyncClientSettings()), - setClientSetting: (setting, value) => dispatch(doSetClientSetting(setting, value)), -}); - -export default connect(select, perform)(UserSignIn); +export default connect(select)(UserSignIn); diff --git a/ui/component/nagContinueFirstRun/view.jsx b/ui/component/nagContinueFirstRun/view.jsx index 20ff2f07e..cf4370cd5 100644 --- a/ui/component/nagContinueFirstRun/view.jsx +++ b/ui/component/nagContinueFirstRun/view.jsx @@ -2,7 +2,6 @@ import * as PAGES from 'constants/pages'; import React from 'react'; import Nag from 'component/common/nag'; -import { SETTINGS } from 'lbry-redux'; import { useHistory } from 'react-router'; type Props = { @@ -13,18 +12,13 @@ type Props = { }; export default function NagContinueFirstRun(props: Props) { - const { firstRunStarted, followingAcknowledged, setClientSetting, syncSetttings } = props; + const { firstRunStarted, followingAcknowledged } = props; const { location: { pathname }, push, } = useHistory(); const isOnFirstRun = pathname.includes(PAGES.AUTH); - function onClose() { - setClientSetting(SETTINGS.FOLLOWING_ACKNOWLEDGED, true); - syncSetttings(); - } - function handleContinue() { push(`/$/${PAGES.AUTH}`); } @@ -36,10 +30,9 @@ export default function NagContinueFirstRun(props: Props) { return ( ); } diff --git a/ui/component/walletBackup/view.jsx b/ui/component/walletBackup/view.jsx index d979641d7..aa25c3d1c 100644 --- a/ui/component/walletBackup/view.jsx +++ b/ui/component/walletBackup/view.jsx @@ -127,7 +127,7 @@ class WalletBackup extends React.PureComponent { ), }} > - Access to these files are equivalent to having access to your credits, channels, and publishes. Keep any + Access to these files are equivalent to having access to your Credits, channels, and publishes. Keep any copies you make of your wallet in a secure place. For more details on backing up and best practices %helpLink%. diff --git a/ui/component/walletSend/view.jsx b/ui/component/walletSend/view.jsx index 28bc95e88..0202564ef 100644 --- a/ui/component/walletSend/view.jsx +++ b/ui/component/walletSend/view.jsx @@ -101,7 +101,7 @@ class WalletSend extends React.PureComponent { (!!values.amount && touched.amount && errors.amount) || (parseFloat(values.amount) === balance && __('Decrease amount to account for transaction fee')) || - (parseFloat(values.amount) > balance && __('Not enough credits'))} + (parseFloat(values.amount) > balance && __('Not enough Credits'))} )} diff --git a/ui/component/walletSendTip/view.jsx b/ui/component/walletSendTip/view.jsx index eb344f786..a1d1d925f 100644 --- a/ui/component/walletSendTip/view.jsx +++ b/ui/component/walletSendTip/view.jsx @@ -90,7 +90,7 @@ function WalletSendTip(props: Props) { } else if (tipAmount === balance) { tipError = __('Please decrease the amount to account for transaction fees'); } else if (tipAmount > balance) { - tipError = __('Not enough credits'); + tipError = __('Not enough Credits'); } setTipError(tipError); }, [tipAmount, balance, setTipError]); diff --git a/ui/component/yrblWalletEmpty/view.jsx b/ui/component/yrblWalletEmpty/view.jsx index 672c72897..3cb5cc96b 100644 --- a/ui/component/yrblWalletEmpty/view.jsx +++ b/ui/component/yrblWalletEmpty/view.jsx @@ -32,7 +32,7 @@ export default function YrblHelp(props: Props) {

}}> - Never fear though, there are tons of ways to earn %lbc%! You can earn or purchase %lbc%, or you can have + Never fear though, there are tons of ways to earn %lbc%. You can earn or purchase %lbc%, or you can have your friends send you some.

diff --git a/ui/modal/modalFirstReward/view.jsx b/ui/modal/modalFirstReward/view.jsx index 55bf223d3..47425a0a5 100644 --- a/ui/modal/modalFirstReward/view.jsx +++ b/ui/modal/modalFirstReward/view.jsx @@ -22,7 +22,7 @@ class ModalFirstReward extends React.PureComponent {

{__("This reward will show in your Wallet in the top right momentarily (if it hasn't already).")}

{__( - 'These credits are used to compensate creators, to publish your own content, and to have say in how the network works.' + 'These Credits are used to compensate creators, to publish your own content, and to have say in how the network works.' )}

{__('No need to understand it all just yet! Try watching or publishing something next.')}

diff --git a/ui/modal/modalRevokeClaim/view.jsx b/ui/modal/modalRevokeClaim/view.jsx index 61e899284..28496f8a3 100644 --- a/ui/modal/modalRevokeClaim/view.jsx +++ b/ui/modal/modalRevokeClaim/view.jsx @@ -41,7 +41,7 @@ export default function ModalRevokeClaim(props: Props) {

{__('Are you sure you want to remove this support?')}

}}> - These credits are permanently yours and can be removed at any time. Removing this support will reduce the + 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.

@@ -50,10 +50,10 @@ export default function ModalRevokeClaim(props: Props) { } else if (type === txnTypes.SUPPORT) { return ( -

{__('Are you sure you want to unlock these credits?')}

+

{__('Are you sure you want to unlock these Credits?')}

{__( - '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 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.' )}

diff --git a/ui/page/buy/view.jsx b/ui/page/buy/view.jsx index 6213a0eef..12da8e039 100644 --- a/ui/page/buy/view.jsx +++ b/ui/page/buy/view.jsx @@ -77,7 +77,7 @@ export default function BuyPage(props: Props) { } }, [url, setUrl, receiveAddress, email]); - const title = __('Buy credits'); + const title = __('Buy Credits'); const subtitle = ( {__('Content')} {editing ? __('Editing Your Channel') : __('About')} - {__('Comments')} + {__('Discussion')} diff --git a/ui/page/channels/view.jsx b/ui/page/channels/view.jsx index 9bd80077a..5f0a60d96 100644 --- a/ui/page/channels/view.jsx +++ b/ui/page/channels/view.jsx @@ -7,6 +7,7 @@ import Button from 'component/button'; import YoutubeTransferStatus from 'component/youtubeTransferStatus'; import Spinner from 'component/spinner'; import Card from 'component/common/card'; +import Yrbl from 'component/yrbl'; import * as PAGES from 'constants/pages'; type Props = { @@ -54,22 +55,19 @@ export default function ChannelsPage(props: Props) { {!fetchingChannels ? (
-
-

{__('No channels created yet')}

- -
-
-
+ +
) : (
-
-

- {__('Checking for channels')} - -

-
+
)} diff --git a/ui/page/fileListPublished/view.jsx b/ui/page/fileListPublished/view.jsx index f68f91364..a71416e7d 100644 --- a/ui/page/fileListPublished/view.jsx +++ b/ui/page/fileListPublished/view.jsx @@ -10,6 +10,7 @@ import { PAGE_PARAM, PAGE_SIZE_PARAM } from 'constants/claim'; import WebUploadList from 'component/webUploadList'; import Spinner from 'component/spinner'; import Card from 'component/common/card'; +import Yrbl from 'component/yrbl'; type Props = { uploadCount: number, @@ -96,26 +97,24 @@ function FileListPublished(props: Props) { {!fetching ? (
-
-

{__('Nothing uploaded to LBRY yet.')}

-
-
-
+ +
) : (
-
-

- {__('Checking your uploads')} - -

-
+
)} diff --git a/ui/scss/component/_form-field.scss b/ui/scss/component/_form-field.scss index 6db9cb82d..442c59115 100644 --- a/ui/scss/component/_form-field.scss +++ b/ui/scss/component/_form-field.scss @@ -310,6 +310,10 @@ fieldset-group { border-top-left-radius: 0; border-bottom-left-radius: 0; } + + label { + margin-left: var(--spacing-s); + } } }