aljaz/mutiny-web
1
0
Fork 0
mirror of https://github.com/aljazceru/mutiny-web.git synced 2025-12-17 14:24:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Change tx id to internal for fedimint onchain

Browse Source
This commit is contained in:
Tony Giorgio
2024-05-06 14:43:16 -05:00
committed by Paul Miller
parent 3d77558d48
commit 37fc60b394
2 changed files with 47 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
src/components/ActivityDetailsModal.tsx
View File

@@ -408,48 +408,53 @@ function OnchainDetails(props: {
"Pending" "Pending"
)} )}
</KeyValue> </KeyValue>
<KeyValue key={i18n.t("activity.transaction_details.txid")}> <Show when={props.info.txid}>
<div class="flex gap-1"> <KeyValue key={i18n.t("activity.transaction_details.txid")}>
{/* Have to do all these shenanigans because css / html is hard */} <div class="flex gap-1">
<div class="grid w-full grid-cols-[minmax(0,_1fr)_auto] gap-1"> {/* Have to do all these shenanigans because css / html is hard */}
<a <div class="grid w-full grid-cols-[minmax(0,_1fr)_auto] gap-1">
target="_blank" <a
rel="noopener noreferrer" target="_blank"
href={mempoolTxUrl(props.info.txid, network)} rel="noopener noreferrer"
href={mempoolTxUrl(
props.info.txid,
network
)}
>
<div class="flex flex-nowrap items-center font-mono text-white">
<span class="truncate">
{props.info.txid}
</span>
<span>
{props.info.txid.length > 32
? props.info.txid.slice(-8)
: ""}
</span>
<svg
class="inline-block w-[16px] overflow-visible pl-0.5 text-white"
width="16"
height="16"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M6.00002 3.33337v1.33334H10.39L2.66669 12.39l.94333.9434 7.72338-7.72336V10h1.3333V3.33337H6.00002Z"
fill="currentColor"
/>
</svg>
</div>
</a>
</div>
<button
class="min-w-[1.5rem] p-1"
classList={{ "bg-m-green rounded": copied() }}
onClick={() => copy(props.info.txid)}
> >
<div class="flex flex-nowrap items-center font-mono text-white"> <Copy class="h-4 w-4" />
<span class="truncate"> </button>
{props.info.txid}
</span>
<span>
{props.info.txid.length > 32
? props.info.txid.slice(-8)
: ""}
</span>
<svg
class="inline-block w-[16px] overflow-visible pl-0.5 text-white"
width="16"
height="16"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M6.00002 3.33337v1.33334H10.39L2.66669 12.39l.94333.9434 7.72338-7.72336V10h1.3333V3.33337H6.00002Z"
fill="currentColor"
/>
</svg>
</div>
</a>
</div> </div>
<button </KeyValue>
class="min-w-[1.5rem] p-1" </Show>
classList={{ "bg-m-green rounded": copied() }}
onClick={() => copy(props.info.txid)}
>
<Copy class="h-4 w-4" />
</button>
</div>
</KeyValue>
</ul> </ul>
</VStack> </VStack>
); );

3
src/routes/Receive.tsx
View File

@@ -60,6 +60,7 @@ export type OnChainTx = {
}>; }>;
}; };
txid: string; txid: string;
internal_id: string;
received: number; received: number;
sent: number; sent: number;
confirmation_time: { confirmation_time: {
@@ -213,7 +214,7 @@ export function Receive() {
const paymentTxId = const paymentTxId =
paidState() === "onchain_paid" paidState() === "onchain_paid"
? paymentTx() ? paymentTx()
? paymentTx()?.txid ? paymentTx()?.internal_id
: undefined : undefined
: paymentInvoice() : paymentInvoice()
? paymentInvoice()?.payment_hash ? paymentInvoice()?.payment_hash