Commit 51bbc68
authored
fix: Patch detox to handle errors when injecting into WebViews (#29733)
<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until this PR meets the canonical
Definition of Ready For Review in `docs/readme/ready-for-review.md`.
In short: the template must be materially complete (not just section
titles
present), all status checks must be currently passing, and the only
expected
follow-up commits must be reviewer-driven.
-->
## **Description**
<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->
## **Changelog**
<!--
If this PR is not End-User-Facing and should not show up in the
CHANGELOG, you can choose to either:
1. Write `CHANGELOG entry: null`
2. Label with `no-changelog`
If this PR is End-User-Facing, please write a short User-Facing
description in the past tense like:
`CHANGELOG entry: Added a new tab for users to see their NFTs`
`CHANGELOG entry: Fixed a bug that was causing some NFTs to flicker`
(This helps the Release Engineer do their job more quickly and
accurately)
-->
CHANGELOG entry:
## **Related issues**
Fixes:
## **Manual testing steps**
```gherkin
Feature: my feature name
Scenario: user [verb for user action]
Given [describe expected initial app state]
When user [verb for user action]
Then [describe expected outcome]
```
## **Screenshots/Recordings**
<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->
### **Before**
<!-- [screenshots/recordings] -->
### **After**
<!-- [screenshots/recordings] -->
## **Pre-merge author checklist**
<!--
Every checklist item must be consciously assessed before marking this PR
as
"Ready for review". A checked box means you deliberately considered that
responsibility, not that you literally performed every action listed.
Unchecked boxes are ambiguous: they are not an implicit "N/A" and they
are not
a silent "skip". See `docs/readme/ready-for-review.md` for the full
checklist
semantics.
-->
- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Mobile
Coding
Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I've included tests if applicable
- [ ] I've documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I've applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.
#### Performance checks (if applicable)
- [ ] I've tested on Android
- Ideally on a mid-range device; emulator is acceptable
- [ ] I've tested with a power user scenario
- Use these [power-user
SRPs](https://consensyssoftware.atlassian.net/wiki/spaces/TL1/pages/edit-v2/401401446401?draftShareId=9d77e1e1-4bdc-4be1-9ebb-ccd916988d93)
to import wallets with many accounts and tokens
- [ ] I've instrumented key operations with Sentry traces for production
performance metrics
- See [`trace()`](/app/util/trace.ts) for usage and
[`addToken`](/app/components/Views/AddAsset/components/AddCustomToken/AddCustomToken.tsx#L274)
for an example
For performance guidelines and tooling, see the [Performance
Guide](https://consensyssoftware.atlassian.net/wiki/spaces/TL1/pages/400085549067/Performance+Guide+for+Engineers).
## **Pre-merge reviewer checklist**
<!--
Reviewer checklist items follow the same semantics as the author
checklist: an
unchecked box is ambiguous, a checked box means the reviewer consciously
assessed that responsibility. See `docs/readme/ready-for-review.md`.
-->
- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
<!-- CURSOR_SUMMARY -->
---
> [!NOTE]
> **Medium Risk**
> Medium risk because it changes Android test/build wiring for Detox
(dependency resolution, Gradle module inclusion, flavor dimensions),
which could break CI/e2e builds even though it shouldn’t affect
production runtime.
>
> **Overview**
> Ensures Detox’s Android WebView HTML extraction doesn’t fail hard by
wrapping the injected `GET_HTML_SCRIPT` in a `try/catch` and returning a
minimal empty HTML document on error.
>
> Switches the project to consume a Yarn-patched `detox@20.51.0` and
builds Detox from source in Gradle (`include ':detox'` +
`androidTestImplementation(project(path: ":detox"))`), removing the old
`Detox-android` Maven repo usage. Android app config is updated to
resolve Detox’s flavor via `missingDimensionStrategy 'detox', 'full'`.
>
> <sup>Reviewed by [Cursor Bugbot](https://cursor.com/bugbot) for commit
17e05cb. Bugbot is set up for automated
code reviews on this repo. Configure
[here](https://www.cursor.com/dashboard/bugbot).</sup>
<!-- /CURSOR_SUMMARY -->1 parent e72f6bb commit 51bbc68
6 files changed
Lines changed: 83 additions & 7 deletions
File tree
- .yarn/patches
- android
- app
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
191 | 191 | | |
192 | 192 | | |
193 | 193 | | |
| 194 | + | |
194 | 195 | | |
195 | 196 | | |
196 | 197 | | |
| |||
423 | 424 | | |
424 | 425 | | |
425 | 426 | | |
426 | | - | |
| 427 | + | |
427 | 428 | | |
428 | 429 | | |
429 | 430 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
30 | | - | |
31 | | - | |
32 | | - | |
33 | 30 | | |
34 | 31 | | |
35 | 32 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
58 | 58 | | |
59 | 59 | | |
60 | 60 | | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
61 | 65 | | |
62 | 66 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
636 | 636 | | |
637 | 637 | | |
638 | 638 | | |
639 | | - | |
| 639 | + | |
640 | 640 | | |
641 | 641 | | |
642 | 642 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
26812 | 26812 | | |
26813 | 26813 | | |
26814 | 26814 | | |
26815 | | - | |
| 26815 | + | |
26816 | 26816 | | |
26817 | 26817 | | |
26818 | 26818 | | |
| |||
26864 | 26864 | | |
26865 | 26865 | | |
26866 | 26866 | | |
| 26867 | + | |
| 26868 | + | |
| 26869 | + | |
| 26870 | + | |
| 26871 | + | |
| 26872 | + | |
| 26873 | + | |
| 26874 | + | |
| 26875 | + | |
| 26876 | + | |
| 26877 | + | |
| 26878 | + | |
| 26879 | + | |
| 26880 | + | |
| 26881 | + | |
| 26882 | + | |
| 26883 | + | |
| 26884 | + | |
| 26885 | + | |
| 26886 | + | |
| 26887 | + | |
| 26888 | + | |
| 26889 | + | |
| 26890 | + | |
| 26891 | + | |
| 26892 | + | |
| 26893 | + | |
| 26894 | + | |
| 26895 | + | |
| 26896 | + | |
| 26897 | + | |
| 26898 | + | |
| 26899 | + | |
| 26900 | + | |
| 26901 | + | |
| 26902 | + | |
| 26903 | + | |
| 26904 | + | |
| 26905 | + | |
| 26906 | + | |
| 26907 | + | |
| 26908 | + | |
| 26909 | + | |
| 26910 | + | |
| 26911 | + | |
| 26912 | + | |
| 26913 | + | |
| 26914 | + | |
| 26915 | + | |
| 26916 | + | |
| 26917 | + | |
| 26918 | + | |
26867 | 26919 | | |
26868 | 26920 | | |
26869 | 26921 | | |
| |||
36095 | 36147 | | |
36096 | 36148 | | |
36097 | 36149 | | |
36098 | | - | |
| 36150 | + | |
36099 | 36151 | | |
36100 | 36152 | | |
36101 | 36153 | | |
| |||
0 commit comments