From aa7e9c4b3faae4c70962c09de5fb496bdc75d266 Mon Sep 17 00:00:00 2001
From: Jack Hamer <jackhamer0990@gmail.com>
Date: Fri, 6 Oct 2023 20:05:59 +0300
Subject: [PATCH] fix: allow withdrawal of any token, fix search

---
 components/token/TokenSelectDropdown.vue   | 15 +++++++++++----
 views/zksync/era/transactions/Transfer.vue |  3 +--
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/components/token/TokenSelectDropdown.vue b/components/token/TokenSelectDropdown.vue
index f2d5a815..04d09576 100644
--- a/components/token/TokenSelectDropdown.vue
+++ b/components/token/TokenSelectDropdown.vue
@@ -19,7 +19,12 @@
         <template v-else-if="!hasBalances">
           <div class="category">
             <CommonCardWithLineButtons>
-              <TokenLine v-for="item in tokens" :key="item.address" v-bind="item" @click="selectedToken = item" />
+              <TokenLine
+                v-for="item in displayedTokens"
+                :key="item.address"
+                v-bind="item"
+                @click="selectedToken = item"
+              />
             </CommonCardWithLineButtons>
           </div>
         </template>
@@ -99,14 +104,16 @@ const emit = defineEmits<{
 
 const search = ref("");
 const hasBalances = computed(() => props.balances.length > 0);
-const displayedBalances = computed(() => {
+const filterTokens = (tokens: Token[]) => {
   const lowercaseSearch = search.value.toLowerCase();
-  return props.balances.filter(({ address, symbol }) =>
+  return tokens.filter(({ address, symbol }) =>
     Object.values({ address, symbol })
       .filter((e) => typeof e === "string")
       .some((value) => value.toLowerCase().includes(lowercaseSearch))
   );
-});
+};
+const displayedTokens = computed(() => filterTokens(props.tokens));
+const displayedBalances = computed(() => filterTokens(props.balances) as TokenAmount[]);
 const balanceGroups = groupBalancesByAmount(displayedBalances);
 
 const selectedTokenAddress = computed({
diff --git a/views/zksync/era/transactions/Transfer.vue b/views/zksync/era/transactions/Transfer.vue
index 9fb6f790..cadde54b 100644
--- a/views/zksync/era/transactions/Transfer.vue
+++ b/views/zksync/era/transactions/Transfer.vue
@@ -181,8 +181,7 @@ const availableTokens = computed(() => {
 const availableBalances = computed(() => {
   if (props.type === "withdrawal") {
     if (!tokens.value) return [];
-    // return balance.value.filter((e) => e.l1Address); <-- Uncomment once Era Withdrawal Finalizer is live on mainnet
-    return balance.value.filter((e) => e.l1Address && tokens.value![e.address]);
+    return balance.value.filter((e) => e.l1Address);
   }
   return balance.value;
 });