fix: the actual plugin id (#10820)

* fix: actual plugin id * refactor: remove unused code
DimensionDev · Sep 22, 2023 · 1003eae · 1003eae
1 parent 91b06be
commit 1003eae
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/packages/plugins/RedPacket/src/SiteAdaptor/RedPacketERC20Form.tsx b/packages/plugins/RedPacket/src/SiteAdaptor/RedPacketERC20Form.tsx
@@ -31,7 +31,7 @@ import {
 } from '@masknet/shared'
 import { Icons } from '@masknet/icons'
 import { useCurrentVisitingIdentity } from '@masknet/plugin-infra/content-script'
-import { useChainContext, useWallet, useNativeTokenPrice, useNetworkContext } from '@masknet/web3-hooks-base'
+import { useChainContext, useWallet, useNativeTokenPrice, useEnvironmentContext } from '@masknet/web3-hooks-base'
 import { ChainResolver, SmartPayBundler, Web3 } from '@masknet/web3-providers'
 import { useI18N } from '../locales/index.js'
 import { RED_PACKET_DEFAULT_SHARES, RED_PACKET_MAX_SHARES, RED_PACKET_MIN_SHARES } from '../constants.js'
@@ -113,7 +113,7 @@ export function RedPacketERC20Form(props: RedPacketFormProps) {
     const { onChange, onNext, origin, gasOption, onGasOptionChange, expectedChainId } = props
     // context
     const wallet = useWallet()
-    const { pluginID } = useNetworkContext()
+    const { pluginID } = useEnvironmentContext()
     const { account, chainId } = useChainContext<NetworkPluginID.PLUGIN_EVM>({ chainId: expectedChainId })
     const { HAPPY_RED_PACKET_ADDRESS_V4 } = useRedPacketConstants(chainId)
     const { value: smartPayChainId } = useAsync(async () => SmartPayBundler.getSupportedChainId(), [])

diff --git a/packages/plugins/RedPacket/src/SiteAdaptor/RedPacketERC721Form.tsx b/packages/plugins/RedPacket/src/SiteAdaptor/RedPacketERC721Form.tsx
@@ -32,6 +32,7 @@ import {
     useNativeTokenPrice,
     useWallet,
     useNonFungibleAssetsByCollectionAndOwner,
+    useEnvironmentContext,
 } from '@masknet/web3-hooks-base'
 import { NetworkPluginID, EMPTY_LIST } from '@masknet/shared-base'
 import { SourceType } from '@masknet/web3-shared-base'
@@ -245,6 +246,7 @@ export function RedPacketERC721Form(props: RedPacketERC721FormProps) {
     const { classes, cx } = useStyles()
     const [selectOption, setSelectOption] = useState<NFTSelectOption | undefined>(undefined)
     const { account, chainId } = useChainContext<NetworkPluginID.PLUGIN_EVM>()
+    const { pluginID } = useEnvironmentContext()
     const [collection, setCollection] = useState<NonFungibleCollection<ChainId, SchemaType>>()
     const [manualSelectedTokenDetailedList, setExistTokenDetailedList] = useState<OrderedERC721Token[]>(EMPTY_LIST)
     const [onceAllSelectedTokenDetailedList, setAllTokenDetailedList] = useState<OrderedERC721Token[]>(EMPTY_LIST)
@@ -497,7 +499,10 @@ export function RedPacketERC721Form(props: RedPacketERC721FormProps) {
             </Box>
 
             <Box style={{ position: 'absolute', bottom: 0, width: '100%' }}>
-                <PluginWalletStatusBar>
+                <PluginWalletStatusBar
+                    expectedPluginID={NetworkPluginID.PLUGIN_EVM}
+                    expectedChainId={chainId}
+                    actualPluginID={pluginID}>
                     <ChainBoundary
                         expectedPluginID={NetworkPluginID.PLUGIN_EVM}
                         expectedChainId={chainId}

diff --git a/packages/plugins/Savings/src/SiteAdaptor/SavingsDialog.tsx b/packages/plugins/Savings/src/SiteAdaptor/SavingsDialog.tsx
@@ -8,7 +8,6 @@ import {
     Web3ContextProvider,
     useFungibleTokens,
     RevokeChainContextProvider,
-    useNetworkContext,
     ChainContextProvider,
     useChainContext,
 } from '@masknet/web3-hooks-base'
@@ -65,7 +64,6 @@ const chains = [ChainId.Mainnet]
 export function SavingsDialog({ open, onClose }: SavingsDialogProps) {
     const t = useI18N()
     const { classes } = useStyles()
-    const { pluginID } = useNetworkContext()
 
     const { chainId } = useChainContext<NetworkPluginID.PLUGIN_EVM>({ chainId: ChainId.Mainnet })
     const [selectedProtocol, setSelectedProtocol] = useState<SavingsProtocol | null>(null)

diff --git a/packages/plugins/Savings/src/SiteAdaptor/SavingsForm.tsx b/packages/plugins/Savings/src/SiteAdaptor/SavingsForm.tsx
@@ -147,7 +147,7 @@ export function SavingsFormDialog({ chainId, protocol, tab, onClose }: SavingsFo
             )
         } catch {
             // do nothing
-            console.log('Failed to estimate gas')
+            console.error('Failed to estimate gas')
         }
     }, [chainId, isDeposit, protocol, tokenAmount])
     // #endregion