Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: CheckWallet sdk only if safe is also loaded #4637

Merged
merged 2 commits into from
Dec 16, 2024
Merged

fix: CheckWallet sdk only if safe is also loaded #4637

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4e8342
fix: CheckWallet sdk only if safe is also loaded
usame-algan Dec 10, 2024
a211097
fix: Failing test and add another one
usame-algan Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/components/common/CheckWallet/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ const CheckWallet = ({
const sdk = useSafeSDK()
const isProposer = useIsWalletProposer()

const { safe } = useSafeInfo()
const { safe, safeLoaded } = useSafeInfo()

const isNestedSafeOwner = useIsNestedSafeOwner()
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Evaluate the need to include safeLoaded in the dependency array. If safeLoaded is a state that changes, it should be included if checkNetwork depends on it; otherwise, remove it to prevent unnecessary re-renders.


Expand All @@ -54,7 +54,7 @@ const CheckWallet = ({
if (!wallet) {
return Message.WalletNotConnected
}
if (!sdk) {
if (!sdk && safeLoaded) {
return Message.SDKNotInitialized
}

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The condition !sdk && safeLoaded in getErrorMessage could delay error messaging if safeLoaded is not immediately true when sdk is unavailable. Ensure safeLoaded correctly represents when readiness should be checked, or consider decoupling them for clarity.

Expand Down
Loading