From 9889827f675a99669f9169718564307a717eb9b3 Mon Sep 17 00:00:00 2001
From: MickWang <1244134672@qq.com>
Date: Mon, 22 Apr 2024 18:11:08 +0800
Subject: [PATCH 1/6] update for estimate withdray delay time

---
 store/zksync/withdrawals.ts                |  7 ++++---
 utils/constants.ts                         |  8 +++++++-
 utils/helpers.ts                           | 10 ++++++++++
 views/transactions/WithdrawalSubmitted.vue | 18 ++++++++++++------
 4 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/store/zksync/withdrawals.ts b/store/zksync/withdrawals.ts
index e2cd29d2..abae0758 100644
--- a/store/zksync/withdrawals.ts
+++ b/store/zksync/withdrawals.ts
@@ -33,7 +33,7 @@ export const useZkSyncWithdrawalsStore = defineStore("zkSyncWithdrawals", () =>
     return new Promise((resolve) => setTimeout(resolve, ms));
   }
   const setStatus = async (obj: { transactionHash: ethers.utils.BytesLike; status: string; gateway: string }) => {
-    const { primaryNetwork, zkSyncNetworks,getNetworkInfo } = useNetworks();
+    const { primaryNetwork, zkSyncNetworks, getNetworkInfo } = useNetworks();
 
     const { selectedNetwork } = storeToRefs(useNetworkStore());
     let provider: Provider | undefined;
@@ -82,7 +82,7 @@ export const useZkSyncWithdrawalsStore = defineStore("zkSyncWithdrawals", () =>
     );
     const withdrawals = transfers.items.filter((e) => e.type === "withdrawal" && e.token && e.amount);
     for (const withdrawal of withdrawals) {
-      const { primaryNetwork, zkSyncNetworks,getNetworkInfo } = useNetworks();
+      const { primaryNetwork, zkSyncNetworks, getNetworkInfo } = useNetworks();
 
       const transactionFromStorage = transactionStatusStore.getTransaction(withdrawal.transactionHash);
       if (transactionFromStorage) {
@@ -156,7 +156,8 @@ export const useZkSyncWithdrawalsStore = defineStore("zkSyncWithdrawals", () =>
         },
         info: {
           expectedCompleteTimestamp: new Date(
-            new Date(withdrawalTransfer.timestamp).getTime() + WITHDRAWAL_DELAY
+            new Date(withdrawalTransfer.timestamp).getTime() +
+              getEstimateWithdrawalDelayDays(withdrawalTransfer.timestamp) * 24 * 3600 * 1000
           ).toISOString(),
           completed: withdrawal.status === "Finalized",
           withdrawalFinalizationAvailable: transactionDetails.status === "verified",
diff --git a/utils/constants.ts b/utils/constants.ts
index e1124eaa..268e4a81 100644
--- a/utils/constants.ts
+++ b/utils/constants.ts
@@ -9,7 +9,13 @@ export const ETH_TOKEN: Token = {
   iconUrl: "/img/eth.svg",
 };
 
-export const WITHDRAWAL_DELAY_DAYS = 14;
+export const WITHDRAWAL_DELAY_DAYS = 7;
+
+// Last syncL2Requests tx on blast: Apr-20-2024 09:45:31 AM +UTC;
+// deposit before this time , estimate withdraw time is 14 days;
+// deposit after this time, estimate withdraw time is :
+// ( 14 days - (deposit time - this time)) < 7days ? 7days : ( 14 days - (deposit time - this time));
+export const LAST_BLAST_SYNCL2_TIME = 1713606331000;
 
 export const MERGE_TOKENS = [
   {
diff --git a/utils/helpers.ts b/utils/helpers.ts
index c566cc3e..de9bd2d8 100644
--- a/utils/helpers.ts
+++ b/utils/helpers.ts
@@ -54,3 +54,13 @@ export async function retry<T>(func: () => Promise<T>, options: RetryOptions = {
     }
   }
 }
+
+export const getEstimateWithdrawalDelayDays = (txTime: string) => {
+  const transactionTime = new Date(txTime).getTime();
+  if (transactionTime < LAST_BLAST_SYNCL2_TIME) {
+    return 14;
+  } else {
+    const gap = Math.ceil(14 - (transactionTime - LAST_BLAST_SYNCL2_TIME) / (24 * 3600 * 1000));
+    return gap >= 8 ? gap : 8;
+  }
+};
diff --git a/views/transactions/WithdrawalSubmitted.vue b/views/transactions/WithdrawalSubmitted.vue
index f2e856b4..7300db52 100644
--- a/views/transactions/WithdrawalSubmitted.vue
+++ b/views/transactions/WithdrawalSubmitted.vue
@@ -11,8 +11,7 @@
         </template>
         <template v-else>
           Your funds will be available on <span class="font-medium">{{ transaction.to.destination.label }}</span> after
-          the {{WITHDRAWAL_DELAY_DAYS}}-day delay.
-          During this time, the transaction will be processed
+          the {{ displayEstimateWithdrawTime }}-day delay. During this time, the transaction will be processed
           {{
             withdrawalManualFinalizationRequired
               ? "and become available for claiming."
@@ -160,7 +159,10 @@ import { useNetworkStore } from "@/store/network";
 import { useOnboardStore } from "@/store/onboard";
 import { useZkSyncProviderStore } from "@/store/zksync/provider";
 import { useZkSyncTransactionStatusStore } from "@/store/zksync/transactionStatus";
-import { WITHDRAWAL_DELAY_DAYS } from '@/utils/constants'
+import { LAST_BLAST_SYNCL2_TIME, WITHDRAWAL_DELAY_DAYS } from "@/utils/constants";
+
+import { getEstimateWithdrawalDelayDays } from "@/utils/helpers";
+
 const props = defineProps({
   transaction: {
     type: Object as PropType<TransactionInfo>,
@@ -189,8 +191,8 @@ const getNetworkInfo = () => {
     return props.transaction ? newNetwork ?? primaryNetwork : obj;
   } else {
     let objs = zkSyncNetworks.find(
-      (item) => item.key && item.key.toLowerCase() === (props.transaction?.token?.networkKey || 'primary').toLowerCase()
-    )
+      (item) => item.key && item.key.toLowerCase() === (props.transaction?.token?.networkKey || "primary").toLowerCase()
+    );
     const obj = { l1Network: { id: l1Network.value?.id, blockExplorers: { default: { url: l1BlockExplorerUrl } } } };
     return props.transaction ? objs ?? primaryNetwork : obj;
   }
@@ -204,7 +206,7 @@ const { connectorName } = storeToRefs(onboardStore);
 
 const network = computed(() => {
   return onboardStore.network;
-})
+});
 
 const withdrawalManualFinalizationRequired = computed(() => {
   return (
@@ -216,6 +218,10 @@ const withdrawalFinalizationAvailable = computed(() => {
   return withdrawalManualFinalizationRequired.value && props.transaction.info.withdrawalFinalizationAvailable;
 });
 
+const displayEstimateWithdrawTime = computed(() => {
+  return getEstimateWithdrawalDelayDays(props.transaction.timestamp);
+});
+
 const {
   feeToken,
   totalFee: fee,

From 54c296036b4691bcd2c17595784dc0bbc700e4ca Mon Sep 17 00:00:00 2001
From: MickWang <1244134672@qq.com>
Date: Mon, 22 Apr 2024 18:27:23 +0800
Subject: [PATCH 2/6] update for estimate withdray delay time

---
 store/zksync/transactionStatus.ts          |  2 +-
 utils/helpers.ts                           |  2 +-
 views/transactions/Withdraw.vue            | 22 ++++++++++------------
 views/transactions/WithdrawalSubmitted.vue |  2 --
 4 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/store/zksync/transactionStatus.ts b/store/zksync/transactionStatus.ts
index bf36dd6b..d85eb85f 100644
--- a/store/zksync/transactionStatus.ts
+++ b/store/zksync/transactionStatus.ts
@@ -44,7 +44,7 @@ export const getEstmatdDepositDelay = (networkKey: string): number => {
     return ESTIMATED_DEPOSIT_DELAY_SECONDARY;
   }
 };
-export const WITHDRAWAL_DELAY = 14 * 24 * 60 * 60 * 1000; // 7 * 24 hours
+export const WITHDRAWAL_DELAY = 7 * 24 * 60 * 60 * 1000; // 7 * 24 hours
 export type Address = Hash;
 export type ForwardL2Request = {
   gateway: Address;
diff --git a/utils/helpers.ts b/utils/helpers.ts
index de9bd2d8..c04cc266 100644
--- a/utils/helpers.ts
+++ b/utils/helpers.ts
@@ -55,7 +55,7 @@ export async function retry<T>(func: () => Promise<T>, options: RetryOptions = {
   }
 }
 
-export const getEstimateWithdrawalDelayDays = (txTime: string) => {
+export const getEstimateWithdrawalDelayDays = (txTime: string | number) => {
   const transactionTime = new Date(txTime).getTime();
   if (transactionTime < LAST_BLAST_SYNCL2_TIME) {
     return 14;
diff --git a/views/transactions/Withdraw.vue b/views/transactions/Withdraw.vue
index fd41ac6b..722d4f3b 100644
--- a/views/transactions/Withdraw.vue
+++ b/views/transactions/Withdraw.vue
@@ -184,11 +184,12 @@
             class="mb-block-padding-1/2 sm:mb-block-gap"
           >
             <p v-if="withdrawalManualFinalizationRequired">
-              You will be able to claim your withdrawal only after a {{ WITHDRAWAL_DELAY_DAYS }}-day withdrawal delay.
+              You will be able to claim your withdrawal only after a {{ displayEstimateWithdrawalDelayDays }}-day
+              withdrawal delay.
               <!-- <a class="underline underline-offset-2" :href="ZKSYNC_WITHDRAWAL_DELAY" target="_blank">Learn more</a> -->
             </p>
             <p v-else>
-              You will receive funds only after a {{ WITHDRAWAL_DELAY_DAYS }}-day withdrawal delay.
+              You will receive funds only after a {{ displayEstimateWithdrawalDelayDays }}-day withdrawal delay.
               <!-- <a class="underline underline-offset-2" :href="ZKSYNC_WITHDRAWAL_DELAY" target="_blank">Learn more</a> -->
             </p>
           </CommonAlert>
@@ -487,20 +488,13 @@ import { useOnboardStore } from "@/store/onboard";
 import { usePreferencesStore } from "@/store/preferences";
 import { useZkSyncProviderStore } from "@/store/zksync/provider";
 import { useZkSyncTokensStore } from "@/store/zksync/tokens";
-import { WITHDRAWAL_DELAY } from "@/store/zksync/transactionStatus";
 import { useZkSyncTransactionStatusStore } from "@/store/zksync/transactionStatus";
 import { useZkSyncTransfersHistoryStore } from "@/store/zksync/transfersHistory";
 import { useZkSyncWalletStore } from "@/store/zksync/wallet";
-import {
-  ETH_TOKEN,
-  isMergeToken,
-  isSupportedMergeToken,
-  MergeTokenContractUrl,
-  WITHDRAWAL_DELAY_DAYS,
-} from "@/utils/constants";
+import { ETH_TOKEN, isMergeToken, isSupportedMergeToken } from "@/utils/constants";
 import { ZKSYNC_WITHDRAWAL_DELAY } from "@/utils/doc-links";
 import { checksumAddress, decimalToBigNumber, formatRawTokenPrice, parseTokenAmount } from "@/utils/formatters";
-import { calculateFee } from "@/utils/helpers";
+import { calculateFee, getEstimateWithdrawalDelayDays } from "@/utils/helpers";
 import { silentRouterChange } from "@/utils/helpers";
 import { TransitionAlertScaleInOutTransition, TransitionOpacity } from "@/utils/transitions";
 import TransferSubmitted from "@/views/transactions/TransferSubmitted.vue";
@@ -595,6 +589,8 @@ const fromNetworkSelected = (networkKey?: string) => {
 const step = ref<"form" | "withdrawal-finalization-warning" | "confirm" | "submitted">("form");
 const destination = computed(() => (props.type === "transfer" ? destinations.value.nova : destinations.value.arbitrum));
 
+const displayEstimateWithdrawalDelayDays = getEstimateWithdrawalDelayDays(Date.now());
+
 const availableTokens = computed(() => {
   if (!tokens.value) return [];
   if (props.type === "withdrawal") {
@@ -1067,7 +1063,9 @@ const makeTransaction = async () => {
       info: {
         expectedCompleteTimestamp:
           transaction.value?.type === "withdrawal"
-            ? new Date(new Date().getTime() + WITHDRAWAL_DELAY).toISOString()
+            ? new Date(
+                new Date().getTime() + getEstimateWithdrawalDelayDays(Date.now()) * 24 * 60 * 60 * 1000
+              ).toISOString()
             : undefined,
         completed: false,
       },
diff --git a/views/transactions/WithdrawalSubmitted.vue b/views/transactions/WithdrawalSubmitted.vue
index 7300db52..c2fa0521 100644
--- a/views/transactions/WithdrawalSubmitted.vue
+++ b/views/transactions/WithdrawalSubmitted.vue
@@ -159,8 +159,6 @@ import { useNetworkStore } from "@/store/network";
 import { useOnboardStore } from "@/store/onboard";
 import { useZkSyncProviderStore } from "@/store/zksync/provider";
 import { useZkSyncTransactionStatusStore } from "@/store/zksync/transactionStatus";
-import { LAST_BLAST_SYNCL2_TIME, WITHDRAWAL_DELAY_DAYS } from "@/utils/constants";
-
 import { getEstimateWithdrawalDelayDays } from "@/utils/helpers";
 
 const props = defineProps({

From 5795b921a121706465927e1bc878144b14d7a2db Mon Sep 17 00:00:00 2001
From: MickWang <1244134672@qq.com>
Date: Mon, 22 Apr 2024 18:54:41 +0800
Subject: [PATCH 3/6] fix withdrawal chain display issue

---
 store/zksync/withdrawals.ts | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/store/zksync/withdrawals.ts b/store/zksync/withdrawals.ts
index e2cd29d2..4b898b68 100644
--- a/store/zksync/withdrawals.ts
+++ b/store/zksync/withdrawals.ts
@@ -33,7 +33,7 @@ export const useZkSyncWithdrawalsStore = defineStore("zkSyncWithdrawals", () =>
     return new Promise((resolve) => setTimeout(resolve, ms));
   }
   const setStatus = async (obj: { transactionHash: ethers.utils.BytesLike; status: string; gateway: string }) => {
-    const { primaryNetwork, zkSyncNetworks,getNetworkInfo } = useNetworks();
+    const { primaryNetwork, zkSyncNetworks, getNetworkInfo } = useNetworks();
 
     const { selectedNetwork } = storeToRefs(useNetworkStore());
     let provider: Provider | undefined;
@@ -82,10 +82,30 @@ export const useZkSyncWithdrawalsStore = defineStore("zkSyncWithdrawals", () =>
     );
     const withdrawals = transfers.items.filter((e) => e.type === "withdrawal" && e.token && e.amount);
     for (const withdrawal of withdrawals) {
-      const { primaryNetwork, zkSyncNetworks,getNetworkInfo } = useNetworks();
+      const { primaryNetwork, zkSyncNetworks, getNetworkInfo } = useNetworks();
 
       const transactionFromStorage = transactionStatusStore.getTransaction(withdrawal.transactionHash);
       if (transactionFromStorage) {
+        // check if tx.to.destination is matching with tx.token.networkKey for erc20
+        if (
+          transactionFromStorage.to.destination.key !== transactionFromStorage.token.networkKey &&
+          transactionFromStorage.token.symbol !== "ETH"
+        ) {
+          const { selectedNetwork } = storeToRefs(useNetworkStore());
+          const eraNetworks = getNetworkInfo(withdrawal) || selectedNetwork.value;
+          const obj = {
+            iconUrl: eraNetworks.logoUrl!,
+            key: "nova",
+            label: eraNetworks?.l1Network?.name ?? "",
+          };
+          transactionStatusStore.updateTransactionData(withdrawal.transactionHash, {
+            ...transactionFromStorage,
+            to: {
+              ...transactionFromStorage.to,
+              destination: obj,
+            },
+          });
+        }
         if (!transactionFromStorage.info.completed) {
           await setStatus(withdrawal);
           await sleep(200);

From fd7b8794cd0e15fde43f09607f9520ad6a016ea7 Mon Sep 17 00:00:00 2001
From: MickWang <1244134672@qq.com>
Date: Wed, 24 Apr 2024 15:06:27 +0800
Subject: [PATCH 4/6] update timer days display

---
 components/common/Timer.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/common/Timer.vue b/components/common/Timer.vue
index 80f9b3f9..0b2e2e60 100644
--- a/components/common/Timer.vue
+++ b/components/common/Timer.vue
@@ -49,7 +49,7 @@ const formatTimeDiff = (diff: number, onlyDays = false): string => {
 
   if (props.format === "human-readable") {
     if (onlyDays) {
-      return `~ ${day} day${day !== 1 ? "s" : ""}`
+      return `~ ${day + 1} day${day + 1 !== 1 ? "s" : ""}`;
     }
     let formattedString = "";
     if (hours > 0) formattedString += `${day} day ${hours} hour${hours > 1 ? "s" : ""} `;

From 5267ecbcc79f7f5dc0221a8e27c79e9d1f56be28 Mon Sep 17 00:00:00 2001
From: MickWang <1244134672@qq.com>
Date: Wed, 24 Apr 2024 16:24:50 +0800
Subject: [PATCH 5/6] update transfers ui

---
 pages/transfers.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/transfers.vue b/pages/transfers.vue
index 14b0145e..e0bbc290 100644
--- a/pages/transfers.vue
+++ b/pages/transfers.vue
@@ -46,8 +46,8 @@
         <CommonCardWithLineButtons>
           <FailedDepositLineItem v-for="(item, index) in failedTransfers" :key="index" :transfer="item" as="a" />
         </CommonCardWithLineButtons>
-        <TypographyCategoryLabel v-if="!hasOnlyRecentBridgeOperations">Completed transfers</TypographyCategoryLabel>
       </template>
+      <TypographyCategoryLabel v-if="!hasOnlyRecentBridgeOperations">Completed transfers</TypographyCategoryLabel>
 
       <div v-if="loading">
         <CommonCardWithLineButtons>

From 45dd3d49246410846e86e35d8ca3b05d9c7d6028 Mon Sep 17 00:00:00 2001
From: MickWang <1244134672@qq.com>
Date: Thu, 25 Apr 2024 16:09:03 +0800
Subject: [PATCH 6/6] add reload merge token info

---
 composables/transaction/useMergeToken.ts | 2 ++
 views/transactions/Deposit.vue           | 5 +++--
 views/transactions/Withdraw.vue          | 7 ++++++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/composables/transaction/useMergeToken.ts b/composables/transaction/useMergeToken.ts
index 095d530d..786fcc03 100644
--- a/composables/transaction/useMergeToken.ts
+++ b/composables/transaction/useMergeToken.ts
@@ -23,6 +23,7 @@ export default (tokenL2Address: Ref<string | undefined>) => {
     inProgress,
     error,
     execute: getMergeTokenInfo,
+    reload: reloadMergeTokenInfo,
     reset,
   } = usePromise(
     async () => {
@@ -59,5 +60,6 @@ export default (tokenL2Address: Ref<string | undefined>) => {
     inProgress: computed(() => inProgress.value),
     error: computed(() => error.value),
     requestMergeTokenInfo,
+    reloadMergeTokenInfo
   };
 };
diff --git a/views/transactions/Deposit.vue b/views/transactions/Deposit.vue
index 52dc72a7..3dc691e2 100644
--- a/views/transactions/Deposit.vue
+++ b/views/transactions/Deposit.vue
@@ -579,7 +579,7 @@ const amountInputTokenAddress = computed({
 const tokenBalance = computed<BigNumberish | undefined>(() => {
   return balance.value?.find((e) => e.address === selectedToken.value?.address)?.amount;
 });
-const { result: mergeTokenInfo } = useMergeToken(computed(() => selectedToken.value?.l2Address));
+const { result: mergeTokenInfo, reloadMergeTokenInfo } = useMergeToken(computed(() => selectedToken.value?.l2Address));
 
 const {
   result: allowance,
@@ -853,6 +853,7 @@ const makeTransaction = async () => {
     step.value = "submitted";
     previousTransactionAddress.value = transaction.value!.to.address;
     recentlyBridged.value = true;
+    reloadMergeTokenInfo();
   }
 
   if (tx) {
@@ -964,7 +965,7 @@ onMounted(() => {
   if (selectedNetworkKey.value === "blast") {
     selectedNetworkKey.value = zkSyncNetworks[0].key;
   }
-})
+});
 </script>
 
 <style lang="scss" scoped>
diff --git a/views/transactions/Withdraw.vue b/views/transactions/Withdraw.vue
index 338b81e1..49a05e23 100644
--- a/views/transactions/Withdraw.vue
+++ b/views/transactions/Withdraw.vue
@@ -789,7 +789,11 @@ const mergeTokenL2Address = computed(() => {
   return undefined;
 });
 
-const { result: mergeTokenInfo, inProgress: mergeTokenInfoInProgress } = useMergeToken(mergeTokenL2Address);
+const {
+  result: mergeTokenInfo,
+  reloadMergeTokenInfo,
+  inProgress: mergeTokenInfoInProgress,
+} = useMergeToken(mergeTokenL2Address);
 
 const mergeTokenWithdrawalLimitExceeds = computed(() => {
   try {
@@ -1049,6 +1053,7 @@ const makeTransaction = async () => {
   if (transactionStatus.value === "done") {
     step.value = "submitted";
     previousTransactionAddress.value = transaction.value!.to.address;
+    reloadMergeTokenInfo();
   }
 
   if (tx) {