Skip to content

Commit

Permalink
Merge pull request ubiquity#299 from ubiquity/revert-290-development
Browse files Browse the repository at this point in the history
Revert "optimistic view claim rendering"
  • Loading branch information
0x4007 authored Sep 12, 2024
2 parents 3850fef + 4fca642 commit 2e83e51
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 10 deletions.
3 changes: 1 addition & 2 deletions .cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@
"URLSAFE",
"WXDAI",
"XDAI",
"xmark",
"outfile"
"xmark"
],
"dictionaries": ["typescript", "node", "software-terms", "html"],
"import": ["@cspell/dict-typescript/cspell-ext.json", "@cspell/dict-node/cspell-ext.json", "@cspell/dict-software-terms"],
Expand Down
16 changes: 8 additions & 8 deletions static/scripts/rewards/web3/erc20-permit.ts
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,15 @@ async function transferFromPermit(permit2Contract: Contract, app: AppState) {
async function waitForTransaction(tx: TransactionResponse) {
try {
const receipt = await tx.wait();
viewClaimButton.onclick = () => {
window.open(`https://blockscan.com/tx/${receipt.transactionHash}`, "_blank");
};

console.log(receipt.transactionHash);
toaster.create("success", `Claim Complete.`);
buttonController.showViewClaim();
buttonController.hideLoader();
buttonController.hideMakeClaim();
console.log(receipt.transactionHash);

return receipt;
} catch (error: unknown) {
Expand Down Expand Up @@ -134,15 +140,9 @@ export function claimErc20PermitHandlerWrapper(app: AppState) {
const permit2Contract = new ethers.Contract(permit2Address, permit2Abi, signer);
if (!permit2Contract) return;

const tx: TransactionResponse = await transferFromPermit(permit2Contract, app);
const tx = await transferFromPermit(permit2Contract, app);
if (!tx) return;

viewClaimButton.onclick = () => window.open(`https://blockscan.com/tx/${tx.hash}`, "_blank");

buttonController.showViewClaim();
buttonController.hideLoader();
buttonController.hideMakeClaim();

const receipt = await waitForTransaction(tx);
if (!receipt) return;

Expand Down

0 comments on commit 2e83e51

Please sign in to comment.