From 60d118940d1b57a5748719f2b43021884ac47df3 Mon Sep 17 00:00:00 2001
From: MickWang <1244134672@qq.com>
Date: Wed, 24 Apr 2024 17:46:21 +0800
Subject: [PATCH] add wait receipt for withdraw tx

---
 .../transaction/WithdrawalsAvailableForClaimAlert.vue  | 10 +++++-----
 composables/zksync/useTransaction.ts                   |  7 +++++++
 store/zksync/withdrawals.ts                            |  2 +-
 utils/helpers.ts                                       |  4 ++++
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/components/transaction/WithdrawalsAvailableForClaimAlert.vue b/components/transaction/WithdrawalsAvailableForClaimAlert.vue
index 4932d9d9..d5c6585f 100644
--- a/components/transaction/WithdrawalsAvailableForClaimAlert.vue
+++ b/components/transaction/WithdrawalsAvailableForClaimAlert.vue
@@ -1,7 +1,7 @@
 <template>
   <CommonHeightTransition :opened="!!withdrawalsAvailableForClaiming.length">
     <CommonAlert variant="warning" :icon="ExclamationTriangleIcon" class="mb-block-gap">
-      <p>You have withdrawals available for claiming on {{ newNetwork?.l1Network?.name }} network</p>
+      <p class="mr-4">You have withdrawals available for claiming on {{ newNetwork?.l1Network?.name }} network</p>
       <CommonButton as="RouterLink" :to="{ name: 'transfers' }" variant="primary">
         <span class="whitespace-nowrap">See withdrawals</span>
       </CommonButton>
@@ -19,10 +19,10 @@ import useNetworks from "@/composables/useNetworks";
 
 const { eraNetwork } = storeToRefs(useZkSyncProviderStore());
 const { withdrawalsAvailableForClaiming } = storeToRefs(useZkSyncWithdrawalsStore());
-const { primaryNetwork, zkSyncNetworks,getNetworkInfo } = useNetworks();
+const { primaryNetwork, zkSyncNetworks, getNetworkInfo } = useNetworks();
 const newNetwork = computed(() => {
-  if (withdrawalsAvailableForClaiming.value.length> 0) {
-    return getNetworkInfo(withdrawalsAvailableForClaiming.value[0])
+  if (withdrawalsAvailableForClaiming.value.length > 0) {
+    return getNetworkInfo(withdrawalsAvailableForClaiming.value[0]);
   }
-})
+});
 </script>
diff --git a/composables/zksync/useTransaction.ts b/composables/zksync/useTransaction.ts
index 88afbb3a..cc5d41ce 100644
--- a/composables/zksync/useTransaction.ts
+++ b/composables/zksync/useTransaction.ts
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import { useMemoize } from "@vueuse/core";
 import { type BigNumberish } from "ethers";
 
@@ -6,8 +7,10 @@ import useScreening from "@/composables/useScreening";
 import type { TokenAmount } from "@/types";
 import type { Provider, Signer } from "@/zksync-web3-nova/src";
 
+import { useOnboardStore } from "@/store/onboard";
 import { useZkSyncWalletStore } from "@/store/zksync/wallet";
 import { formatError } from "@/utils/formatters";
+import { sleep } from "@/utils/helpers";
 
 type TransactionParams = {
   type: "transfer" | "withdrawal";
@@ -29,6 +32,8 @@ export default (getSigner: () => Promise<Signer | undefined>, getProvider: () =>
   const error = ref<Error | undefined>();
   const transactionHash = ref<string | undefined>();
   const eraWalletStore = useZkSyncWalletStore();
+  const onboardStore = useOnboardStore();
+  const publicClient = onboardStore.getPublicClient(onboardStore.network.chainId);
 
   const retrieveBridgeAddresses = useMemoize(() => getProvider().getDefaultBridgeAddresses());
   const { validateAddress } = useScreening();
@@ -68,6 +73,8 @@ export default (getSigner: () => Promise<Signer | undefined>, getProvider: () =>
       });
 
       transactionHash.value = tx.hash;
+      await sleep(1500);
+      await publicClient?.getTransactionReceipt({ hash: tx.hash as `0x${string}` });
       status.value = "done";
 
       return tx;
diff --git a/store/zksync/withdrawals.ts b/store/zksync/withdrawals.ts
index 607e3908..ca65fb51 100644
--- a/store/zksync/withdrawals.ts
+++ b/store/zksync/withdrawals.ts
@@ -35,7 +35,7 @@ export const useZkSyncWithdrawalsStore = defineStore("zkSyncWithdrawals", () =>
 
   const TRANSACTIONS_FETCH_LIMIT = 100; // may miss claimable tx when user address has many txs;
 
-  const DELAY_DAYS = process.env.NODE_TYPE === "nexus-sepolia" ? 1 : 7;
+  const DELAY_DAYS = process.env.NODE_TYPE === "nexus-sepolia" ? 0.5 : 7;
 
   const isWithinDelayDays = (timestamp: number | string) => {
     return Date.now() - new Date(timestamp).getTime() < DELAY_DAYS * 24 * 60 * 60 * 1000;
diff --git a/utils/helpers.ts b/utils/helpers.ts
index c566cc3e..2984cf01 100644
--- a/utils/helpers.ts
+++ b/utils/helpers.ts
@@ -54,3 +54,7 @@ export async function retry<T>(func: () => Promise<T>, options: RetryOptions = {
     }
   }
 }
+
+export async function sleep(time: number) {
+  return new Promise((resolve) => setTimeout(resolve, time));
+}