Merge pull request #143 from ubq-testing/claimUxImprovs

package.json

@@ -33,4 +33,4 @@
     "yaml": "^2.2.2"
   },
   "packageManager": "[email protected]"
-}
+}

static/scripts/rewards/toaster.ts

@@ -67,6 +67,12 @@ export function resetClaimButton() {
   claimButton.element.classList.remove("show-cl");
 }
 
+export function hideClaimButton() {
+  claimButton.element.disabled = true;
+  claimButton.element.classList.add("hide-cl");
+  claimButton.element.classList.remove("show-cl");
+}
+
 export function errorToast(error: any, errorMessage?: string) {
   delete error.stack;
   let ErrorData = JSON.stringify(error, null, 2);

static/scripts/rewards/web3/withdraw.ts

@@ -3,7 +3,9 @@ import { ethers } from "ethers";
 import { permit2Abi } from "../abis";
 import { permit2Address } from "../constants";
 import { TxType } from "../render-transaction/tx-type";
-import { toaster, resetClaimButton, errorToast, loadingClaimButton } from "../toaster";
+import { toaster, resetClaimButton, errorToast, loadingClaimButton, hideClaimButton } from "../toaster";
+import { app } from "../render-transaction";
+import { shortenAddress } from "../render-transaction/insert-table-data";
 
 export async function withdraw(signer: JsonRpcSigner, txData: TxType, errorMessage?: string) {
   const permit2Contract = new ethers.Contract(permit2Address, permit2Abi, signer);
@@ -13,8 +15,10 @@ export async function withdraw(signer: JsonRpcSigner, txData: TxType, errorMessa
       // get success message
       toaster.create("info", `Transaction sent`);
       tx.wait().then((receipt: any) => {
-        toaster.create("success", `Transaction pending: ${receipt?.transactionHash}`);
-        loadingClaimButton(false); // disables the claim button
+        toaster.create("success", `Claim Complete: ${receipt?.transactionHash}`);
+        const requestedAmountElement = document.getElementById("transferDetails.requestedAmount") as Element;
+        requestedAmountElement.innerHTML += " has been claimed!";
+        hideClaimButton();
       });
     })
     .catch((error: any) => {