fix: bugfix for plugin wallet status bar chain state (#8880)

DimensionDev · Mar 3, 2023 · b919906 · b919906
1 parent 97be9b2
commit b919906
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/packages/shared/src/UI/components/WalletStatusBar/PluginVerifiedWalletStatusBar.tsx b/packages/shared/src/UI/components/WalletStatusBar/PluginVerifiedWalletStatusBar.tsx
@@ -17,6 +17,7 @@ import {
     useRecentTransactions,
     useWallets,
     useAccount,
+    useChainId,
 } from '@masknet/web3-hooks-base'
 import type { Web3Helper } from '@masknet/web3-helpers'
 import { Icons } from '@masknet/icons'
@@ -76,6 +77,7 @@ export const PluginVerifiedWalletStatusBar = memo<PluginVerifiedWalletStatusBarP
         const { classes, cx } = useStyles()
 
         const account = useAccount()
+        const globalChainId = useChainId()
         const { chainId } = useChainContext()
         const allWallets = useWallets()
 
@@ -120,7 +122,7 @@ export const PluginVerifiedWalletStatusBar = memo<PluginVerifiedWalletStatusBarP
         const defaultChainId = useDefaultChainId(defaultPluginId)
 
         const providerDescriptor = useProviderDescriptor(defaultPluginId)
-        const networkDescriptor = useNetworkDescriptor(defaultPluginId, chainId)
+        const networkDescriptor = useNetworkDescriptor(defaultPluginId, !isNextIdWallet ? chainId : defaultChainId)
 
         const pendingTransactions = useRecentTransactions(currentPluginID, TransactionStatusType.NOT_DEPEND)
 
@@ -174,7 +176,7 @@ export const PluginVerifiedWalletStatusBar = memo<PluginVerifiedWalletStatusBarP
                         onChangeWallet={openSelectProviderDialog}
                         selected={isSameAddress(descriptionProps.address, account)}
                         onSelect={onSelect}
-                        expectedChainId={isSmartPay ? smartPaySupportChainId : chainId}
+                        expectedChainId={isSmartPay ? smartPaySupportChainId : globalChainId}
                     />
                 ) : (
                     <MenuItem key="connect">

diff --git a/packages/web3-constants/evm/rpc.json b/packages/web3-constants/evm/rpc.json
@@ -38,8 +38,8 @@
         "BSC": ["https://bsc-dataseed.binance.org/"],
         "BSCT": ["https://data-seed-prebsc-1-s1.binance.org:8545/"],
         "Matic": [
-            "https://polygon-mainnet.infura.io/v3/d65858b010d249419cf8687eca12b094",
             "https://polygon-mainnet.infura.io/v3/d74bd8586b9e44449cef131d39ceeefb",
+            "https://polygon-mainnet.infura.io/v3/d65858b010d249419cf8687eca12b094",
             "https://polygon-mainnet.infura.io/v3/a9d66980bf334e59a42ca19095f3daeb",
             "https://polygon-mainnet.infura.io/v3/f39cc8734e294fba9c3938486df2b1bc",
             "https://polygon-mainnet.infura.io/v3/659123dd11294baf8a294d7a11cec92c"