@@ -105,10 +105,16 @@ const addWalletGuardProxy = (provider: any) => {
105105 const params = JSON . parse ( request . params [ 1 ] ) ;
106106 log . info ( { params } , 'Request being sent' ) ;
107107
108+ let signer = params [ 0 ] ;
109+
110+ if ( ! signer ) {
111+ signer = request . params [ 0 ] ;
112+ }
113+
108114 // Sending response.
109115 response = await REQUEST_MANAGER . request ( {
110116 chainId : await provider . request ( { method : 'eth_chainId' } ) ,
111- signer : params [ 0 ] ,
117+ signer : signer ,
112118 domain : params [ 'domain' ] ,
113119 message : params [ 'message' ] ,
114120 primaryType : params [ 'primaryType' ] ,
@@ -250,12 +256,18 @@ const addWalletGuardProxy = (provider: any) => {
250256 const params = JSON . parse ( request . params [ 1 ] ) ;
251257 log . info ( { params } , 'Request being sent' ) ;
252258
259+ let signer = params [ 0 ] ;
260+
261+ if ( ! signer ) {
262+ signer = request . params [ 0 ] ;
263+ }
264+
253265 provider
254266 . request ( { method : 'eth_chainId' } )
255267 . then ( ( chainId : any ) => {
256268 return REQUEST_MANAGER . request ( {
257269 chainId,
258- signer : params [ 0 ] ,
270+ signer : signer ,
259271 domain : params [ 'domain' ] ,
260272 message : params [ 'message' ] ,
261273 primaryType : params [ 'primaryType' ] ,
0 commit comments