restructure showing error message

reown-com · Feb 22, 2024 · ad73d24 · ad73d24
1 parent 20a6242
commit ad73d24
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 11 deletions.
diff --git a/packages/ethers/src/client.ts b/packages/ethers/src/client.ts
@@ -10,7 +10,6 @@ import type {
   PublicStateControllerState,
   Token
 } from '@web3modal/scaffold'
-import { ModalController, SnackController } from '@web3modal/core'
 import { Web3ModalScaffold } from '@web3modal/scaffold'
 import { ConstantsUtil, PresetsUtil, HelpersUtil } from '@web3modal/scaffold-utils'
 import EthereumProvider from '@walletconnect/ethereum-provider'
@@ -765,7 +764,7 @@ export class Web3Modal extends Web3ModalScaffold {
           this.emailProvider?.rejectRpcRequest()
           super.open()
           setTimeout(() => {
-            SnackController.showError('This RPC method is not supported')
+            this.showErrorMessage('This RPC method is not supported')
           }, 300)
         }
       })
@@ -784,8 +783,8 @@ export class Web3Modal extends Web3ModalScaffold {
 
   private watchModal() {
     if (this.emailProvider) {
-      ModalController.subscribeKey('open', val => {
-        if (!val) {
+      this.subscribeState(val => {
+        if (!val.open) {
           this.emailProvider?.rejectRpcRequest()
         }
       })

diff --git a/packages/scaffold/src/client.ts b/packages/scaffold/src/client.ts
@@ -24,7 +24,8 @@ import {
   OptionsController,
   PublicStateController,
   ThemeController,
-  SIWEController
+  SIWEController,
+  SnackController
 } from '@web3modal/core'
 import { setColorTheme, setThemeVariables } from '@web3modal/ui'
 
@@ -115,6 +116,14 @@ export class Web3ModalScaffold {
     return PublicStateController.subscribe(callback)
   }
 
+  public showErrorMessage(message: string) {
+    SnackController.showError(message)
+  }
+
+  public showSuccessMessage(message: string) {
+    SnackController.showSuccess(message)
+  }
+
   public getEvent() {
     return { ...EventsController.state }
   }

diff --git a/packages/wagmi/src/client.ts b/packages/wagmi/src/client.ts
@@ -36,7 +36,7 @@ import {
 } from './utils/helpers.js'
 import { W3mFrameHelpers } from '@web3modal/wallet'
 import type { W3mFrameProvider } from '@web3modal/wallet'
-import { ConstantsUtil as CoreConstants, ModalController, SnackController } from '@web3modal/core'
+import { ConstantsUtil as CoreConstants } from '@web3modal/core'
 import type { defaultWagmiConfig as coreConfig } from './utils/defaultWagmiCoreConfig.js'
 import type { defaultWagmiConfig as reactConfig } from './utils/defaultWagmiReactConfig.js'
 
@@ -399,11 +399,11 @@ export class Web3Modal extends Web3ModalScaffold {
             super.open({ view: 'ApproveTransaction' })
           }
         } else {
-          provider.rejectRpcRequest()
           super.open()
           setTimeout(() => {
-            SnackController.showError('This RPC method is not supported')
+            this.showErrorMessage('This RPC method is not supported')
           }, 300)
+          provider.rejectRpcRequest()
         }
       })
 
@@ -427,8 +427,8 @@ export class Web3Modal extends Web3ModalScaffold {
     connector: Web3ModalClientOptions<CoreConfig>['wagmiConfig']['connectors'][number]
   ) {
     const provider = (await connector.getProvider()) as W3mFrameProvider
-    ModalController.subscribeKey('open', val => {
-      if (!val) {
+    this.subscribeState(val => {
+      if (!val.open) {
         provider.rejectRpcRequest()
       }
     })

diff --git a/packages/wallet/src/W3mFrameConstants.ts b/packages/wallet/src/W3mFrameConstants.ts
@@ -1,5 +1,5 @@
 export const W3mFrameConstants = {
-  SECURE_SITE_SDK: 'https://secure.walletconnect.com/sdk',
+  SECURE_SITE_SDK: 'http://localhost:3010/sdk',
   APP_EVENT_KEY: '@w3m-app/',
   FRAME_EVENT_KEY: '@w3m-frame/',
   RPC_METHOD_KEY: 'RPC_',