From 6d888b5121bfa2c3e98c562222ef9154c93a728a Mon Sep 17 00:00:00 2001 From: Thomas Zarebczan Date: Thu, 21 May 2020 21:19:01 -0400 Subject: [PATCH] A few tweaks --- static/app-strings.json | 5 ++-- ui/component/creatorAnalytics/view.jsx | 6 ++--- .../internal/txo-list-item.jsx | 6 ++--- ui/component/walletBalance/view.jsx | 1 + ui/modal/modalRevokeClaim/view.jsx | 26 +++++++++---------- ui/page/home/view.jsx | 15 ++++++++++- ui/page/rewards/view.jsx | 24 ++++++++++++----- 7 files changed, 55 insertions(+), 28 deletions(-) diff --git a/static/app-strings.json b/static/app-strings.json index f35901ba2..fa8b02e0c 100644 --- a/static/app-strings.json +++ b/static/app-strings.json @@ -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." +} \ No newline at end of file diff --git a/ui/component/creatorAnalytics/view.jsx b/ui/component/creatorAnalytics/view.jsx index d832c6b77..b6b7bcd9a 100644 --- a/ui/component/creatorAnalytics/view.jsx +++ b/ui/component/creatorAnalytics/view.jsx @@ -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 ? (
@@ -217,7 +217,7 @@ export default function CreatorAnalytics(props: Props) {
diff --git a/ui/component/transactionListTable/internal/txo-list-item.jsx b/ui/component/transactionListTable/internal/txo-list-item.jsx index a53b9b40a..7bd57a440 100644 --- a/ui/component/transactionListTable/internal/txo-list-item.jsx +++ b/ui/component/transactionListTable/internal/txo-list-item.jsx @@ -30,12 +30,12 @@ class TxoListItem extends React.PureComponent { (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 ; } - if (type === TXO.SUPPORT) { + if (tip && type === TXO.SUPPORT) { return (
diff --git a/ui/modal/modalRevokeClaim/view.jsx b/ui/modal/modalRevokeClaim/view.jsx index 25a23c15e..3c1c87074 100644 --- a/ui/modal/modalRevokeClaim/view.jsx +++ b/ui/modal/modalRevokeClaim/view.jsx @@ -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 ( -

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

+

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

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

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

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

+

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

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

@@ -88,7 +88,7 @@ export default function ModalRevokeClaim(props: Props) { closeModal(); } - const label = getButtonLabel(type); + const label = getButtonLabel(type, isSupport); return (