diff --git a/ui/js/component/bodyTransactionList/index.js b/ui/js/component/bodyTransactionList/index.js deleted file mode 100644 index 95fcdaf11..000000000 --- a/ui/js/component/bodyTransactionList/index.js +++ /dev/null @@ -1,10 +0,0 @@ -import React from "react"; -import { connect } from "react-redux"; -import { doNavigate } from "actions/navigation"; -import TransactionTableBody from "./view"; - -const perform = dispatch => ({ - navigate: (path, params) => dispatch(doNavigate(path, params)), -}); - -export default connect(null, perform)(TransactionTableBody); diff --git a/ui/js/component/common.js b/ui/js/component/common.js index d92669262..8af8733c2 100644 --- a/ui/js/component/common.js +++ b/ui/js/component/common.js @@ -71,6 +71,7 @@ export class CreditAmount extends React.PureComponent { showFullPrice: React.PropTypes.bool, showPlus: React.PropTypes.bool, look: React.PropTypes.oneOf(["indicator", "plain"]), + fee: React.PropTypes.bool, }; static defaultProps = { @@ -81,6 +82,7 @@ export class CreditAmount extends React.PureComponent { showFree: false, showFullPrice: false, showPlus: false, + fee: false, }; render() { @@ -117,7 +119,10 @@ export class CreditAmount extends React.PureComponent { return ( diff --git a/ui/js/component/headerTransactionList/index.js b/ui/js/component/headerTransactionList/index.js deleted file mode 100644 index 60ae880d7..000000000 --- a/ui/js/component/headerTransactionList/index.js +++ /dev/null @@ -1,5 +0,0 @@ -import React from "react"; -import { connect } from "react-redux"; -import TransactionTableHeader from "./view"; - -export default connect(null, null)(TransactionTableHeader); diff --git a/ui/js/component/tipLink/view.jsx b/ui/js/component/tipLink/view.jsx index 03f7685ec..831806d48 100644 --- a/ui/js/component/tipLink/view.jsx +++ b/ui/js/component/tipLink/view.jsx @@ -32,7 +32,13 @@ class TipLink extends React.PureComponent { return (
-

{__("Support Claim")}

+

{__("Support")}

+
+
+ {__( + "Support the creator and the success of their content by sending a tip. " + )} +
({ + navigate: (path, params) => dispatch(doNavigate(path, params)), +}); + +export default connect(null, perform)(TransactionList); diff --git a/ui/js/component/bodyTransactionList/view.jsx b/ui/js/component/transactionList/internal/TransactionListBody.jsx similarity index 75% rename from ui/js/component/bodyTransactionList/view.jsx rename to ui/js/component/transactionList/internal/TransactionListBody.jsx index fa15d1619..12beb2e8d 100644 --- a/ui/js/component/bodyTransactionList/view.jsx +++ b/ui/js/component/transactionList/internal/TransactionListBody.jsx @@ -11,10 +11,7 @@ class TransactionTableBody extends React.PureComponent { let uri = `lbry://${claim_name}#${claim_id}`; return ( - this.props.navigate("/show", { uri })} - > + this.props.navigate(uri)}> {claim_name} ); @@ -37,6 +34,15 @@ class TransactionTableBody extends React.PureComponent { const date = transaction.date; const fee = transaction.fee; const filter = this.props.filter; + const options = { + weekday: "short", + year: "2-digit", + month: "short", + day: "numeric", + hour: "2-digit", + minute: "2-digit", + second: "2-digit", + }; if (filter == "tipSupport") transaction["tipSupport_info"] = transaction["support_info"].filter( @@ -49,7 +55,7 @@ class TransactionTableBody extends React.PureComponent { {date - ? date.toLocaleDateString() + " " + date.toLocaleTimeString() + ? date.toLocaleDateString("en-US", options) : {__("(Transaction pending)")} } @@ -58,12 +64,18 @@ class TransactionTableBody extends React.PureComponent { {" "} - - - {" "} + /> +
+ {this.getClaimLink(item.claim_name, item.claim_id)} @@ -77,7 +89,7 @@ class TransactionTableBody extends React.PureComponent { : {date - ? date.toLocaleDateString() + " " + date.toLocaleTimeString() + ? date.toLocaleDateString("en-US", options) : {__("(Transaction pending)")} } @@ -86,12 +98,18 @@ class TransactionTableBody extends React.PureComponent { {" "} - - - {" "} + /> +
+ diff --git a/ui/js/component/headerTransactionList/view.jsx b/ui/js/component/transactionList/internal/TransactionListHeader.jsx similarity index 85% rename from ui/js/component/headerTransactionList/view.jsx rename to ui/js/component/transactionList/internal/TransactionListHeader.jsx index 23fd61965..52f735fb9 100644 --- a/ui/js/component/headerTransactionList/view.jsx +++ b/ui/js/component/transactionList/internal/TransactionListHeader.jsx @@ -7,8 +7,7 @@ class TransactionTableHeader extends React.PureComponent { {__("Date")} - {__("Amount")} - {__("Fee")} + {__("Amount(Fee)")} {filter != "unfiltered" && {__("Claim Name")} } {__("Transaction")} diff --git a/ui/js/component/transactionList/view.jsx b/ui/js/component/transactionList/view.jsx index 361b54395..ee78e2acc 100644 --- a/ui/js/component/transactionList/view.jsx +++ b/ui/js/component/transactionList/view.jsx @@ -1,6 +1,6 @@ import React from "react"; -import TransactionTableHeader from "component/headerTransactionList"; -import TransactionTableBody from "component/bodyTransactionList"; +import TransactionTableHeader from "./internal/TransactionListHeader"; +import TransactionTableBody from "./internal/TransactionListBody"; import FormField from "component/formField"; class TransactionList extends React.PureComponent { @@ -18,6 +18,10 @@ class TransactionList extends React.PureComponent { }); } + handleClaimNameClicked(uri) { + this.props.navigate("/show", { uri }); + } + render() { const { emptyMessage, transactions } = this.props; const { filter } = this.state; @@ -38,8 +42,8 @@ class TransactionList extends React.PureComponent { type="select" onChange={this.handleFilterChanged.bind(this)} > - - + + @@ -47,7 +51,11 @@ class TransactionList extends React.PureComponent { - +
); diff --git a/ui/js/page/file/view.jsx b/ui/js/page/file/view.jsx index a77042ff3..08568c5b5 100644 --- a/ui/js/page/file/view.jsx +++ b/ui/js/page/file/view.jsx @@ -154,13 +154,14 @@ class FilePage extends React.PureComponent { />
-
- -
+ {!showTipBox && +
+ +
} {metadata && !showTipBox ?
@@ -174,13 +175,14 @@ class FilePage extends React.PureComponent { claim_id={claim.claim_id} /> : ""} -
- -
+ {!showTipBox && +
+ +
} );