fix(safe): handle Safe-over-WalletConnect schedule/execute/cancel flows#3
Merged
Conversation
- Detect Safe via WC peer metadata (name "Safe{Wallet}" or url
app.safe.global), reading the live connector instance from
useConnections() rather than the shallow useAccount() descriptor.
- Skip waitForTransactionReceipt when Safe is connected — the returned
hash is a Safe-tx-hash, not an Ethereum tx hash, so the receipt poll
hangs forever. Show the user a "confirm in Safe" toast instead.
- Add 5-minute timeout to waitForTransactionReceipt as a safety net for
EOAs (and for any Safe-like wallet we may not detect).
- Latch the role/minDelay reads in useTimelockRoles so a flaky RPC
refetch doesn't make the New operation / Execute / Cancel buttons
flicker out on mainnet.
- 26 new tests covering Safe detection, the latch, and connectors lib.
Code Review SummaryStatus: No Issues Found | Recommendation: Merge Files Reviewed (3 files)
Resolved Since Previous Review
Change Summary
Reviewed by gpt-5.5-2026-04-23 · 242,917 tokens |
PacoBits
approved these changes
May 19, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
app.safe.global), reading the live connector instance from
useConnections() rather than the shallow useAccount() descriptor.
hash is a Safe-tx-hash, not an Ethereum tx hash, so the receipt poll
hangs forever. Show the user a "confirm in Safe" toast instead.
EOAs (and for any Safe-like wallet we may not detect).
refetch doesn't make the New operation / Execute / Cancel buttons
flicker out on mainnet.