diff --git a/src/routes/safe/components/Layout.jsx b/src/routes/safe/components/Layout.jsx index 62ee4495..0cfcfd1e 100644 --- a/src/routes/safe/components/Layout.jsx +++ b/src/routes/safe/components/Layout.jsx @@ -154,7 +154,13 @@ class Layout extends React.Component { /> )} {tabIndex === 1 && ( - + )} {tabIndex === 2 && ( , } -const ExpandedTx = ({ classes, tx }: Props) => { +const ExpandedTx = ({ + classes, tx, threshold, owners, +}: Props) => { const [tabIndex, setTabIndex] = useState(0) + const confirmedLabel = `Confirmed [${tx.confirmations.size}/${threshold}]` + const unconfirmedLabel = `Unconfirmed [${owners.size - tx.confirmations.size}]` const handleTabChange = (event, tabClicked) => { setTabIndex(tabClicked) @@ -61,8 +68,8 @@ const ExpandedTx = ({ classes, tx }: Props) => { - - + + diff --git a/src/routes/safe/components/TransactionsNew/TxsTable/index.jsx b/src/routes/safe/components/TransactionsNew/TxsTable/index.jsx index 1fe95875..1136952f 100644 --- a/src/routes/safe/components/TransactionsNew/TxsTable/index.jsx +++ b/src/routes/safe/components/TransactionsNew/TxsTable/index.jsx @@ -14,6 +14,7 @@ import Row from '~/components/layout/Row' import { type Column, cellWidth } from '~/components/Table/TableHead' import Table from '~/components/Table' import { type Transaction } from '~/routes/safe/store/models/transaction' +import { type Owner } from '~/routes/safe/store/models/owner' import ExpandedTxComponent from './ExpandedTx' import { getTxTableData, generateColumns, TX_TABLE_NONCE_ID, type TransactionRow, TX_TABLE_RAW_TX_ID, @@ -29,10 +30,14 @@ const expandCellStyle = { type Props = { classes: Object, transactions: List, + threshold: number, + owners: List, } const TxsTable = (props: Props) => { - const { classes, transactions } = props + const { + classes, transactions, threshold, owners, + } = props const [expandedTx, setExpandedTx] = useState(null) const handleTxExpand = (nonce) => { @@ -93,6 +98,8 @@ const TxsTable = (props: Props) => { component={ExpandedTxComponent} unmountOnExit tx={row[TX_TABLE_RAW_TX_ID]} + threshold={threshold} + owners={owners} /> diff --git a/src/routes/safe/components/TransactionsNew/index.jsx b/src/routes/safe/components/TransactionsNew/index.jsx index 5a56c125..de6addb0 100644 --- a/src/routes/safe/components/TransactionsNew/index.jsx +++ b/src/routes/safe/components/TransactionsNew/index.jsx @@ -4,12 +4,14 @@ import { List } from 'immutable' import NoTransactions from '~/routes/safe/components/TransactionsNew/NoTransactions' import TxsTable from '~/routes/safe/components/TransactionsNew/TxsTable' import { type Transaction } from '~/routes/safe/store/models/transaction' +import { type Owner } from '~/routes/safe/store/models/owner' type Props = { safeAddress: string, threshold: number, fetchTransactions: Function, transactions: List, + owners: List, } class Transactions extends React.Component { @@ -20,11 +22,17 @@ class Transactions extends React.Component { } render() { - const { transactions, safeName, threshold } = this.props + const { transactions, owners, threshold } = this.props const hasTransactions = transactions.size > 0 return ( - {hasTransactions ? : } + + {hasTransactions ? ( + + ) : ( + + )} + ) } }