From 0db9dfdbd19dd65c4b74606a37ac3aab78057580 Mon Sep 17 00:00:00 2001 From: guanbinrui Date: Mon, 17 Mar 2025 11:09:08 +0800 Subject: [PATCH 1/3] chore: update version to 2.32.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 00db4819ffc7..17a7d5427bbb 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "yarn": ">=999.0.0", "npm": ">=999.0.0" }, - "version": "2.32.0", + "version": "2.32.1", "private": true, "license": "AGPL-3.0-or-later", "scripts": { From 365c085dc79c3ce86efed1775c280f8f53d5a2dd Mon Sep 17 00:00:00 2001 From: Wukong Sun Date: Mon, 17 Mar 2025 11:15:01 +0800 Subject: [PATCH 2/3] chore: update solana default rpc endpoint (#12169) --- .../RedPacket/src/SiteAdaptor/helpers/getSolanaProvider.ts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/plugins/RedPacket/src/SiteAdaptor/helpers/getSolanaProvider.ts b/packages/plugins/RedPacket/src/SiteAdaptor/helpers/getSolanaProvider.ts index afa297c47a43..ddc0d928a309 100644 --- a/packages/plugins/RedPacket/src/SiteAdaptor/helpers/getSolanaProvider.ts +++ b/packages/plugins/RedPacket/src/SiteAdaptor/helpers/getSolanaProvider.ts @@ -6,11 +6,10 @@ import { NetworkPluginID } from '@masknet/shared-base' import { getConnection } from '@masknet/web3-providers' import type { Cluster } from '@solana/web3.js' +const SOLANA_ENDPOINT = + process.env.SOLANA_RPC_ENDPOINT || 'https://solana-mainnet.g.alchemy.com/v2/7ktku04g0dx9l6ijyba3fy99h0ic0xf3' export async function getSolanaConnection(cluster: Cluster | undefined) { - const url = - !cluster || cluster === 'mainnet-beta' ? - 'https://long-intensive-shard.solana-mainnet.quiknode.pro/bc297481b248232bcd0dc95197d5b32a8981539c' - : SolanaWeb3.clusterApiUrl(cluster) + const url = !cluster || cluster === 'mainnet-beta' ? SOLANA_ENDPOINT : SolanaWeb3.clusterApiUrl(cluster) return new SolanaWeb3.Connection(url, 'confirmed') } From 21a0b42ff5d4b886b9f15140d39e68111f42ca1e Mon Sep 17 00:00:00 2001 From: Wukong Sun Date: Mon, 17 Mar 2025 12:12:16 +0800 Subject: [PATCH 3/3] chore: mf-6664 hide swap buttons (#12170) * chore: mf-6664 hide swap buttons * fixup! chore: mf-6664 hide swap buttons --- packages/mask/.webpack/config.ts | 2 + .../Wallet/components/ActionGroup/index.tsx | 2 +- .../SiteAdaptor/helpers/getSolanaProvider.ts | 2 +- .../plugins/Trader/src/SiteAdaptor/index.tsx | 82 ++++++++++--------- .../trader/hooks/useSupportedChains.ts | 1 + .../src/SiteAdaptor/trending/TrendingView.tsx | 5 +- 6 files changed, 52 insertions(+), 42 deletions(-) diff --git a/packages/mask/.webpack/config.ts b/packages/mask/.webpack/config.ts index 921a86a640cb..80ac17d8617c 100644 --- a/packages/mask/.webpack/config.ts +++ b/packages/mask/.webpack/config.ts @@ -236,6 +236,8 @@ export async function createConfiguration( MASK_SENTRY: process.env.MASK_SENTRY || JSON.stringify('disabled'), MASK_MIXPANEL: process.env.MASK_MIXPANEL || JSON.stringify('disabled'), NEXT_PUBLIC_FIREFLY_API_URL: process.env.NEXT_PUBLIC_FIREFLY_API_URL || '', + SOLANA_DEFAULT_RPC_URL: process.env.SOLANA_DEFAULT_RPC_URL || '', + MASK_ENABLE_EXCHANGE: process.env.MASK_ENABLE_EXCHANGE || '', }), new (rspack?.DefinePlugin || webpack.default.DefinePlugin)({ 'process.browser': 'true', diff --git a/packages/mask/popups/pages/Wallet/components/ActionGroup/index.tsx b/packages/mask/popups/pages/Wallet/components/ActionGroup/index.tsx index b8ab50f305e4..be8c15807934 100644 --- a/packages/mask/popups/pages/Wallet/components/ActionGroup/index.tsx +++ b/packages/mask/popups/pages/Wallet/components/ActionGroup/index.tsx @@ -102,7 +102,7 @@ export const ActionGroup = memo(function ActionGroup({ className, chainId, addre Receive - {supported || isLoading ? + {supported ?