Skip to content

Commit 91bd5b2

Browse files
authored
chore: cp-7.52.0 assets controllers patch and bump form-data dependency (#17444)
<!-- Please submit this PR as a draft initially. Do not mark it as "Ready for review" until the template has been completely filled out, and PR status checks have passed at least once. --> ## **Description** assets controllers patch and bump form-data dependency Assets patch pr: #17442 form-data dept bump: #17434 Address other patch package issues! Remove detox patch react native crypto patch version request dependency does not exist anymore <!-- 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** 1. Go to this page... 2. 3. ## **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** - [ ] 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. ## **Pre-merge reviewer checklist** - [ ] 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.
1 parent 60361c2 commit 91bd5b2

9 files changed

+38
-309
lines changed

.depcheckrc.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ ignores:
5353
- 'improved-yarn-audit'
5454
- 'jetifier'
5555
- 'metro-react-native-babel-preset'
56-
- 'octonode'
5756
- 'prettier-plugin-gherkin'
5857
- 'react-native-svg-asset-plugin'
5958
- 'regenerator-runtime'

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,9 @@
166166
"multihashes/**/base-x": "3.0.11",
167167
"@keystonehq/ur-decoder/**/base-x": "3.0.11",
168168
"@ethereumjs/tx": "^5.4.0",
169-
"@metamask/controller-utils": "npm:@metamask/controller-utils@^11.11.0"
169+
"@metamask/controller-utils": "npm:@metamask/controller-utils@^11.11.0",
170+
"appium-adb/@appium/support/form-data": "^4.0.4",
171+
"appium/@appium/support/form-data": "^4.0.0"
170172
},
171173
"dependencies": {
172174
"@config-plugins/detox": "^9.0.0",
@@ -566,7 +568,6 @@
566568
"multiple-cucumber-html-reporter": "^3.0.1",
567569
"nock": "^13.3.1",
568570
"nyc": "^15.1.0",
569-
"octonode": "0.10.2",
570571
"patch-package": "^6.2.2",
571572
"portfinder": "^1.0.32",
572573
"prettier": "2.8.8",

patches/@metamask+transaction-controller+56.3.0.patch renamed to patches/@metamask+transaction-controller+58.1.1.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/node_modules/@metamask/transaction-controller/dist/TransactionController.cjs b/node_modules/@metamask/transaction-controller/dist/TransactionController.cjs
2-
index fef52f6..579c155 100644
2+
index 9bc3d74..af0c49c 100644
33
--- a/node_modules/@metamask/transaction-controller/dist/TransactionController.cjs
44
+++ b/node_modules/@metamask/transaction-controller/dist/TransactionController.cjs
5-
@@ -82,6 +82,10 @@ const metadata = {
5+
@@ -87,6 +87,10 @@ const metadata = {
66
persist: true,
77
anonymous: false,
88
},

patches/detox+20.33.0.patch

Lines changed: 0 additions & 13 deletions
This file was deleted.

patches/detox+20.35.0.patch

Lines changed: 0 additions & 13 deletions
This file was deleted.

patches/react-native-crypto+2.1.2.patch renamed to patches/react-native-crypto+2.2.1.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/node_modules/react-native-crypto/index.js b/node_modules/react-native-crypto/index.js
2-
index 5c15698..ae45a48 100644
2+
index f644543..2e942e0 100644
33
--- a/node_modules/react-native-crypto/index.js
44
+++ b/node_modules/react-native-crypto/index.js
55
@@ -1,6 +1,7 @@

patches/request+2.88.2.patch

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)