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.

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: Add network to Rabby if unknown #3776

Merged
merged 2 commits into from
May 30, 2024
Merged

fix: Add network to Rabby if unknown #3776

merged 2 commits into from
May 30, 2024

Conversation

usame-algan
Copy link
Member

What it solves

Part of #3745

How this PR fixes it

In Rabby, the error when trying to switch to a network that is not yet added is nested and doesn't pass our condition. It now checks for a nested code in the error that is thrown.

How to test it

  1. Remove Sepolia network from Rabby
  2. Connect to a Sepolia Safe
  3. Create / Execute a transaction or sign a message
  4. Observe there is no error and instead Rabby pops up to add Sepolia as a new network

Screenshots

Screenshot 2024-05-30 at 13 52 15

Checklist

  • I've tested the branch on mobile 📱
  • I've documented how it affects the analytics (if at all) 📊
  • I've written a unit/e2e test for it (if applicable) 🧑‍💻

@usame-algan usame-algan requested a review from katspaugh May 30, 2024 11:52
Copy link

github-actions bot commented May 30, 2024

Copy link

ESLint Summary View Full Report

Annotations are provided inline on the Files Changed tab. You can also see all annotations that were generated on the annotations page.

Type Occurrences Fixable
Errors 0 0
Warnings 0 0
Ignored 0 N/A
  • Result: ✅ success
  • Annotations: 0 total

Report generated by eslint-plus-action

@usame-algan
Copy link
Member Author

The second commit is still the lint issues that happen to me whenever I try to push something. Would be nice if we could get this merged to dev soon because I've added these lint fixes probably 5 times now in different PRs 😪

Copy link

📦 Next.js Bundle Analysis for safe-wallet-web

This analysis was generated by the Next.js Bundle Analysis action. 🤖

⚠️ Global Bundle Size Increased

Page Size (compressed)
global 950.02 KB (🟡 +46 B)
Details

The global bundle is the javascript bundle that loads alongside every page. It is in its own category because its impact is much higher - an increase to its size means that every page on your website loads slower, and a decrease means every page loads faster.

Any third party scripts you have added directly to your app using the <script> tag are not accounted for in this analysis

If you want further insight into what is behind the changes, give @next/bundle-analyzer a try!

Two Pages Changed Size

The following pages changed size from the code in this PR compared to its base branch:

Page Size (compressed) First Load
/balances 29.24 KB (🟡 +6 B) 979.26 KB
/home 57.41 KB (🟡 +3 B) 1007.43 KB
Details

Only the gzipped size is provided here based on an expert tip.

First Load is the size of the global bundle plus the bundle for the individual page. If a user were to show up to your website and land on a given page, the first load size represents the amount of javascript that user would need to download. If next/link is used, subsequent page loads would only need to download that page's bundle (the number in the "Size" column), since the global bundle has already been downloaded.

Any third party scripts you have added directly to your app using the <script> tag are not accounted for in this analysis

Next to the size is how much the size has increased or decreased compared with the base branch of this PR. If this percentage has increased by 20% or more, there will be a red status indicator applied, indicating that special attention should be given to this.

Copy link

Coverage report

St.
Category Percentage Covered / Total
🟡 Statements
79.49% (+0.01% 🔼)
11298/14213
🔴 Branches
58.48% (-0.02% 🔻)
2700/4617
🟡 Functions
66.7% (+0.04% 🔼)
1823/2733
🟢 Lines
80.88% (+0.01% 🔼)
10188/12597
Show files with reduced coverage 🔻
St.
File Statements Branches Functions Lines
🟡
... / sdk.ts
69.79% (-1.18% 🔻)
38.1% (-4.01% 🔻)
69.23%
68.6% (-1.27% 🔻)

Test suite run success

1436 tests passing in 197 suites.

Report generated by 🧪jest coverage report action from 15a1b54

@@ -21,7 +21,7 @@ const useOnrampAppUrl = (): string | undefined => {

const useBuyCryptoHref = (): LinkProps['href'] | undefined => {
const query = useSearchParams()
const safe = query.get('safe')
const safe = query?.get('safe')
Copy link
Member

Choose a reason for hiding this comment

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

You seem to fix these randomly in various PRs. Is it really required? Can we fix all of them in one separate PR?

Copy link
Member Author

Choose a reason for hiding this comment

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

Whenever I run git push I get this and it causes the same lint errors. I am fixing all of them in each of my PRs and its always the same ones so once we have this merged to dev it should be resolved.

Screenshot 2024-05-30 at 14 54 15

const errorCode = get(error, 'code') as number | undefined

// Rabby emits the same error code as MM, but it is nested
const nestedErrorCode = get(error, 'data.originalError.code') as number | undefined
Copy link
Member

Choose a reason for hiding this comment

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

Is this better than data?.originalError?.code?

Copy link
Member Author

Choose a reason for hiding this comment

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

I think it is definitely more readable. As an alternative I tried to check for each key before accessing it i.e.'data' in error && 'originalError' in (error.data as ...) && error.data.originalError but it got messy really fast. We could ofc also go with data?.originalError?.code and ts-ignore it.

Copy link
Member

@katspaugh katspaugh left a comment

Choose a reason for hiding this comment

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

Let's merge it directly then, it's a straightforward fix, no need to QA.

@katspaugh katspaugh merged commit 4f57526 into dev May 30, 2024
14 checks passed
@katspaugh katspaugh deleted the fix-rabby-add-network branch May 30, 2024 12:58
@github-actions github-actions bot locked and limited conversation to collaborators May 30, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants