From 85e72c99e78bbc600f1898916a7a107ad3761b10 Mon Sep 17 00:00:00 2001
From: Christophe Le Bars <clb@rouge.network>
Date: Sun, 26 Jun 2022 15:41:55 +0200
Subject: [PATCH] fix chainId format inconsistencies

---
 src/stores.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/stores.js b/src/stores.js
index fd7318e..74bcf13 100644
--- a/src/stores.js
+++ b/src/stores.js
@@ -39,6 +39,9 @@ const getWindowEthereum = () => {
   }
 }
 
+// always get chainId as number
+const alwaysNumber = n => Web3.utils.isHex(n) ? Web3.utils.hexToNumber(n) : n
+
 export const createStore = () => {
   const { emit, get, subscribe, assign, deleteAll } = proxied()
 
@@ -49,7 +52,7 @@ export const createStore = () => {
   }) => {
     // console.log('switch1193Provider', { accounts, chainId }, get('web3'), get('eipProvider'))
     if (!chainId) {
-      chainId = await get('web3').eth.getChainId()
+      chainId = alwaysNumber(await get('web3').eth.getChainId())
     }
     if (!accounts) {
       accounts = await get('web3').eth.getAccounts()
@@ -71,7 +74,7 @@ export const createStore = () => {
   }
 
   const accountsChangedHandler = accounts => switch1193Provider({ accounts })
-  const chainChangedHandler = chainId => switch1193Provider({ chainId })
+  const chainChangedHandler = chainId => switch1193Provider({ chainId: alwaysNumber(chainId) })
   // TODO better error support ?
   const disconnectHandler = error => switch1193Provider({ error })
 
@@ -133,7 +136,7 @@ export const createStore = () => {
       return set1193Provider(provider, addressOrIndex)
     init()
     const web3 = new Web3(provider)
-    const chainId = await web3.eth.getChainId()
+    const chainId = alwaysNumber(await get('web3').eth.getChainId())
     let accounts = []
     try {
       // not all provider support accounts