From 1d461dc7deda7aab7fa52c08a930606736132e29 Mon Sep 17 00:00:00 2001
From: Jack Hamer <jackhamer0990@gmail.com>
Date: Fri, 10 May 2024 12:00:43 +0300
Subject: [PATCH] fix: withdrawal finalization improvements

---
 store/zksync/withdrawals.ts                |  2 +-
 views/transactions/WithdrawalSubmitted.vue | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/store/zksync/withdrawals.ts b/store/zksync/withdrawals.ts
index 4f8f9638f..397aa923b 100644
--- a/store/zksync/withdrawals.ts
+++ b/store/zksync/withdrawals.ts
@@ -33,7 +33,7 @@ export const useZkSyncWithdrawalsStore = defineStore("zkSyncWithdrawals", () =>
         providerStore.requestProvider().getTransactionDetails(withdrawal.transactionHash!)
       );
 
-      const withdrawalFinalizationAvailable = transactionDetails.status === "verified";
+      const withdrawalFinalizationAvailable = !!transactionDetails.ethExecuteTxHash;
       const isFinalized = withdrawalFinalizationAvailable
         ? await useZkSyncWalletStore()
             .getL1VoidSigner(true)
diff --git a/views/transactions/WithdrawalSubmitted.vue b/views/transactions/WithdrawalSubmitted.vue
index 1fafd9723..c3b0ccabe 100644
--- a/views/transactions/WithdrawalSubmitted.vue
+++ b/views/transactions/WithdrawalSubmitted.vue
@@ -29,6 +29,9 @@
         >
           <p>You can claim your withdrawal now.</p>
         </CommonAlert>
+        <CommonAlert v-else-if="isCustomBridgeToken" variant="warning" :icon="ExclamationTriangleIcon" class="mb-4">
+          <p>This withdrawal was made through a third-party bridge. Please use that bridge to claim your withdrawal.</p>
+        </CommonAlert>
         <CommonAlert v-else variant="warning" :icon="ExclamationTriangleIcon" class="mb-4">
           <p>
             You will have to claim your withdrawal once it's processed. Claiming will require paying the fee on the
@@ -51,7 +54,7 @@
       :failed="transaction.info.failed"
       :animation-state="withdrawalFinalizationAvailable ? 'stopped-in-the-end' : undefined"
       :expected-complete-timestamp="
-        withdrawalFinalizationAvailable ? undefined : transaction.info.expectedCompleteTimestamp
+        withdrawalFinalizationAvailable || isCustomBridgeToken ? undefined : transaction.info.expectedCompleteTimestamp
       "
     >
       <template v-if="withdrawalFinalizationAvailable" #to-button>
@@ -167,6 +170,7 @@ const { eraNetwork, blockExplorerUrl } = storeToRefs(useZkSyncProviderStore());
 const { l1BlockExplorerUrl } = storeToRefs(useNetworkStore());
 const { connectorName, isCorrectNetworkSet } = storeToRefs(onboardStore);
 
+const isCustomBridgeToken = computed(() => !props.transaction.token.l1Address);
 const withdrawalManualFinalizationRequired = computed(() => {
   return (
     !props.transaction.info.completed &&
@@ -175,7 +179,11 @@ const withdrawalManualFinalizationRequired = computed(() => {
   );
 });
 const withdrawalFinalizationAvailable = computed(() => {
-  return withdrawalManualFinalizationRequired.value && props.transaction.info.withdrawalFinalizationAvailable;
+  return (
+    !isCustomBridgeToken.value &&
+    withdrawalManualFinalizationRequired.value &&
+    props.transaction.info.withdrawalFinalizationAvailable
+  );
 });
 
 const {