From cd5de1315f8cf3924ce2f080b483dab255c4606e Mon Sep 17 00:00:00 2001 From: Elliot Winkler Date: Wed, 4 Dec 2024 16:05:39 -0700 Subject: [PATCH 1/3] Upgrade {gas-fee,notification-services}-controller - Bump `@metamask/gas-fee-controller` from 21.0.0 to 22.0.2 ([view changes](https://github.com/MetaMask/core/blob/main/packages/gas-fee-controller/CHANGELOG.md)) - There are no notable changes between these versions. - Bump `@metamask/notification-services-controller` from 0.11.0 to 0.15.0 ([view changes](https://github.com/MetaMask/core/blob/main/packages/notification-services-controller/CHANGELOG.md)) - Notable changes in 0.12.0: - `deleteNotificationsById` now publishes `NotificationServicesController:notificationsListUpdated` - Notable changes in 0.12.1: - When notifications are disabled, list is now repopulated with Snap notifications --- .eslintrc.js | 5 +- ios/MetaMask.xcodeproj/project.pbxproj | 12 ++-- ios/Podfile.lock | 2 +- package.json | 8 +-- yarn.lock | 77 +++++++++++++++----------- 5 files changed, 58 insertions(+), 46 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 567466baec8..873bfe2b9b0 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -37,6 +37,7 @@ module.exports = { '@typescript-eslint/no-explicit-any': 'error', // Under discussion '@typescript-eslint/no-duplicate-enum-values': 'off', + '@typescript-eslint/no-parameter-properties': 'off', }, }, { @@ -76,7 +77,7 @@ module.exports = { { files: [ 'app/components/UI/Name/**/*.{js,ts,tsx}', - 'app/components/hooks/DisplayName/**/*.{js,ts,tsx}' + 'app/components/hooks/DisplayName/**/*.{js,ts,tsx}', ], rules: { 'no-restricted-syntax': [ @@ -91,7 +92,7 @@ module.exports = { 'selectProviderType', 'selectRpcUrl', 'selectSelectedNetworkClientId', - 'selectTicker' + 'selectTicker', ] .map((method) => `(${method})`) .join('|')}/]`, diff --git a/ios/MetaMask.xcodeproj/project.pbxproj b/ios/MetaMask.xcodeproj/project.pbxproj index aefeb221dd7..a1cc6993726 100644 --- a/ios/MetaMask.xcodeproj/project.pbxproj +++ b/ios/MetaMask.xcodeproj/project.pbxproj @@ -9,7 +9,7 @@ /* Begin PBXBuildFile section */ 07CBADD9D4B441008304F8D3 /* EuclidCircularB-Light.otf in Resources */ = {isa = PBXBuildFile; fileRef = A98029A3662F4C1391489A6B /* EuclidCircularB-Light.otf */; }; 08B7A641467C4723B98328E9 /* CentraNo1-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = F97653CAD1D04E1B8713C428 /* CentraNo1-Medium.otf */; }; - 0FD509E0336BF221F6527B24 /* BuildFile in Frameworks */ = {isa = PBXBuildFile; }; + 0FD509E0336BF221F6527B24 /* (null) in Frameworks */ = {isa = PBXBuildFile; }; 13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; }; 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; @@ -134,7 +134,7 @@ B339FF2E289ABD70001B89FB /* EuclidCircularB-SemiboldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = 9499B01ECAC44DA29AC44E80 /* EuclidCircularB-SemiboldItalic.otf */; }; B339FF32289ABD70001B89FB /* Branch.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 153F84C92319B8DB00C19B63 /* Branch.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; B339FF3C289ABF2C001B89FB /* MetaMask-QA-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = B339FEA72899852C001B89FB /* MetaMask-QA-Info.plist */; }; - B638844E306CAE9147B52C85 /* BuildFile in Frameworks */ = {isa = PBXBuildFile; }; + B638844E306CAE9147B52C85 /* (null) in Frameworks */ = {isa = PBXBuildFile; }; BF39E5BAE0F34F9091FF6AC0 /* EuclidCircularB-Semibold.otf in Resources */ = {isa = PBXBuildFile; fileRef = A8DE9C5BC0714D648276E123 /* EuclidCircularB-Semibold.otf */; }; C8424AE42CCC01F900F0BEB7 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = C8424AE32CCC01F900F0BEB7 /* GoogleService-Info.plist */; }; C8424AE52CCC01F900F0BEB7 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = C8424AE32CCC01F900F0BEB7 /* GoogleService-Info.plist */; }; @@ -145,7 +145,7 @@ CF98DA9C28D9FEB700096782 /* RCTScreenshotDetect.m in Sources */ = {isa = PBXBuildFile; fileRef = CF98DA9B28D9FEB700096782 /* RCTScreenshotDetect.m */; }; CFD8DFC828EDD4C800CC75F6 /* RCTScreenshotDetect.m in Sources */ = {isa = PBXBuildFile; fileRef = CF98DA9B28D9FEB700096782 /* RCTScreenshotDetect.m */; }; D171C39A8BD44DBEB6B68480 /* EuclidCircularB-MediumItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = 42CBA652072F4BE2A8B815C1 /* EuclidCircularB-MediumItalic.otf */; }; - D45BF85DECACCB74EDCBE88A /* BuildFile in Frameworks */ = {isa = PBXBuildFile; }; + D45BF85DECACCB74EDCBE88A /* (null) in Frameworks */ = {isa = PBXBuildFile; }; D5BA0E32DFAA451781D5093E /* CentraNo1-BoldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = 4560812198A247039A1CF5A5 /* CentraNo1-BoldItalic.otf */; }; DADE8F39CE81410A98B9B805 /* MMSans-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 2EBD310362314C3ABFF40AD1 /* MMSans-Regular.otf */; }; DC6A024F56DD43E1A83B47B1 /* Roboto-MediumItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = D5FF0FF1DFB74B3C8BB99E09 /* Roboto-MediumItalic.ttf */; }; @@ -341,9 +341,9 @@ 650F2B9D24DC5FF200C3B9C4 /* libRCTAesForked.a in Frameworks */, 153C1ABB2217BCDC0088EFE0 /* JavaScriptCore.framework in Frameworks */, 153F84CA2319B8FD00C19B63 /* Branch.framework in Frameworks */, - 0FD509E0336BF221F6527B24 /* BuildFile in Frameworks */, - D45BF85DECACCB74EDCBE88A /* BuildFile in Frameworks */, - B638844E306CAE9147B52C85 /* BuildFile in Frameworks */, + 0FD509E0336BF221F6527B24 /* (null) in Frameworks */, + D45BF85DECACCB74EDCBE88A /* (null) in Frameworks */, + B638844E306CAE9147B52C85 /* (null) in Frameworks */, ED2E8FE6D71BE9319F3B27D3 /* libPods-MetaMask.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 53b00b3a981..9899ac33345 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1202,7 +1202,7 @@ SPEC CHECKSUMS: OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c Permission-BluetoothPeripheral: 34ab829f159c6cf400c57bac05f5ba1b0af7a86e PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 - RCT-Folly: 8dc08ca5a393b48b1c523ab6220dfdcc0fe000ad + RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1 RCTRequired: fb207f74935626041e7308c9e88dcdda680f1073 RCTSearchApi: 5fc36140c598a74fd831dca924a28ed53bc7aa18 RCTTypeSafety: 146fd11361680250b7580dd1f7f601995cfad1b1 diff --git a/package.json b/package.json index 4e775517682..7cdc2299d20 100644 --- a/package.json +++ b/package.json @@ -162,7 +162,7 @@ "@metamask/ethjs-contract": "^0.4.1", "@metamask/ethjs-query": "^0.7.1", "@metamask/ethjs-unit": "^0.3.0", - "@metamask/gas-fee-controller": "^21.0.0", + "@metamask/gas-fee-controller": "^22.0.2", "@metamask/json-rpc-middleware-stream": "^8.0.2", "@metamask/key-tree": "^9.0.0", "@metamask/keyring-api": "^10.1.0", @@ -170,7 +170,7 @@ "@metamask/logging-controller": "^6.0.1", "@metamask/message-signing-snap": "^0.3.3", "@metamask/network-controller": "^21.0.0", - "@metamask/notification-services-controller": "^0.11.0", + "@metamask/notification-services-controller": "^0.15.0", "@metamask/permission-controller": "^11.0.0", "@metamask/phishing-controller": "^12.0.3", "@metamask/post-message-stream": "^8.0.0", @@ -553,7 +553,7 @@ "@storybook/addon-knobs>@storybook/components>react-syntax-highlighter>highlight.js": false, "@storybook/addon-knobs>core-js": false, "@wdio/cucumber-framework>@cucumber/cucumber>duration>es5-ext": false, - "appium-adb>@appium/support>sharp": true, + "appium-adb>@appium/support>sharp": false, "appium>appium-android-driver>appium-chromedriver": false, "appium>appium-base-driver>webdriverio>@types/puppeteer-core>@types/puppeteer>puppeteer": false, "appium>appium-flutter-driver>rpc-websockets>bufferutil": false, @@ -575,7 +575,7 @@ "ganache>utf-8-validate": false, "husky": false, "react-native-inappbrowser-reborn": false, - "react-native-svg-asset-plugin>sharp": true, + "react-native-svg-asset-plugin>sharp": false, "@storybook/builder-webpack5>@swc/core": false, "@metamask/sdk-communication-layer>bufferutil": false, "@metamask/sdk-communication-layer>utf-8-validate": false, diff --git a/yarn.lock b/yarn.lock index 491d98761de..8edc7b9e6a7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4218,6 +4218,22 @@ eth-ens-namehash "^2.0.8" fast-deep-equal "^3.1.3" +"@metamask/controller-utils@^11.4.4": + version "11.4.4" + resolved "https://registry.yarnpkg.com/@metamask/controller-utils/-/controller-utils-11.4.4.tgz#6e43e4cf53d34dad225bab8aaf4e7efcb1fe7623" + integrity sha512-0/gKC6jxlj8KRzi0RjGDQnml6l4b46Da/AIqnGJMOC59zl4qD5UN1GM+mq7L5duw/m8sSHa7VbL1hL0l7Cw1pg== + dependencies: + "@ethereumjs/util" "^8.1.0" + "@metamask/eth-query" "^4.0.0" + "@metamask/ethjs-unit" "^0.3.0" + "@metamask/utils" "^10.0.0" + "@spruceid/siwe-parser" "2.1.0" + "@types/bn.js" "^5.1.5" + bignumber.js "^9.1.2" + bn.js "^5.2.1" + eth-ens-namehash "^2.0.8" + fast-deep-equal "^3.1.3" + "@metamask/design-tokens@^4.0.0": version "4.0.0" resolved "https://registry.yarnpkg.com/@metamask/design-tokens/-/design-tokens-4.0.0.tgz#3aad7e4da21c279374668e179c0b055d93aa0552" @@ -4488,17 +4504,17 @@ is-hex-prefixed "1.0.0" strip-hex-prefix "1.0.0" -"@metamask/gas-fee-controller@^21.0.0": - version "21.0.0" - resolved "https://registry.yarnpkg.com/@metamask/gas-fee-controller/-/gas-fee-controller-21.0.0.tgz#1cd21f3d33b097adb9c2d9bea17ac5ee72b491e6" - integrity sha512-34/AORJFpaHgr1jtzIk1/SzGSw7sYZL49kww7x7tW9wZcxV7r8rPZ5K25TveORzZtdfEsz1CVZjO4iEM8B4Lwg== +"@metamask/gas-fee-controller@^22.0.2": + version "22.0.2" + resolved "https://registry.yarnpkg.com/@metamask/gas-fee-controller/-/gas-fee-controller-22.0.2.tgz#6e092c3579d3b041ea252364a81190d8968cec5e" + integrity sha512-VaJHNWHL2mdswOIRrz5zes/recHRiXUG5sa5Co1eMFxpHQoX57ciFQ4J8rWsBP4P7H6a8MOB0TNFkn2fYCvpRg== dependencies: - "@metamask/base-controller" "^7.0.1" - "@metamask/controller-utils" "^11.3.0" + "@metamask/base-controller" "^7.0.2" + "@metamask/controller-utils" "^11.4.4" "@metamask/eth-query" "^4.0.0" "@metamask/ethjs-unit" "^0.3.0" - "@metamask/polling-controller" "^11.0.0" - "@metamask/utils" "^9.1.0" + "@metamask/polling-controller" "^12.0.2" + "@metamask/utils" "^10.0.0" "@types/bn.js" "^5.1.5" "@types/uuid" "^8.3.0" bn.js "^5.2.1" @@ -4744,16 +4760,16 @@ "@ethersproject/providers" "^5.7.2" async-mutex "^0.3.1" -"@metamask/notification-services-controller@^0.11.0": - version "0.11.0" - resolved "https://registry.yarnpkg.com/@metamask/notification-services-controller/-/notification-services-controller-0.11.0.tgz#6f1f8553e73bbaa5e3631c772efc34640264ff81" - integrity sha512-2QplJt1gqdPkhnHN6+C1E8MrcdZh1JgoDf9YnL2WsuCmMFlpujYD7mW7lRInBnCrPbKliHgF96oOT0D5gFigoA== +"@metamask/notification-services-controller@^0.15.0": + version "0.15.0" + resolved "https://registry.yarnpkg.com/@metamask/notification-services-controller/-/notification-services-controller-0.15.0.tgz#d846fa49df62838a8ae48e80a8fee098730f06b0" + integrity sha512-RJtCI0GkVLStmhNoq9QNqSQNag6gD37iWU/qU19ds5PujSrtmfS5t2Sk6YRNV3SkRrfiIFrhGDToUDBDBu13OA== dependencies: "@contentful/rich-text-html-renderer" "^16.5.2" - "@metamask/base-controller" "^7.0.1" - "@metamask/controller-utils" "^11.3.0" - "@metamask/utils" "^9.1.0" - bignumber.js "^4.1.0" + "@metamask/base-controller" "^7.0.2" + "@metamask/controller-utils" "^11.4.4" + "@metamask/utils" "^10.0.0" + bignumber.js "^9.1.2" firebase "^10.11.0" loglevel "^1.8.1" uuid "^8.3.2" @@ -4828,18 +4844,6 @@ fastest-levenshtein "^1.0.16" punycode "^2.1.1" -"@metamask/polling-controller@^11.0.0": - version "11.0.0" - resolved "https://registry.yarnpkg.com/@metamask/polling-controller/-/polling-controller-11.0.0.tgz#3de28c27a9be5d85879cf9bd35d03a62dbf8932c" - integrity sha512-fXG60Ft7lYgqC8lV8m4FL18hU4K2NnsPzoWTm1Lhen2cysLbgAzqxxGdeIFEMaDiCzcvEtLuEffY8FDKCM0ewQ== - dependencies: - "@metamask/base-controller" "^7.0.1" - "@metamask/controller-utils" "^11.3.0" - "@metamask/utils" "^9.1.0" - "@types/uuid" "^8.3.0" - fast-json-stable-stringify "^2.1.0" - uuid "^8.3.2" - "@metamask/polling-controller@^12.0.0", "@metamask/polling-controller@^12.0.1": version "12.0.1" resolved "https://registry.yarnpkg.com/@metamask/polling-controller/-/polling-controller-12.0.1.tgz#89593c892d7fbbc93ccb6fe45dd2d820839f3d93" @@ -4852,6 +4856,18 @@ fast-json-stable-stringify "^2.1.0" uuid "^8.3.2" +"@metamask/polling-controller@^12.0.2": + version "12.0.2" + resolved "https://registry.yarnpkg.com/@metamask/polling-controller/-/polling-controller-12.0.2.tgz#de37ff5f4f997d57d4da34b0c6574d2eba3184e0" + integrity sha512-TYplREQMrhPcsJn+b7WS2oZqMwt4jKcyL/tDmygVv90RcvESBBhXxz7D0Brm5UAirnkE3TPRq8fnVWwVSQAVcA== + dependencies: + "@metamask/base-controller" "^7.0.2" + "@metamask/controller-utils" "^11.4.4" + "@metamask/utils" "^10.0.0" + "@types/uuid" "^8.3.0" + fast-json-stable-stringify "^2.1.0" + uuid "^8.3.2" + "@metamask/post-message-stream@^8.0.0", "@metamask/post-message-stream@^8.1.1": version "8.1.1" resolved "https://registry.yarnpkg.com/@metamask/post-message-stream/-/post-message-stream-8.1.1.tgz#fd8f4c2363921aaf15c0fa56d087fa9f2d93f047" @@ -12381,11 +12397,6 @@ big-integer@1.6.x: resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.51.tgz#0df92a5d9880560d3ff2d5fd20245c889d130686" integrity sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg== -bignumber.js@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-4.1.0.tgz#db6f14067c140bd46624815a7916c92d9b6c24b1" - integrity sha512-eJzYkFYy9L4JzXsbymsFn3p54D+llV27oTQ+ziJG7WFRheJcNZilgVXMG0LoZtlQSKBsJdWtLFqOD0u+U0jZKA== - bignumber.js@^7.2.1: version "7.2.1" resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-7.2.1.tgz#80c048759d826800807c4bfd521e50edbba57a5f" From 7377b5338c5c48f748ac4bc84a8eb9014b723585 Mon Sep 17 00:00:00 2001 From: Elliot Winkler Date: Thu, 5 Dec 2024 16:24:54 -0700 Subject: [PATCH 2/3] Revert some files --- .eslintrc.js | 5 ++--- ios/MetaMask.xcodeproj/project.pbxproj | 12 ++++++------ ios/Podfile.lock | 2 +- package.json | 4 ++-- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 873bfe2b9b0..567466baec8 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -37,7 +37,6 @@ module.exports = { '@typescript-eslint/no-explicit-any': 'error', // Under discussion '@typescript-eslint/no-duplicate-enum-values': 'off', - '@typescript-eslint/no-parameter-properties': 'off', }, }, { @@ -77,7 +76,7 @@ module.exports = { { files: [ 'app/components/UI/Name/**/*.{js,ts,tsx}', - 'app/components/hooks/DisplayName/**/*.{js,ts,tsx}', + 'app/components/hooks/DisplayName/**/*.{js,ts,tsx}' ], rules: { 'no-restricted-syntax': [ @@ -92,7 +91,7 @@ module.exports = { 'selectProviderType', 'selectRpcUrl', 'selectSelectedNetworkClientId', - 'selectTicker', + 'selectTicker' ] .map((method) => `(${method})`) .join('|')}/]`, diff --git a/ios/MetaMask.xcodeproj/project.pbxproj b/ios/MetaMask.xcodeproj/project.pbxproj index a1cc6993726..aefeb221dd7 100644 --- a/ios/MetaMask.xcodeproj/project.pbxproj +++ b/ios/MetaMask.xcodeproj/project.pbxproj @@ -9,7 +9,7 @@ /* Begin PBXBuildFile section */ 07CBADD9D4B441008304F8D3 /* EuclidCircularB-Light.otf in Resources */ = {isa = PBXBuildFile; fileRef = A98029A3662F4C1391489A6B /* EuclidCircularB-Light.otf */; }; 08B7A641467C4723B98328E9 /* CentraNo1-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = F97653CAD1D04E1B8713C428 /* CentraNo1-Medium.otf */; }; - 0FD509E0336BF221F6527B24 /* (null) in Frameworks */ = {isa = PBXBuildFile; }; + 0FD509E0336BF221F6527B24 /* BuildFile in Frameworks */ = {isa = PBXBuildFile; }; 13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; }; 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; @@ -134,7 +134,7 @@ B339FF2E289ABD70001B89FB /* EuclidCircularB-SemiboldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = 9499B01ECAC44DA29AC44E80 /* EuclidCircularB-SemiboldItalic.otf */; }; B339FF32289ABD70001B89FB /* Branch.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 153F84C92319B8DB00C19B63 /* Branch.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; B339FF3C289ABF2C001B89FB /* MetaMask-QA-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = B339FEA72899852C001B89FB /* MetaMask-QA-Info.plist */; }; - B638844E306CAE9147B52C85 /* (null) in Frameworks */ = {isa = PBXBuildFile; }; + B638844E306CAE9147B52C85 /* BuildFile in Frameworks */ = {isa = PBXBuildFile; }; BF39E5BAE0F34F9091FF6AC0 /* EuclidCircularB-Semibold.otf in Resources */ = {isa = PBXBuildFile; fileRef = A8DE9C5BC0714D648276E123 /* EuclidCircularB-Semibold.otf */; }; C8424AE42CCC01F900F0BEB7 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = C8424AE32CCC01F900F0BEB7 /* GoogleService-Info.plist */; }; C8424AE52CCC01F900F0BEB7 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = C8424AE32CCC01F900F0BEB7 /* GoogleService-Info.plist */; }; @@ -145,7 +145,7 @@ CF98DA9C28D9FEB700096782 /* RCTScreenshotDetect.m in Sources */ = {isa = PBXBuildFile; fileRef = CF98DA9B28D9FEB700096782 /* RCTScreenshotDetect.m */; }; CFD8DFC828EDD4C800CC75F6 /* RCTScreenshotDetect.m in Sources */ = {isa = PBXBuildFile; fileRef = CF98DA9B28D9FEB700096782 /* RCTScreenshotDetect.m */; }; D171C39A8BD44DBEB6B68480 /* EuclidCircularB-MediumItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = 42CBA652072F4BE2A8B815C1 /* EuclidCircularB-MediumItalic.otf */; }; - D45BF85DECACCB74EDCBE88A /* (null) in Frameworks */ = {isa = PBXBuildFile; }; + D45BF85DECACCB74EDCBE88A /* BuildFile in Frameworks */ = {isa = PBXBuildFile; }; D5BA0E32DFAA451781D5093E /* CentraNo1-BoldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = 4560812198A247039A1CF5A5 /* CentraNo1-BoldItalic.otf */; }; DADE8F39CE81410A98B9B805 /* MMSans-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 2EBD310362314C3ABFF40AD1 /* MMSans-Regular.otf */; }; DC6A024F56DD43E1A83B47B1 /* Roboto-MediumItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = D5FF0FF1DFB74B3C8BB99E09 /* Roboto-MediumItalic.ttf */; }; @@ -341,9 +341,9 @@ 650F2B9D24DC5FF200C3B9C4 /* libRCTAesForked.a in Frameworks */, 153C1ABB2217BCDC0088EFE0 /* JavaScriptCore.framework in Frameworks */, 153F84CA2319B8FD00C19B63 /* Branch.framework in Frameworks */, - 0FD509E0336BF221F6527B24 /* (null) in Frameworks */, - D45BF85DECACCB74EDCBE88A /* (null) in Frameworks */, - B638844E306CAE9147B52C85 /* (null) in Frameworks */, + 0FD509E0336BF221F6527B24 /* BuildFile in Frameworks */, + D45BF85DECACCB74EDCBE88A /* BuildFile in Frameworks */, + B638844E306CAE9147B52C85 /* BuildFile in Frameworks */, ED2E8FE6D71BE9319F3B27D3 /* libPods-MetaMask.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 9899ac33345..53b00b3a981 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1202,7 +1202,7 @@ SPEC CHECKSUMS: OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c Permission-BluetoothPeripheral: 34ab829f159c6cf400c57bac05f5ba1b0af7a86e PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 - RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1 + RCT-Folly: 8dc08ca5a393b48b1c523ab6220dfdcc0fe000ad RCTRequired: fb207f74935626041e7308c9e88dcdda680f1073 RCTSearchApi: 5fc36140c598a74fd831dca924a28ed53bc7aa18 RCTTypeSafety: 146fd11361680250b7580dd1f7f601995cfad1b1 diff --git a/package.json b/package.json index 7cdc2299d20..0d36aff8147 100644 --- a/package.json +++ b/package.json @@ -553,7 +553,7 @@ "@storybook/addon-knobs>@storybook/components>react-syntax-highlighter>highlight.js": false, "@storybook/addon-knobs>core-js": false, "@wdio/cucumber-framework>@cucumber/cucumber>duration>es5-ext": false, - "appium-adb>@appium/support>sharp": false, + "appium-adb>@appium/support>sharp": true, "appium>appium-android-driver>appium-chromedriver": false, "appium>appium-base-driver>webdriverio>@types/puppeteer-core>@types/puppeteer>puppeteer": false, "appium>appium-flutter-driver>rpc-websockets>bufferutil": false, @@ -575,7 +575,7 @@ "ganache>utf-8-validate": false, "husky": false, "react-native-inappbrowser-reborn": false, - "react-native-svg-asset-plugin>sharp": false, + "react-native-svg-asset-plugin>sharp": true, "@storybook/builder-webpack5>@swc/core": false, "@metamask/sdk-communication-layer>bufferutil": false, "@metamask/sdk-communication-layer>utf-8-validate": false, From 0f1de47d6510a194f3ab3443ed033fa542b207b7 Mon Sep 17 00:00:00 2001 From: Elliot Winkler Date: Fri, 6 Dec 2024 11:32:30 -0700 Subject: [PATCH 3/3] dedupe --- yarn.lock | 32 ++------------------------------ 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/yarn.lock b/yarn.lock index 8edc7b9e6a7..5fce1e031d7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4202,23 +4202,7 @@ resolved "https://registry.yarnpkg.com/@metamask/contract-metadata/-/contract-metadata-2.5.0.tgz#33921fa9c15eb1863f55dcd5f75467ae15614ebb" integrity sha512-+j7jEcp0P1OUMEpa/OIwfJs/ahBC/akwgWxaRTSWX2SWABvlUKBVRMtslfL94Qj2wN2xw8xjaUy5nSHqrznqDA== -"@metamask/controller-utils@^11.0.0", "@metamask/controller-utils@^11.3.0", "@metamask/controller-utils@^11.4.1", "@metamask/controller-utils@^11.4.2", "@metamask/controller-utils@^11.4.3", "@metamask/controller-utils@^11.4.4": - version "11.4.4" - resolved "https://registry.yarnpkg.com/@metamask/controller-utils/-/controller-utils-11.4.4.tgz#6e43e4cf53d34dad225bab8aaf4e7efcb1fe7623" - integrity sha512-0/gKC6jxlj8KRzi0RjGDQnml6l4b46Da/AIqnGJMOC59zl4qD5UN1GM+mq7L5duw/m8sSHa7VbL1hL0l7Cw1pg== - dependencies: - "@ethereumjs/util" "^8.1.0" - "@metamask/eth-query" "^4.0.0" - "@metamask/ethjs-unit" "^0.3.0" - "@metamask/utils" "^10.0.0" - "@spruceid/siwe-parser" "2.1.0" - "@types/bn.js" "^5.1.5" - bignumber.js "^9.1.2" - bn.js "^5.2.1" - eth-ens-namehash "^2.0.8" - fast-deep-equal "^3.1.3" - -"@metamask/controller-utils@^11.4.4": +"@metamask/controller-utils@^11.0.0", "@metamask/controller-utils@^11.3.0", "@metamask/controller-utils@^11.4.1", "@metamask/controller-utils@^11.4.3", "@metamask/controller-utils@^11.4.4": version "11.4.4" resolved "https://registry.yarnpkg.com/@metamask/controller-utils/-/controller-utils-11.4.4.tgz#6e43e4cf53d34dad225bab8aaf4e7efcb1fe7623" integrity sha512-0/gKC6jxlj8KRzi0RjGDQnml6l4b46Da/AIqnGJMOC59zl4qD5UN1GM+mq7L5duw/m8sSHa7VbL1hL0l7Cw1pg== @@ -4844,19 +4828,7 @@ fastest-levenshtein "^1.0.16" punycode "^2.1.1" -"@metamask/polling-controller@^12.0.0", "@metamask/polling-controller@^12.0.1": - version "12.0.1" - resolved "https://registry.yarnpkg.com/@metamask/polling-controller/-/polling-controller-12.0.1.tgz#89593c892d7fbbc93ccb6fe45dd2d820839f3d93" - integrity sha512-ZCF7UBuyxk9utdmOAh9/VBT780OxRPN5pD0wJaRwsFnFM3FFOFmvmojqnw8Kz4lSglyETtOBBMvzyQsnqoXQEQ== - dependencies: - "@metamask/base-controller" "^7.0.2" - "@metamask/controller-utils" "^11.4.2" - "@metamask/utils" "^10.0.0" - "@types/uuid" "^8.3.0" - fast-json-stable-stringify "^2.1.0" - uuid "^8.3.2" - -"@metamask/polling-controller@^12.0.2": +"@metamask/polling-controller@^12.0.0", "@metamask/polling-controller@^12.0.1", "@metamask/polling-controller@^12.0.2": version "12.0.2" resolved "https://registry.yarnpkg.com/@metamask/polling-controller/-/polling-controller-12.0.2.tgz#de37ff5f4f997d57d4da34b0c6574d2eba3184e0" integrity sha512-TYplREQMrhPcsJn+b7WS2oZqMwt4jKcyL/tDmygVv90RcvESBBhXxz7D0Brm5UAirnkE3TPRq8fnVWwVSQAVcA==