Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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 .depcheckrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,9 @@ ignores:

## Unused devDependencies to investigate
- '@ethersproject/abi'
- '@metamask/react-native-tcp'
- '@metamask/swappable-obj-proxy'
- '@metamask/react-native-aes-crypto'
- '@react-native-picker/picker'
- '@rnhooks/keyboard'
- '@segment/sovran-react-native'
Expand All @@ -66,15 +68,13 @@ ignores:
- 'punycode'
- 'randomfill'
- 'react-native-aes-crypto'
- 'react-native-aes-crypto-forked'
- 'react-native-crypto'
- 'react-native-flash-message'
- 'react-native-level-fs'
- 'react-native-os'
- 'react-native-randombytes'
- 'react-native-redash'
- 'react-native-swipe-gestures'
- 'react-native-tcp'
- 'react-native-v8'
- 'socket.io-client'
- 'stream-browserify'
Expand Down
2 changes: 1 addition & 1 deletion app/components/Views/BrowserTab/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ import { addBookmark } from '../../../actions/bookmarks';
import { addToHistory, addToWhitelist } from '../../../actions/browser';
import Device from '../../../util/device';
import AppConstants from '../../../core/AppConstants';
import SearchApi from 'react-native-search-api';
import SearchApi from '@metamask/react-native-search-api';
import { MetaMetricsEvents } from '../../../core/Analytics';
import setOnboardingWizardStep from '../../../actions/wizard';
import OnboardingWizard from '../../UI/OnboardingWizard';
Expand Down
2 changes: 1 addition & 1 deletion app/util/test/testSetup.js
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ jest.mock('react-native-branch', () => ({
},
}));
jest.mock('react-native-sensors', () => 'RNSensors');
jest.mock('react-native-search-api', () => 'SearchApi');
jest.mock('@metamask/react-native-search-api', () => 'SearchApi');
jest.mock('react-native-reanimated', () =>
require('react-native-reanimated/mock'),
);
Expand Down
14 changes: 7 additions & 7 deletions ios/MetaMask.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@
5D7956F8525C4A45A2A555C3 /* Roboto-Italic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Roboto-Italic.ttf"; path = "../app/fonts/Roboto-Italic.ttf"; sourceTree = "<group>"; };
5D89472CA15F3091AE95E296 /* Pods-MetaMask-QA.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MetaMask-QA.release.xcconfig"; path = "Target Support Files/Pods-MetaMask-QA/Pods-MetaMask-QA.release.xcconfig"; sourceTree = "<group>"; };
5E32A09A7BDC431FA403BA73 /* FontAwesome.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = FontAwesome.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome.ttf"; sourceTree = "<group>"; };
650F2B9724DC5FEB00C3B9C4 /* RCTAesForked.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAesForked.xcodeproj; path = "../node_modules/react-native-aes-crypto-forked/ios/RCTAesForked.xcodeproj"; sourceTree = "<group>"; };
650F2B9724DC5FEB00C3B9C4 /* RCTAesForked.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAesForked.xcodeproj; path = "../node_modules/@metamask/react-native-aes-crypto/ios/RCTAesForked.xcodeproj"; sourceTree = "<group>"; };
654378AE243E2ADB00571B9C /* MetaMask-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "MetaMask-Bridging-Header.h"; sourceTree = "<group>"; };
654378AF243E2ADC00571B9C /* File.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = File.swift; sourceTree = "<group>"; };
67FBD519E04742E0AF191782 /* EuclidCircularB-Bold.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "EuclidCircularB-Bold.otf"; path = "../app/fonts/EuclidCircularB-Bold.otf"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1230,7 +1230,7 @@
"$(SRCROOT)/../node_modules/react-native-search-api/ios/RCTSearchApi",
"$(SRCROOT)/../node_modules/lottie-ios/lottie-ios/Classes/**",
"$(SRCROOT)/../node_modules/react-native-view-shot/ios",
"$(SRCROOT)/../node_modules/react-native-tcp/ios/**",
"$(SRCROOT)/../node_modules/@metamask/react-native-tcp/ios/**",
);
INFOPLIST_FILE = MetaMask/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
Expand Down Expand Up @@ -1293,7 +1293,7 @@
"$(SRCROOT)/../node_modules/react-native-search-api/ios/RCTSearchApi",
"$(SRCROOT)/../node_modules/lottie-ios/lottie-ios/Classes/**",
"$(SRCROOT)/../node_modules/react-native-view-shot/ios",
"$(SRCROOT)/../node_modules/react-native-tcp/ios/**",
"$(SRCROOT)/../node_modules/@metamask/react-native-tcp/ios/**",
);
INFOPLIST_FILE = MetaMask/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
Expand Down Expand Up @@ -1358,7 +1358,7 @@
"$(SRCROOT)/../node_modules/react-native-search-api/ios/RCTSearchApi",
"$(SRCROOT)/../node_modules/lottie-ios/lottie-ios/Classes/**",
"$(SRCROOT)/../node_modules/react-native-view-shot/ios",
"$(SRCROOT)/../node_modules/react-native-tcp/ios/**",
"$(SRCROOT)/../node_modules/@metamask/react-native-tcp/ios/**",
);
INFOPLIST_FILE = "MetaMask/MetaMask-Flask-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
Expand Down Expand Up @@ -1417,7 +1417,7 @@
"$(SRCROOT)/../node_modules/react-native-search-api/ios/RCTSearchApi",
"$(SRCROOT)/../node_modules/lottie-ios/lottie-ios/Classes/**",
"$(SRCROOT)/../node_modules/react-native-view-shot/ios",
"$(SRCROOT)/../node_modules/react-native-tcp/ios/**",
"$(SRCROOT)/../node_modules/@metamask/react-native-tcp/ios/**",
);
INFOPLIST_FILE = "MetaMask/MetaMask-Flask-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
Expand Down Expand Up @@ -1577,7 +1577,7 @@
"$(SRCROOT)/../node_modules/react-native-search-api/ios/RCTSearchApi",
"$(SRCROOT)/../node_modules/lottie-ios/lottie-ios/Classes/**",
"$(SRCROOT)/../node_modules/react-native-view-shot/ios",
"$(SRCROOT)/../node_modules/react-native-tcp/ios/**",
"$(SRCROOT)/../node_modules/@metamask/react-native-tcp/ios/**",
);
INFOPLIST_FILE = "MetaMask/MetaMask-QA-info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
Expand Down Expand Up @@ -1643,7 +1643,7 @@
"$(SRCROOT)/../node_modules/react-native-search-api/ios/RCTSearchApi",
"$(SRCROOT)/../node_modules/lottie-ios/lottie-ios/Classes/**",
"$(SRCROOT)/../node_modules/react-native-view-shot/ios",
"$(SRCROOT)/../node_modules/react-native-tcp/ios/**",
"$(SRCROOT)/../node_modules/@metamask/react-native-tcp/ios/**",
);
INFOPLIST_FILE = "MetaMask/MetaMask-QA-info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
Expand Down
2 changes: 1 addition & 1 deletion ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -803,7 +803,7 @@ DEPENDENCIES:
- RNVectorIcons (from `../node_modules/react-native-vector-icons`)
- "segment-analytics-react-native (from `../node_modules/@segment/analytics-react-native`)"
- "sovran-react-native (from `../node_modules/@segment/sovran-react-native`)"
- TcpSockets (from `../node_modules/react-native-tcp`)
- TcpSockets (from `../node_modules/@metamask/react-native-tcp`)
- Yoga (from `../node_modules/react-native/ReactCommon/yoga`)

SPEC REPOS:
Expand Down
13 changes: 7 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@
"@metamask/contract-metadata": "^2.1.0",
"@metamask/react-native-payments/validator": "^13.7.0",
"**/minimist": "1.2.6",
"react-native-tcp": "npm:@metamask/react-native-tcp@4.0.0",
"d3-color": "3.1.0",
"tough-cookie": "4.1.3",
"crypto-js": "4.2.0",
Expand Down Expand Up @@ -158,10 +159,13 @@
"@metamask/ppom-validator": "0.29.0",
"@metamask/preferences-controller": "^8.0.0",
"@metamask/react-native-actionsheet": "2.4.2",
"@metamask/react-native-aes-crypto": "1.2.1",
"@metamask/react-native-animated-fox": "^2.1.0",
"@metamask/react-native-button": "^3.0.0",
"@metamask/react-native-payments": "^2.0.0",
"@metamask/react-native-search-api": "1.0.1",
"@metamask/react-native-splash-screen": "^3.2.0",
"@metamask/react-native-tcp": "4.0.0",
"@metamask/rpc-errors": "^6.2.1",
"@metamask/scure-bip39": "^2.1.0",
"@metamask/sdk-communication-layer": "^0.18.1",
Expand Down Expand Up @@ -256,7 +260,6 @@
"react": "18.2.0",
"react-native": "0.71.15",
"react-native-aes-crypto": "1.3.9",
"react-native-aes-crypto-forked": "git+https://github.com/MetaMask/react-native-aes-crypto-forked.git#397d5db5250e8e7408294807965b5b9fd4ca6a25",
"react-native-animatable": "^1.3.3",
"react-native-background-timer": "2.1.1",
"react-native-ble-plx": "3.1.2",
Expand Down Expand Up @@ -300,7 +303,6 @@
"react-native-safe-area-context": "^3.1.9",
"react-native-screens": "3.19.0",
"react-native-scrollable-tab-view": "^1.0.0",
"react-native-search-api": "ombori/react-native-search-api#8/head",
"react-native-sensors": "5.3.0",
"react-native-share": "7.3.7",
"react-native-size-matters": "0.4.0",
Expand All @@ -309,7 +311,6 @@
"react-native-svg": "12.1.1",
"react-native-svg-charts": "^5.4.0",
"react-native-swipe-gestures": "1.0.3",
"react-native-tcp": "aprock/react-native-tcp#11/head",
"react-native-url-polyfill": "^1.3.0",
"react-native-v8": "^0.62.2-patch.1",
"react-native-vector-icons": "6.4.2",
Expand Down Expand Up @@ -406,7 +407,7 @@
"@wdio/spec-reporter": "^7.19.1",
"appium": "^1.22.3",
"appium-adb": "^9.11.4",
"assert": "^1.5.0",
"assert": "^1.5.1",
"babel-eslint": "10.1.0",
"babel-jest": "^29.7.0",
"babel-loader": "^9.1.3",
Expand Down Expand Up @@ -491,7 +492,7 @@
"https": "https-browserify",
"vm": "vm-browserify",
"os": "react-native-os",
"net": "react-native-tcp",
"net": "@metamask/react-native-tcp",
"fs": "react-native-level-fs"
},
"browser": {
Expand All @@ -506,7 +507,7 @@
"https": "https-browserify",
"vm": "vm-browserify",
"os": "react-native-os",
"net": "react-native-tcp",
"net": "@metamask/react-native-tcp",
"fs": "react-native-level-fs"
},
"engines": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
diff --git a/node_modules/react-native-aes-crypto-forked/android/build.gradle b/node_modules/react-native-aes-crypto-forked/android/build.gradle
diff --git a/node_modules/@metamask/react-native-aes-crypto/android/build.gradle b/node_modules/@metamask/react-native-aes-crypto/android/build.gradle
index e717caf..a892a0e 100644
--- a/node_modules/react-native-aes-crypto-forked/android/build.gradle
+++ b/node_modules/react-native-aes-crypto-forked/android/build.gradle
--- a/node_modules/@metamask/react-native-aes-crypto/android/build.gradle
+++ b/node_modules/@metamask/react-native-aes-crypto/android/build.gradle
@@ -19,10 +19,10 @@ android {
}

Expand Down
50 changes: 50 additions & 0 deletions patches/rn-nodeify+10.3.0.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
diff --git a/node_modules/rn-nodeify/browser-browserify.json b/node_modules/rn-nodeify/browser-browserify.json
index 52fa68a..371ceb6 100644
--- a/node_modules/rn-nodeify/browser-browserify.json
+++ b/node_modules/rn-nodeify/browser-browserify.json
@@ -4,7 +4,7 @@
"constants": "constants-browserify",
"crypto": "crypto-browserify",
"dns": "dns.js",
- "net": "react-native-tcp",
+ "net": "@metamask/react-native-tcp",
"domain": "domain-browser",
"http": "stream-http",
"https": "https-browserify",
diff --git a/node_modules/rn-nodeify/browser.json b/node_modules/rn-nodeify/browser.json
index dad26ae..d1fca5c 100644
--- a/node_modules/rn-nodeify/browser.json
+++ b/node_modules/rn-nodeify/browser.json
@@ -4,7 +4,7 @@
"constants": "constants-browserify",
"crypto": "react-native-crypto",
"dns": "dns.js",
- "net": "react-native-tcp",
+ "net": "@metamask/react-native-tcp",
"domain": "domain-browser",
"http": "@tradle/react-native-http",
"https": "https-browserify",
diff --git a/node_modules/rn-nodeify/shims-browserify.js b/node_modules/rn-nodeify/shims-browserify.js
index 5952ae2..4b6ebbf 100644
--- a/node_modules/rn-nodeify/shims-browserify.js
+++ b/node_modules/rn-nodeify/shims-browserify.js
@@ -27,6 +27,6 @@ module.exports = {
"url": "~0.10.1",
"util": "~0.10.1",
"utp": "0.0.8",
- "react-native-tcp": "^3.2.1",
+ "@metamask/react-native-tcp": "^3.2.1",
"vm-browserify": "~0.0.1"
}
diff --git a/node_modules/rn-nodeify/shims.js b/node_modules/rn-nodeify/shims.js
index c0e00fa..75e1240 100644
--- a/node_modules/rn-nodeify/shims.js
+++ b/node_modules/rn-nodeify/shims.js
@@ -27,6 +27,6 @@ module.exports = {
"tty-browserify": "0.0.0",
"url": "~0.10.1",
"util": "~0.10.3",
- "react-native-tcp": "^3.2.1",
+ "@metamask/react-native-tcp": "^3.2.1",
"vm-browserify": "0.0.4"
}
2 changes: 1 addition & 1 deletion react-native.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ module.exports = {
...(process.env.NO_FLIPPER
? { 'react-native-flipper': { platforms: { ios: null } } }
: {}),
'react-native-aes-crypto-forked': {
'@metamask/react-native-aes-crypto': {
platforms: {
ios: null, // disable Android platform, other platforms will still autolink if provided
},
Expand Down
37 changes: 26 additions & 11 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4380,6 +4380,11 @@
resolved "https://registry.yarnpkg.com/@metamask/react-native-actionsheet/-/react-native-actionsheet-2.4.2.tgz#9f956fe9e784d92c8e33656877fcfaabe4a482f1"
integrity sha512-oibRXUzF+7DB0Nyzp2cMGN7ztB9Sl21W1NFq1IMa00mB4/X43JY+u+LCkx625WvQUeq0GO2ZQ6hG1L5XjMumSA==

"@metamask/react-native-aes-crypto@1.2.1":
version "1.2.1"
resolved "https://registry.yarnpkg.com/@metamask/react-native-aes-crypto/-/react-native-aes-crypto-1.2.1.tgz#9257bce2317573b51bdd9b584232ff1d423aa80a"
integrity sha512-sRgQafvzO/c8PoJ45A5ELDnYxzJuzC6FaIS7WXgghooI6+tG93Xo0SD2nolFCU/Ro0tGbi7qwojsSMejHsrl+A==

"@metamask/react-native-animated-fox@^2.1.0":
version "2.1.0"
resolved "https://registry.yarnpkg.com/@metamask/react-native-animated-fox/-/react-native-animated-fox-2.1.0.tgz#504e1f68e13ad273fb193c6f6a3832f3a5242518"
Expand All @@ -4403,11 +4408,28 @@
uuid "3.3.2"
validator "^7.0.0"

"@metamask/react-native-search-api@1.0.1":
version "1.0.1"
resolved "https://registry.yarnpkg.com/@metamask/react-native-search-api/-/react-native-search-api-1.0.1.tgz#b3a2069ff851b88e1fe64b86f1fab7088a4daceb"
integrity sha512-ceCzyRZDZM0lpQSNUiFpo16nysTDIMUhkdyUcvBbkpiSUnYV+SjVMxYVn2Q+h7P9tce8wrb6zoxdlfK5BXtbAQ==

"@metamask/react-native-splash-screen@^3.2.0":
version "3.2.0"
resolved "https://registry.yarnpkg.com/@metamask/react-native-splash-screen/-/react-native-splash-screen-3.2.0.tgz#06a6547c143b088e47af40eacea9ac6657ac937f"
integrity sha512-V8Cn0MXe9jdaUli/DK3PoJ71tx7k3IW2v2slqflvNstvHiO3MpCtdylsYIyu+tiPwI2JiyLRzLK8s02/3jxk6g==

"@metamask/react-native-tcp@4.0.0":
version "4.0.0"
resolved "https://registry.yarnpkg.com/@metamask/react-native-tcp/-/react-native-tcp-4.0.0.tgz#5afd79eca397397e8927c3091bcbefcd637f1915"
integrity sha512-FkiL03Trc54IEYKiFSWZr+0x78BrFCOx51ridUfBV5Qj5+sGUrVIc+uBEu9eS0XsQxLcE/6jT9Xkrneo92tz0Q==
dependencies:
base64-js "1.3.1"
buffer "^5.4.3"
events "^3.0.0"
ip-regex "^4.1.0"
process "^0.11.9"
util "^0.12.1"

"@metamask/rpc-errors@^6.0.0", "@metamask/rpc-errors@^6.1.0", "@metamask/rpc-errors@^6.2.1":
version "6.2.1"
resolved "https://registry.yarnpkg.com/@metamask/rpc-errors/-/rpc-errors-6.2.1.tgz#f5daf429ededa7cb83069dc621bd5738fe2a1d80"
Expand Down Expand Up @@ -11440,7 +11462,7 @@ assert-plus@1.0.0, assert-plus@^1.0.0:
resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=

assert@^1.4.1, assert@^1.5.0:
assert@^1.4.1, assert@^1.5.1:
version "1.5.1"
resolved "https://registry.yarnpkg.com/assert/-/assert-1.5.1.tgz#038ab248e4ff078e7bc2485ba6e6388466c78f76"
integrity sha512-zzw1uCAgLbsKwBfFc8CX78DDg+xZeBksSO3vwVIDDN5i94eOrPsSSyiVhmsSABFDM/OcpE2aagCat9dnWQLG1A==
Expand Down Expand Up @@ -23905,10 +23927,6 @@ react-mixin@^3.0.5:
object-assign "^4.0.1"
smart-mixin "^2.0.0"

"react-native-aes-crypto-forked@git+https://github.com/MetaMask/react-native-aes-crypto-forked.git#397d5db5250e8e7408294807965b5b9fd4ca6a25":
version "1.2.1"
resolved "git+https://github.com/MetaMask/react-native-aes-crypto-forked.git#397d5db5250e8e7408294807965b5b9fd4ca6a25"

react-native-aes-crypto@1.3.9:
version "1.3.9"
resolved "https://registry.yarnpkg.com/react-native-aes-crypto/-/react-native-aes-crypto-1.3.9.tgz#6f068535462c1b7d7d70a4152d519ae9911c3e69"
Expand Down Expand Up @@ -24291,10 +24309,6 @@ react-native-scrollable-tab-view@^1.0.0:
prop-types "^15.6.0"
react-timer-mixin "^0.13.3"

react-native-search-api@ombori/react-native-search-api#8/head:
version "1.0.1"
resolved "https://codeload.github.com/ombori/react-native-search-api/tar.gz/08dbdf1ffd53801057662aa3207c11d2f78e8a94"

react-native-sensors@5.3.0:
version "5.3.0"
resolved "https://registry.yarnpkg.com/react-native-sensors/-/react-native-sensors-5.3.0.tgz#8c89541f80a68c185ff2f7059c3078f4975c730c"
Expand Down Expand Up @@ -24387,9 +24401,10 @@ react-native-swipe-gestures@^1.0.5:
resolved "https://registry.yarnpkg.com/react-native-swipe-gestures/-/react-native-swipe-gestures-1.0.5.tgz#a172cb0f3e7478ccd681fd36b8bfbcdd098bde7c"
integrity sha512-Ns7Bn9H/Tyw278+5SQx9oAblDZ7JixyzeOczcBK8dipQk2pD7Djkcfnf1nB/8RErAmMLL9iXgW0QHqiII8AhKw==

react-native-tcp@aprock/react-native-tcp#11/head:
"react-native-tcp@npm:@metamask/react-native-tcp@4.0.0":
version "4.0.0"
resolved "https://codeload.github.com/aprock/react-native-tcp/tar.gz/98fbc801f0586297f16730b2f4c75eef15dfabcd"
resolved "https://registry.yarnpkg.com/@metamask/react-native-tcp/-/react-native-tcp-4.0.0.tgz#5afd79eca397397e8927c3091bcbefcd637f1915"
integrity sha512-FkiL03Trc54IEYKiFSWZr+0x78BrFCOx51ridUfBV5Qj5+sGUrVIc+uBEu9eS0XsQxLcE/6jT9Xkrneo92tz0Q==
dependencies:
base64-js "1.3.1"
buffer "^5.4.3"
Expand Down