Skip to content

fixed the spinning ui eror #4373

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RustyCoderX wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fixed the spinning ui eror #4373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion packages/app-extension/src/components/Unlocked/Settings/Xnfts/Detail.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,13 +252,21 @@ const UninstallConfirmationCard = ({ xnft }: { xnft: any }) => {
//
// Confirm tx.
//
logger.debug("starting transaction confirmation", { txSig });
try {
await confirmTransaction(
// Add a UI-level timeout to prevent indefinite hanging
const confirmationPromise = confirmTransaction(
ctx.connection,
txSig,
ctx.commitment === "finalized" ? "finalized" : "confirmed"
);

const timeoutPromise = new Promise((_, reject) =>
setTimeout(() => reject(new Error("UI timeout: confirmation took too long")), 45000)
);

await Promise.race([confirmationPromise, timeoutPromise]);
logger.debug("transaction confirmed successfully", { txSig });
setCardType("complete");
} catch (err: any) {
logger.error("unable to confirm", err);
Expand Down
15 changes: 15 additions & 0 deletions packages/secure-clients/src/SolanaClient/utils/confirmTransaction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,24 @@ import type {
GetVersionedTransactionConfig,
} from "@solana/web3.js";

import { getLogger } from "@coral-xyz/common";

const logger = getLogger("confirm-transaction");

export async function confirmTransaction(
c: Connection,
txSig: string,
commitmentOrConfig?: GetVersionedTransactionConfig | Finality
): Promise<ReturnType<(typeof c)["getParsedTransaction"]>> {
return new Promise(async (resolve, reject) => {
logger.debug("starting confirmation with timeout", { txSig });
setTimeout(
() =>
reject(new Error(`30 second timeout: unable to confirm transaction`)),
30000
);
await new Promise((resolve) => setTimeout(resolve, 5000));
logger.debug("initial 5s delay complete, starting polling", { txSig });

const config = {
// Support confirming Versioned Transactions
Expand All @@ -27,11 +33,20 @@ export async function confirmTransaction(
: commitmentOrConfig),
};

let attempts = 0;
let tx = await c.getParsedTransaction(txSig, config);
logger.debug("first getParsedTransaction attempt", { txSig, found: tx !== null });
while (tx === null) {
attempts++;
logger.debug(`polling attempt ${attempts}`, { txSig });
tx = await c.getParsedTransaction(txSig, config);
await new Promise((resolve) => setTimeout(resolve, 1000));
if (attempts > 25) { // Prevent infinite loop, though timeout should catch it
logger.warn("exceeded max polling attempts", { txSig, attempts });
break;
}
}
logger.debug("confirmation complete", { txSig, found: tx !== null, attempts });
resolve(tx);
});
}