show 'SITE_NAME view reward' message on txo list table
This commit is contained in:
parent
e6b502dd4a
commit
87d54d9c88
6 changed files with 19 additions and 4 deletions
|
@ -139,7 +139,7 @@
|
||||||
"imagesloaded": "^4.1.4",
|
"imagesloaded": "^4.1.4",
|
||||||
"json-loader": "^0.5.4",
|
"json-loader": "^0.5.4",
|
||||||
"lbry-format": "https://github.com/lbryio/lbry-format.git",
|
"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",
|
"lbryinc": "lbryio/lbryinc#eee2cb730ecec95a1344a755035755b0d4dad5cf",
|
||||||
"lint-staged": "^7.0.2",
|
"lint-staged": "^7.0.2",
|
||||||
"localforage": "^1.7.1",
|
"localforage": "^1.7.1",
|
||||||
|
|
|
@ -1527,5 +1527,7 @@
|
||||||
"Explore": "Explore",
|
"Explore": "Explore",
|
||||||
"There is a bug... somewhere": "There is a bug... somewhere",
|
"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.",
|
"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--"
|
"--end--": "--end--"
|
||||||
}
|
}
|
||||||
|
|
|
@ -228,6 +228,11 @@ const Header = (props: Props) => {
|
||||||
{!authHeader && (
|
{!authHeader && (
|
||||||
<span style={{ position: 'relative' }}>
|
<span style={{ position: 'relative' }}>
|
||||||
<Button
|
<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"
|
className="header__navigation-item menu__title header__navigation-item--icon"
|
||||||
icon={ICONS.MENU}
|
icon={ICONS.MENU}
|
||||||
onClick={() => setSidebarOpen(!sidebarOpen)}
|
onClick={() => setSidebarOpen(!sidebarOpen)}
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
// @flow
|
// @flow
|
||||||
import * as ICONS from 'constants/icons';
|
import * as ICONS from 'constants/icons';
|
||||||
|
import { SITE_NAME } from 'config';
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
import ButtonTransaction from 'component/common/transaction-link';
|
import ButtonTransaction from 'component/common/transaction-link';
|
||||||
import CreditAmount from 'component/common/credit-amount';
|
import CreditAmount from 'component/common/credit-amount';
|
||||||
|
@ -83,6 +84,8 @@ class TxoListItem extends React.PureComponent<Props, State> {
|
||||||
is_my_output: isMyOutput,
|
is_my_output: isMyOutput,
|
||||||
} = txo;
|
} = txo;
|
||||||
|
|
||||||
|
const isLbryViewReward =
|
||||||
|
txo.signing_channel && txo.signing_channel.channel_id === '74562a01e5836c04040b80bf1f4d685fec02cc90';
|
||||||
const name = txoListName;
|
const name = txoListName;
|
||||||
const isMinus = (type === 'support' || type === 'payment' || type === 'other') && isMyInput && !isMyOutput;
|
const isMinus = (type === 'support' || type === 'payment' || type === 'other') && isMyInput && !isMyOutput;
|
||||||
const isTip = type === 'support' && ((isMyInput && !isMyOutput) || (!isMyInput && isMyOutput));
|
const isTip = type === 'support' && ((isMyInput && !isMyOutput) || (!isMyInput && isMyOutput));
|
||||||
|
@ -111,7 +114,7 @@ class TxoListItem extends React.PureComponent<Props, State> {
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<tr>
|
<tr>
|
||||||
<td>
|
<td className="table__date">
|
||||||
{timestamp ? (
|
{timestamp ? (
|
||||||
<div>
|
<div>
|
||||||
<DateTime date={date} show={DateTime.SHOW_DATE} formatOptions={dateFormat} />
|
<DateTime date={date} show={DateTime.SHOW_DATE} formatOptions={dateFormat} />
|
||||||
|
@ -135,6 +138,7 @@ class TxoListItem extends React.PureComponent<Props, State> {
|
||||||
<td>
|
<td>
|
||||||
{forClaim && <Button button="link" navigate={uri} label={claimName} disabled={!date} />}
|
{forClaim && <Button button="link" navigate={uri} label={claimName} disabled={!date} />}
|
||||||
{!forClaim && reward && <span>{reward.reward_title}</span>}
|
{!forClaim && reward && <span>{reward.reward_title}</span>}
|
||||||
|
{isLbryViewReward && <span className="help--inline">{__('%SITE_NAME% view reward', { SITE_NAME })}</span>}
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
<td>
|
<td>
|
||||||
|
|
|
@ -115,6 +115,10 @@ th {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.table__date {
|
||||||
|
font-size: var(--font-small);
|
||||||
|
}
|
||||||
|
|
||||||
.table--help {
|
.table--help {
|
||||||
td:nth-of-type(1) {
|
td:nth-of-type(1) {
|
||||||
min-width: 130px;
|
min-width: 130px;
|
||||||
|
|
|
@ -7498,9 +7498,9 @@ lazy-val@^1.0.4:
|
||||||
yargs "^13.2.2"
|
yargs "^13.2.2"
|
||||||
zstd-codec "^0.1.1"
|
zstd-codec "^0.1.1"
|
||||||
|
|
||||||
lbry-redux@lbryio/lbry-redux#70c52e42e8b918e60b8f12b36748e1aef8908c39:
|
lbry-redux@lbryio/lbry-redux#92a4263c908f6df5727c379a3b3348935891d806:
|
||||||
version "0.0.1"
|
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:
|
dependencies:
|
||||||
proxy-polyfill "0.1.6"
|
proxy-polyfill "0.1.6"
|
||||||
reselect "^3.0.0"
|
reselect "^3.0.0"
|
||||||
|
|
Loading…
Add table
Reference in a new issue