fix: Improved switch chain to support more dapps

MXCzkEVM · Sep 12, 2023 · 16c5b67 · 16c5b67
1 parent f213330
commit 16c5b67
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/lib/features/dapps/subfeatures/open_dapp/open_dapp_page.dart b/lib/features/dapps/subfeatures/open_dapp/open_dapp_page.dart
@@ -62,7 +62,7 @@ class OpenAppPage extends HookConsumerWidget {
                       collectLog('onLoadError: $code: $message'),
                   onLoadHttpError: (controller, url, statusCode, description) =>
                       collectLog('onLoadHttpError: $description'),
-                  onConsoleMessage: (controller, consoleMessage) => collectLog(
+                  onConsoleMessage: (controller, consoleMessage) => print(
                       'onConsoleMessage: ${consoleMessage.toString()}'),
                   onWebViewCreated: (controller) =>
                       presenter.onWebViewCreated(controller),

diff --git a/lib/features/dapps/subfeatures/open_dapp/open_dapp_presenter.dart b/lib/features/dapps/subfeatures/open_dapp/open_dapp_presenter.dart
@@ -200,7 +200,6 @@ class OpenDAppPresenter extends CompletePresenter<OpenDAppState> {
               }
             }""";
     state.webviewController
-        ?.setConfig(config, "0x${toNetwork.chainId.toRadixString(16)}");
-    state.webviewController?.sendResult('null', id);
+    ?.setChain(config, toNetwork.chainId, id);
   }
 }
diff --git a/packages/web3_provider/lib/js_bridge_callback_bean.dart b/packages/web3_provider/lib/js_bridge_callback_bean.dart
@@ -38,11 +38,14 @@ extension Web3Result on InAppWebViewController {
     await evaluateJavascript(source: script);
     sendResults([address], id);
   }
-
-  void setConfig(String config, String chainId) async {
-    final script = "window.ethereum.setConfig($config);";
-    final script2 = "window.ethereum.emitConnect($chainId);";
+
+  void setChain(String config, int chainId, int id) async {
+    final script = "console.log(window.ethereum.setConfig($config))";
+    final script2 = "console.log(window.ethereum.emitConnect($chainId))";
+    final script3 = "console.log(window.ethereum.emitChainChanged($chainId))";
     await evaluateJavascript(source: script);
     await evaluateJavascript(source: script2);
+    await evaluateJavascript(source: script3);
+    sendResult(chainId.toRadixString(16), id);
   }
 }