diff --git a/components/common/Timer.vue b/components/common/Timer.vue index 0b2e2e60..ce241b9f 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 + 1} day${day + 1 !== 1 ? "s" : ""}`; + return `~ ${day + 0.5} day${day + 1 !== 1 ? "s" : ""}`; } let formattedString = ""; if (hours > 0) formattedString += `${day} day ${hours} hour${hours > 1 ? "s" : ""} `; diff --git a/components/token/TokenSelectModal.vue b/components/token/TokenSelectModal.vue index 1716e4be..cee787c3 100644 --- a/components/token/TokenSelectModal.vue +++ b/components/token/TokenSelectModal.vue @@ -242,7 +242,7 @@ const buttonClicked = async (network: ZkSyncNetwork) => { if (!e.l1Address) { return false; } - if (isWithdraw.value && network.key === "mantle") { + if (isWithdraw.value && network.key === "mantle" && e.l1Address === ETH_ADDRESS) { return false; } else if (e.l1Address === ETH_ADDRESS) { return true; @@ -355,6 +355,6 @@ const closeModal = () => { .active { border-radius: 8px; background: rgba(23, 85, 244, 0.25); - border: 2px solid #1755f4; + /* border: 2px solid #1755f4; */ } diff --git a/components/transaction/DepositThirdPartyBridge.vue b/components/transaction/DepositThirdPartyBridge.vue index e3514120..65bc59ba 100644 --- a/components/transaction/DepositThirdPartyBridge.vue +++ b/components/transaction/DepositThirdPartyBridge.vue @@ -62,11 +62,11 @@ const ThirdPartyBridges = [ logo: "/img/Meson.svg", url: "https://meson.fi/zklink", }, - { - name: "Owlto Finance", - logo: "/img/owlto.svg", - url: "https://owlto.finance/?to=zkLinkNova", - }, + // { + // name: "Owlto Finance", + // logo: "/img/owlto.svg", + // url: "https://owlto.finance/?to=zkLinkNova", + // }, { name: "Symbiosis", logo: "/img/Symbiosys.svg", @@ -79,15 +79,15 @@ const fetchBridgePoints = async () => { const points = (await Promise.all([ $fetch(API_URL, { params: { name: "orbiter" } }), $fetch(API_URL, { params: { name: "meson" } }), - $fetch(API_URL, { params: { name: "owlet" } }), + // $fetch(API_URL, { params: { name: "owlet" } }), $fetch(API_URL, { params: { name: "symbiosis" } }), ])) as any[]; console.log(points, "points"); const _bridgePoints = bridgePoints.value; - for (let i = 0; i < points.length; i++) { - const { data } = points[i]; - _bridgePoints[i].points = data; - } + _bridgePoints[1].points = points[0]?.data; + _bridgePoints[2].points = points[1]?.data; + _bridgePoints[3].points = points[2]?.data; + bridgePoints.value = _bridgePoints; }; diff --git a/data/wallets.ts b/data/wallets.ts index 15d16ac2..afd6d6f8 100644 --- a/data/wallets.ts +++ b/data/wallets.ts @@ -3,6 +3,7 @@ type WalletEntry = { walletName: string; type: "injected" | "metaMask" | "wallet export const confirmedSupportedWallets: WalletEntry[] = [ { walletName: "MetaMask", type: "metaMask" }, + { walletName: "Binance Web3", type: "injected" }, { walletName: "Injected", type: "injected" }, { walletName: "OKX", type: "injected" }, { walletName: "GateWallet", type: "injected" }, diff --git a/store/onboard.ts b/store/onboard.ts index 0e626a1d..226a0aa9 100644 --- a/store/onboard.ts +++ b/store/onboard.ts @@ -87,7 +87,14 @@ export const useOnboardStore = defineStore("onboard", () => { const connectors = [ injected(), safe({ - allowedDomains: [/app.safe.global$/, /safe.zklink.io$/], + allowedDomains: [ + /app.safe.global$/, + /safe.zklink.io$/, + /safe.manta.network$/, + /multisig.mantle.xyz$/, + /safe.linea.build$/, + /blast-safe.io$/, + ], debug: true, }), walletConnect({ projectId: env.walletConnectProjectID, showQrModal: false, metadata }), diff --git a/utils/helpers.ts b/utils/helpers.ts index 3ff5971f..ad10b204 100644 --- a/utils/helpers.ts +++ b/utils/helpers.ts @@ -64,6 +64,6 @@ export const getEstimateWithdrawalDelayDays = (txTime: string | number) => { return 14; } else { const gap = Math.ceil(14 - (transactionTime - LAST_BLAST_SYNCL2_TIME) / (24 * 3600 * 1000)); - return gap >= 8 ? gap : 8; + return gap >= 8 ? gap : 8.5; } }; diff --git a/views/transactions/Withdraw.vue b/views/transactions/Withdraw.vue index d4ad591c..1953e9ba 100644 --- a/views/transactions/Withdraw.vue +++ b/views/transactions/Withdraw.vue @@ -512,6 +512,12 @@ import WithdrawalSubmitted from "@/views/transactions/WithdrawalSubmitted.vue"; import { ETH_ADDRESS } from "~/zksync-web3-nova/src/utils"; const showBridge = ref(true); const chainList = [ + { + name: "Orbiter Finance", + logo: "orbiter.svg", + url: "https://www.orbiter.finance/", + description: "https://www.orbiter.finance/", + }, { name: "Meson Finance", description: "https://meson.fi/",