Skip to content

Commit 7bc6179

Browse files
committed
fix tx status and show token contract address on transfer nft ui
1 parent 61e9f06 commit 7bc6179

File tree

8 files changed

+246
-164
lines changed

8 files changed

+246
-164
lines changed

src/components/Actions.tsx

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,23 @@
11
import { Text, Table, Box } from "@mantine/core";
22
import { TransactionsEntry } from "../stores/db/Transactions";
33

4-
export function Actions(props: { transaction: TransactionsEntry}) {
4+
export function Actions(props: { transaction: TransactionsEntry }) {
55
const rows = props.transaction.transactions.map((element, i) => (
66
<Table.Tr key={i} style={{ verticalAlign: "text-top" }}>
77
<Table.Td>{element.to}</Table.Td>
88
<Table.Td>{element.value || "0"}</Table.Td>
99
<Table.Td>
1010
<Box>
11-
<Text style={{ lineBreak: "anywhere"}}>
12-
<p>
13-
{element.data || "0x"}
14-
</p>
15-
</Text>
11+
<Text style={{ lineBreak: "anywhere" }}>{element.data || "0x"}</Text>
1612
</Box>
1713
</Table.Td>
18-
<Table.Td>{element.gasLimit || element.revertOnError ? "Auto" : "0"}</Table.Td>
14+
<Table.Td>
15+
{element.gasLimit || element.revertOnError ? "Auto" : "0"}
16+
</Table.Td>
1917
<Table.Td>{element.revertOnError ? "Yes" : "No"}</Table.Td>
20-
<Table.Td>{element.delegateCall ? "Yes" : "No"}</Table.Td>
18+
<Table.Td>{element.delegateCall ? "Yes" : "No"}</Table.Td>
2119
</Table.Tr>
22-
))
20+
));
2321

2422
return (
2523
<Table>
@@ -35,5 +33,5 @@ export function Actions(props: { transaction: TransactionsEntry}) {
3533
</Table.Thead>
3634
<Table.Tbody>{rows}</Table.Tbody>
3735
</Table>
38-
)
36+
);
3937
}

src/components/ActionsDecoded.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ export function ActionsDecoded(props: { transaction: TransactionsEntry, state: {
132132

133133
return <>
134134
<Space h="md" />
135-
{transaction.transactions.map((action, i) => <Box>
135+
{transaction.transactions.map((action, i) => <Box key={i}>
136136
<Title order={6}>Action #{i}</Title>
137137
<ActionDecode key={i} action={action} state={state} />
138138
</Box>

src/components/TransferNFTs.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ export default function TransferNFTs(args: {
262262
data={[
263263
{ label: "Select token", value: "" },
264264
...tokenContracts.map((token) => {
265-
return { label: token.name, value: token.address };
265+
return { label: `${token.name !== "" ? token.name : "unknown"} (${token.address})`, value: token.address };
266266
}),
267267
]}
268268
style={{ flex: 1 }}

src/sections/Send.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,6 @@ export function Send() {
247247
nonce: ethers.BigNumber.from(values.nonce).toString(),
248248
chainId: network.chainId.toString(),
249249
transactions: fromSequenceTransactions(address, actions),
250-
firstSeen: Date.now(),
251250
};
252251

253252
const subdigest = subdigestOf(txe);

src/sections/Transaction.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ export function Transaction() {
6868
<MiniCard title="Space" value={transaction.space} />
6969
<MiniCard title="Nonce" value={transaction.nonce} />
7070
<MiniCard title="Actions" value={transaction.transactions.length.toString()} />
71-
<MiniCard title="First Seen" value={transaction.firstSeen ? new Date(transaction.firstSeen).toDateString() : "--"} />
71+
<MiniCard title="First Seen" value={transaction.space ? new Date(Number(transaction.space)).toDateString() : "--"} />
7272
</Grid>
7373
</Box>
7474
<Box m="md">

src/sections/Transactions.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ export function Transactions() {
4242
<Table.Td>{element.space}</Table.Td>
4343
<Table.Td>{element.nonce}</Table.Td>
4444
<Table.Td>{element.transactions.length}</Table.Td>
45-
<Table.Td>{element.firstSeen ? new Date(element.firstSeen).toDateString() : "--"}</Table.Td>
45+
<Table.Td>{element.space ? new Date(Number(element.space)).toDateString(): "--"}</Table.Td>
4646
<Table.Td>
4747
<Button
4848
size="compact-sm"

0 commit comments

Comments
 (0)