Merge pull request #128 from gnosisguild/connect-issue

Fix connect issue & simulation block timestamp
gnosisguild · Aug 1, 2024 · d64617a · d64617a
2 parents d868789 + a173c50
commit d64617a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/extension/src/providers/ForkProvider.ts b/extension/src/providers/ForkProvider.ts
@@ -176,12 +176,13 @@ class ForkProvider extends EventEmitter {
     const checkpointId: string = await this.provider.request({
       method: 'evm_snapshot',
     })
-    this.handlers.onBeforeTransactionSend(checkpointId, metaTx)
-    console.log({
-      mod: this.moduleAddress,
-      ava: this.avatarAddress,
-      own: this.ownerAddress,
+    await this.provider.request({
+      method: 'evm_setNextBlockTimestamp',
+      params: [Math.ceil(Date.now() / 1000).toString()],
     })
+
+    this.handlers.onBeforeTransactionSend(checkpointId, metaTx)
+
     // correctly route the meta tx through the avatar
     let tx: TransactionData & TransactionOptions
     if (this.moduleAddress) {

diff --git a/extension/src/routes/RoutesDrawer/ConnectButton/index.tsx b/extension/src/routes/RoutesDrawer/ConnectButton/index.tsx
@@ -19,6 +19,7 @@ import {
   asLegacyConnection,
   fromLegacyConnection,
 } from '../../legacyConnectionMigrations'
+import { ZeroAddress } from 'ethers'
 
 const walletConnectLogo = (
   <img src={PUBLIC_PATH + walletConnectLogoUrl} alt="wallet connect logo" />
@@ -34,8 +35,9 @@ const metamaskLogo = (
 const ConnectButton: React.FC<{ id: string }> = ({ id }) => {
   const [routes, setRoutes] = useRoutes()
   const { connected, route, chainId } = useRoute(id)
-  const pilotAddress =
+  let pilotAddress =
     route.initiator && parsePrefixedAddress(route.initiator)[1].toLowerCase()
+  if (pilotAddress === ZeroAddress) pilotAddress = ''
 
   const metamask = useMetaMask()
   const walletConnect = useWalletConnect(route.id)