diff --git a/static/app-strings.json b/static/app-strings.json index f9064fedd..23fda02a8 100644 --- a/static/app-strings.json +++ b/static/app-strings.json @@ -1157,5 +1157,9 @@ "Default": "Default", "Amount (LBC)": "Amount (LBC)", "Successfully unlocked your tip!": "Successfully unlocked your tip!", - "Successfully abandoned your claim.": "Successfully abandoned your claim." + "Successfully abandoned your claim.": "Successfully abandoned your claim.", + "You have %count% blocked %channels%.": "You have %count% blocked %channels%.", + "Account Password": "Account Password", + "You do not currently have a password set.": "You do not currently have a password set.", + "Add A Password": "Add A Password" } \ No newline at end of file diff --git a/ui/component/transactionListTable/view.jsx b/ui/component/transactionListTable/view.jsx index 514fcb772..8ffa7bb00 100644 --- a/ui/component/transactionListTable/view.jsx +++ b/ui/component/transactionListTable/view.jsx @@ -3,6 +3,8 @@ import * as MODALS from 'constants/modal_types'; import React from 'react'; import TxoListItem from './internal/txo-list-item'; import Spinner from 'component/spinner'; +import HelpLink from 'component/common/help-link'; + type Props = { emptyMessage: ?string, loading: boolean, @@ -32,7 +34,14 @@ function TransactionListTable(props: Props) { {__('Date')} - {__('Type')} + + { + <> + {__('Type')} + + + } + {__('Details')} {__('Transaction')} {__('Amount (LBC)')} diff --git a/ui/component/txoList/view.jsx b/ui/component/txoList/view.jsx index 61fbcc1a0..2b637c1c3 100644 --- a/ui/component/txoList/view.jsx +++ b/ui/component/txoList/view.jsx @@ -44,7 +44,9 @@ function TxoList(props: Props) { }; const hideStatus = - type === TXO.SENT || (currentUrlParams.type === TXO.RECEIVED && currentUrlParams.subtype !== TXO.TIP); + type === TXO.SENT || + (currentUrlParams.type === TXO.RECEIVED && + (currentUrlParams.subtype === TXO.PAYMENT || currentUrlParams.subtype === TXO.PURCHASE)); const params = {}; if (currentUrlParams.type) {