Merge pull request #287 from zkLinkProtocol/feat/merge_main

Feat/merge main
zkLinkProtocol · Sep 14, 2024 · 04933df · 04933df
2 parents e2a1237 + 32c094a
commit 04933df
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/pages/transfers.vue b/pages/transfers.vue
@@ -48,7 +48,7 @@
         </CommonCardWithLineButtons>
       </template>
       <div class="flex items-center justify-between" v-if="!hasOnlyRecentBridgeOperations">
-        <TypographyCategoryLabel>Completed transfers</TypographyCategoryLabel>
+        <TypographyCategoryLabel>Completed transactions</TypographyCategoryLabel>
         <div class="flex items-center filter-checkbox">
           <label for="show-deposits-withdrawals-only" class="mr-2">Show Deposits & Withdrawas only</label>
           <input type="checkbox" id="show-deposits-withdrawals-only" v-model="showDepositsWithdrawalsOnly" />

diff --git a/store/zksync/wallet.ts b/store/zksync/wallet.ts
@@ -104,6 +104,7 @@ export const useZkSyncWalletStore = defineStore("zkSyncWallet", () => {
           symbol: token!.symbol!,
           decimals: token!.decimals,
           amount: balance,
+          networkKey: token!.networkKey || undefined,
         };
       });
     //add merge tokens
@@ -117,6 +118,7 @@ export const useZkSyncWalletStore = defineStore("zkSyncWallet", () => {
           symbol: token!.symbol!,
           decimals: token!.decimals,
           amount: "0",
+          networkKey: token!.networkKey || undefined,
         });
       }
     }

diff --git a/views/transactions/Withdraw.vue b/views/transactions/Withdraw.vue
@@ -634,6 +634,7 @@ const availableTokens = computed(() => {
   }
   return Object.values(tokens.value);
 });
+
 const availableBalances = computed(() => {
   if (props.type === "withdrawal") {
     if (!tokens.value) return [];