Merge pull request #299 from ubiquity/revert-290-development

Revert "optimistic view claim rendering"

.cspell.json

@@ -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"],

static/scripts/rewards/web3/erc20-permit.ts

@@ -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) {
@@ -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;