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

show 'SITE_NAME view reward' message on txo list table

Browse source
This commit is contained in:
Sean Yesmunt 2020-12-15 16:13:08 -05:00
parent e6b502dd4a
commit 87d54d9c88
6 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -139,7 +139,7 @@
"imagesloaded": "^4.1.4",
"json-loader": "^0.5.4",
"lbry-format": "https://github.com/lbryio/lbry-format.git",
"lbry-redux": "lbryio/lbry-redux#70c52e42e8b918e60b8f12b36748e1aef8908c39",
"lbry-redux": "lbryio/lbry-redux#92a4263c908f6df5727c379a3b3348935891d806",
"lbryinc": "lbryio/lbryinc#eee2cb730ecec95a1344a755035755b0d4dad5cf",
"lint-staged": "^7.0.2",
"localforage": "^1.7.1",

2
static/app-strings.json
View file

@ -1527,5 +1527,7 @@
"Explore": "Explore",
"There is a bug... somewhere": "There is a bug... somewhere",
"Try refreshing to fix the issue. If that doesn't work, email help@lbry.com for support.": "Try refreshing to fix the issue. If that doesn't work, email help@lbry.com for support.",
"Close sidebar - hide channels you are following": "Close sidebar - hide channels you are following",
"Expand sidebar - view channels you are following.": "Expand sidebar - view channels you are following.",
"--end--": "--end--"
}

5
ui/component/header/view.jsx
View file

@ -228,6 +228,11 @@ const Header = (props: Props) => {
{!authHeader && (
<span style={{ position: 'relative' }}>
<Button
aria-label={
sidebarOpen
? __('Close sidebar - hide channels you are following.')
: __('Expand sidebar - view channels you are following.')
}
className="header__navigation-item menu__title header__navigation-item--icon"
icon={ICONS.MENU}
onClick={() => setSidebarOpen(!sidebarOpen)}

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

@ -1,5 +1,6 @@
// @flow
import * as ICONS from 'constants/icons';
import { SITE_NAME } from 'config';
import React from 'react';
import ButtonTransaction from 'component/common/transaction-link';
import CreditAmount from 'component/common/credit-amount';
@ -83,6 +84,8 @@ class TxoListItem extends React.PureComponent<Props, State> {
is_my_output: isMyOutput,
} = txo;
const isLbryViewReward =
txo.signing_channel && txo.signing_channel.channel_id === '74562a01e5836c04040b80bf1f4d685fec02cc90';
const name = txoListName;
const isMinus = (type === 'support' || type === 'payment' || type === 'other') && isMyInput && !isMyOutput;
const isTip = type === 'support' && ((isMyInput && !isMyOutput) || (!isMyInput && isMyOutput));
@ -111,7 +114,7 @@ class TxoListItem extends React.PureComponent<Props, State> {
return (
<tr>
<td>
<td className="table__date">
{timestamp ? (
<div>
<DateTime date={date} show={DateTime.SHOW_DATE} formatOptions={dateFormat} />
@ -135,6 +138,7 @@ class TxoListItem extends React.PureComponent<Props, State> {
<td>
{forClaim && <Button button="link" navigate={uri} label={claimName} disabled={!date} />}
{!forClaim && reward && <span>{reward.reward_title}</span>}
{isLbryViewReward && <span className="help--inline">{__('%SITE_NAME% view reward', { SITE_NAME })}</span>}
</td>
<td>

4
ui/scss/component/_table.scss
View file

@ -115,6 +115,10 @@ th {
}
}
.table__date {
font-size: var(--font-small);
}
.table--help {
td:nth-of-type(1) {
min-width: 130px;

4
yarn.lock
View file

@ -7498,9 +7498,9 @@ lazy-val@^1.0.4:
yargs "^13.2.2"
zstd-codec "^0.1.1"
lbry-redux@lbryio/lbry-redux#70c52e42e8b918e60b8f12b36748e1aef8908c39:
lbry-redux@lbryio/lbry-redux#92a4263c908f6df5727c379a3b3348935891d806:
version "0.0.1"
resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/70c52e42e8b918e60b8f12b36748e1aef8908c39"
resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/92a4263c908f6df5727c379a3b3348935891d806"
dependencies:
proxy-polyfill "0.1.6"
reselect "^3.0.0"