diff --git a/.depcheckrc.yml b/.depcheckrc.yml index 6a503a32e7b..f4a433f4a40 100644 --- a/.depcheckrc.yml +++ b/.depcheckrc.yml @@ -1,5 +1,6 @@ # List things here that *are - 'used, that depcheck is wrong about' ignores: + - 'jsc-android' # used by android/app/build.gradle > jscFlavor > org.webkit:android-jsc-intl:+ - '@metamask/oss-attribution-generator' - 'webpack-cli' # This is used on the patch for TokenRatesController of Assets controllers, for we to be able to use the last version of it diff --git a/android/app/build.gradle b/android/app/build.gradle index 155a8fe85a2..4dd3c9af85f 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -150,7 +150,7 @@ def enableProguardInReleaseBuilds = true * give correct results when using with locales other than en-US. Note that * this variant is about 6MiB larger per architecture than default. */ -def jscFlavor = 'org.webkit:android-jsc:+' +def jscFlavor = 'org.webkit:android-jsc-intl:+' /** * Private function to get the list of Native Architectures you want to build. diff --git a/android/gradle.properties b/android/gradle.properties index f06abec2465..a76109970ef 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -43,7 +43,7 @@ newArchEnabled=false # Use this property to enable or disable the Hermes JS engine. # If set to false, you will be using JSC instead. -hermesEnabled=true +hermesEnabled=false # TODO: explain following config options android.disableResourceValidation=true diff --git a/app/components/Views/Settings/ExperimentalSettings/index.tsx b/app/components/Views/Settings/ExperimentalSettings/index.tsx index 0ae38edf662..f55478c54af 100644 --- a/app/components/Views/Settings/ExperimentalSettings/index.tsx +++ b/app/components/Views/Settings/ExperimentalSettings/index.tsx @@ -19,7 +19,6 @@ import Button, { ButtonSize, ButtonWidthTypes, } from '../../../../component-library/components/Buttons/Button'; -import Device from '../../../../../app/util/device'; import { SES_URL } from '../../../../../app/constants/urls'; import Routes from '../../../../../app/constants/navigation/Routes'; @@ -142,7 +141,7 @@ const ExperimentalSettings = ({ navigation, route }: Props) => { return ( - {Device.isIos() && } + ); }; diff --git a/package.json b/package.json index 74c48ad5731..a5d72186471 100644 --- a/package.json +++ b/package.json @@ -232,6 +232,7 @@ "human-standard-token-abi": "^2.0.0", "humanize-duration": "^3.27.2", "is-url": "^1.2.4", + "jsc-android": "294992.0.0", "json-rpc-engine": "^6.1.0", "json-rpc-middleware-stream": "3.0.0", "lodash": "^4.17.21", diff --git a/patches/react-native+0.71.15.patch b/patches/react-native+0.71.15.patch index 331f0abf89d..73ee56f6ea6 100644 --- a/patches/react-native+0.71.15.patch +++ b/patches/react-native+0.71.15.patch @@ -1,16 +1,14 @@ diff --git a/node_modules/react-native/Libraries/Core/InitializeCore.js b/node_modules/react-native/Libraries/Core/InitializeCore.js -index 1379ffd..f2825f5 100644 +index 1379ffd..9e5ff61 100644 --- a/node_modules/react-native/Libraries/Core/InitializeCore.js +++ b/node_modules/react-native/Libraries/Core/InitializeCore.js -@@ -24,26 +24,37 @@ +@@ -24,26 +24,35 @@ 'use strict'; +const Platform = require('../Utilities/Platform'); + -+if (Platform.OS === 'ios' && !global?.HermesInternal) { -+ require('./setUpSes'); -+} ++require('./setUpSes'); + const start = Date.now(); @@ -44,7 +42,7 @@ index 1379ffd..f2825f5 100644 // We could just call GlobalPerformanceLogger.markPoint at the top of the file, diff --git a/node_modules/react-native/Libraries/Core/setUpSes.js b/node_modules/react-native/Libraries/Core/setUpSes.js new file mode 100644 -index 0000000..6013411 +index 0000000..5dc1859 --- /dev/null +++ b/node_modules/react-native/Libraries/Core/setUpSes.js @@ -0,0 +1,60 @@ @@ -237,4 +235,4 @@ index 290bd23..20d85e0 100644 + } } return inputConnection; - } \ No newline at end of file + } diff --git a/yarn.lock b/yarn.lock index 0585357e78c..1efcc0949b8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -19358,6 +19358,11 @@ jsbn@~0.1.0: resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= +jsc-android@294992.0.0: + version "294992.0.0" + resolved "https://registry.yarnpkg.com/jsc-android/-/jsc-android-294992.0.0.tgz#e456c91216fb6911f0063f0a4547a99c889882e6" + integrity sha512-DyV6nx8GM8sspQ1eEj5Sc5xtZF2OUfxLi3Hjke7SX3Xnnjaok1QLeB31mJLWBW02N4QDKl3R1dJpkXsPEPrVhA== + jsc-android@^250231.0.0: version "250231.0.0" resolved "https://registry.yarnpkg.com/jsc-android/-/jsc-android-250231.0.0.tgz#91720f8df382a108872fa4b3f558f33ba5e95262" @@ -26128,7 +26133,7 @@ string-range@~1.2, string-range@~1.2.1: resolved "https://registry.yarnpkg.com/string-range/-/string-range-1.2.2.tgz#a893ed347e72299bc83befbbf2a692a8d239d5dd" integrity sha1-qJPtNH5yKZvIO++78qaSqNI51d0= -"string-width-cjs@npm:string-width@^4.2.0": +"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -26146,15 +26151,6 @@ string-width@^1.0.1, string-width@^1.0.2: is-fullwidth-code-point "^1.0.0" strip-ansi "^3.0.0" -"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: - version "4.2.3" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - string-width@^2.0.0, string-width@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" @@ -26269,14 +26265,7 @@ stringify-object@^3.3.0: is-obj "^1.0.1" is-regexp "^1.0.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1": - version "6.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== - dependencies: - ansi-regex "^5.0.1" - -strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -28168,7 +28157,8 @@ wordwrap@^1.0.0: resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: + name wrap-ansi-cjs version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -28203,15 +28193,6 @@ wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" -wrap-ansi@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"