debug wc sending (#647)

keepkey · Jun 16, 2023 · 0547d80 · 0547d80
1 parent ad3bc73
commit 0547d80
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/packages/keepkey-desktop-app/src/kkdesktop/walletconnect/service.ts b/packages/keepkey-desktop-app/src/kkdesktop/walletconnect/service.ts
@@ -41,13 +41,13 @@ export class LegacyWCService {
   disconnect = async () => {
     console.log(this.connector.connected)
     console.log(this.connector.session)
-    await this.connector.killSession()
     this.connector.off('send')
     this.connector.off('connect')
     this.connector.off('call_request')
     this.connector.off('session_request')
     this.connector.off('wallet_switchEthereumChain')
     this.connector.off('wallet_addEthereumChain')
+    this.connector.killSession()
   }
 
   private subscribeToEvents() {

diff --git a/...ages/keepkey-desktop-app/src/plugins/walletConnectToDapps/WalletConnectBridgeProvider.tsx b/...ages/keepkey-desktop-app/src/plugins/walletConnectToDapps/WalletConnectBridgeProvider.tsx
@@ -89,8 +89,11 @@ export const WalletConnectBridgeProvider: FC<PropsWithChildren> = ({ children })
   }, [currentSessionTopic, isLegacy, legacyBridge, rerender])
 
   useEffect(() => {
-    if (!WalletConnectSignClient) return
-    WalletConnectSignClient.on('session_ping', payload => {
+    if (!WalletConnectSignClient) {
+        console.log('no wallet connect sign client')
+        return
+    }
+    WalletConnectSignClient.on('session_ping', (payload: { topic: any }) => {
       setIsConnected(true)
       setCurrentSessionTopic(payload.topic)
     })

diff --git a/...plugins/walletConnectToDapps/components/modal/callRequest/SendTransactionConfirmation.tsx b/...plugins/walletConnectToDapps/components/modal/callRequest/SendTransactionConfirmation.tsx
@@ -265,7 +265,7 @@ export const SendTransactionConfirmation = () => {
   )
     txInput['gasPrice'] = Web3.utils.toHex(web3GasFeeData)
 
-  if (!address) return <>No address</>
+  //if (!address) return <>No address</>
 
   return (
     <FormProvider {...form}>

diff --git a/packages/keepkey-sdk-server/src/controllers/ethereum.ts b/packages/keepkey-sdk-server/src/controllers/ethereum.ts
@@ -65,7 +65,7 @@ export class EthereumController extends ApiController {
     console.log('Body: ', body)
     assume<{ maxFeePerGas?: string | null }>(body)
     assume<{ gasPrice?: string | null }>(body)
-
+    if(body.chainId === 0) body.chainId = 1
     const account = await this.context.getAccount(body.from)
     if(!body.to) body.to = '0x'
     let chainId: number