Merge branch 'main' into feat/1564-assets-controllers-v10

.js.env.example

@@ -50,10 +50,10 @@ export MM_BLOCKAID_UI_ENABLED=""
 export WATCHER_PORT=8081
 
 # Environment: "production", "pre-release" or "local"
-export METAMASK_ENVIRONMENT=""
+export METAMASK_ENVIRONMENT="local"
 
 # Build type: "main" or "flask"
-export METAMASK_BUILD_TYPE=""
+export METAMASK_BUILD_TYPE="main"
 
 # Segment SDK proxy endpoint and write key
 export SEGMENT_WRITE_KEY=""

README.md

@@ -23,7 +23,7 @@ To learn how to develop MetaMask-compatible applications, visit our [Developer D
 
 ### Environment setup
 
-Before running the app, make sure your development environment has all the required tools.
+Before running the app, make sure your development environment has all the required tools. Several of these tools (ie Node and Ruby) may require specific versions in order to successfully build the app.
 
 [Setup your development environment](./docs/readme/environment.md)
 
@@ -65,4 +65,4 @@ yarn start:ios
 **Run on an Android device**
 ```bash
 yarn start:android
-```
+```

app/components/UI/Ramp/Views/SendTransaction/SendTransaction.test.tsx

@@ -378,6 +378,7 @@ describe('SendTransaction View', () => {
           "fiat_out": 0,
           "order_id": "test-id-1",
           "payment_method_id": "/payments/instant-bank-transfer",
+          "provider_offramp": "Test (Staging)",
         },
       ]
     `);
@@ -432,6 +433,7 @@ describe('SendTransaction View', () => {
           "fiat_out": 0,
           "order_id": "test-id-1",
           "payment_method_id": "/payments/instant-bank-transfer",
+          "provider_offramp": "Test (Staging)",
         },
       ]
     `);
@@ -479,6 +481,7 @@ describe('SendTransaction View', () => {
           "fiat_out": 0,
           "order_id": "test-id-1",
           "payment_method_id": "/payments/instant-bank-transfer",
+          "provider_offramp": "Test (Staging)",
         },
       ]
     `);
@@ -529,6 +532,7 @@ describe('SendTransaction View', () => {
           "fiat_out": 0,
           "order_id": "test-id-1",
           "payment_method_id": "/payments/instant-bank-transfer",
+          "provider_offramp": "Test (Staging)",
         },
       ]
     `);

app/components/UI/Ramp/Views/SendTransaction/SendTransaction.tsx

@@ -92,13 +92,14 @@ function SendTransaction() {
 
   const transactionAnalyticsPayload = useMemo(
     () => ({
-      crypto_amount: orderData?.cryptoAmount,
+      crypto_amount: orderData?.cryptoAmount as string,
       chain_id_source: orderData?.cryptoCurrency.network.chainId,
       fiat_out: orderData?.fiatAmount,
       payment_method_id: orderData?.paymentMethod.id,
       currency_source: orderData?.cryptoCurrency.symbol,
       currency_destination: orderData?.fiatCurrency.symbol,
       order_id: order?.id,
+      provider_offramp: orderData?.provider.name,
     }),
     [order?.id, orderData],
   );

app/components/UI/Ramp/types/analytics.ts

@@ -278,6 +278,7 @@ interface RampTransaction {
   currency_source: string;
   currency_destination: string;
   order_id?: string;
+  provider_offramp: string;
 }
 
 interface RampQuotesExpanded {

app/components/Views/Settings/NetworksSettings/index.js

@@ -155,7 +155,11 @@ class NetworksSettings extends PureComponent {
     this.updateNavBar();
   };
 
-  componentDidUpdate = () => {
+  componentDidUpdate = (prevProps) => {
+    if (this.props.networkConfigurations !== prevProps.networkConfigurations) {
+      this.handleSearchTextChange(this.state.searchString);
+    }
+
     this.updateNavBar();
   };
 

package.json

@@ -117,9 +117,7 @@
     "@metamask/contract-metadata": "^2.1.0",
     "@metamask/approval-controller": "3.4.0",
     "@exodus/react-native-payments/validator": "^13.7.0",
-    "**/plist": "3.0.5",
     "**/minimist": "1.2.6",
-    "@metamask/**/cross-fetch": "2.2.6",
     "react-native-svg-asset-plugin/sharp": "^0.30.5",
     "d3-color": "3.1.0",
     "tough-cookie": "4.1.3",

yarn.lock

@@ -9941,7 +9941,7 @@
   resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-2.0.5.tgz#325db42395cd49fe6c14057f9a900e427df8810e"
   integrity sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ==
 
-"@xmldom/xmldom@^0.8.10", "@xmldom/xmldom@^0.x":
+"@xmldom/xmldom@^0.8.10", "@xmldom/xmldom@^0.8.8", "@xmldom/xmldom@^0.x":
   version "0.8.10"
   resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.8.10.tgz#a1337ca426aa61cef9fe15b5b28e340a72f6fa99"
   integrity sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==
@@ -13362,15 +13362,7 @@ cron-parser@^4.5.0:
   dependencies:
     luxon "^3.2.1"
 
-cross-fetch@2.2.6, cross-fetch@^3.1.5:
-  version "2.2.6"
-  resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-2.2.6.tgz#2ef0bb39a24ac034787965c457368a28730e220a"
-  integrity sha512-9JZz+vXCmfKUZ68zAptS7k4Nu8e2qcibe7WVZYps7sAgk5R8GYTc+T1WR0v1rlP9HxgARmOX1UTIJZFytajpNA==
-  dependencies:
-    node-fetch "^2.6.7"
-    whatwg-fetch "^2.0.4"
-
-cross-fetch@3.1.5, cross-fetch@^3.0.4:
+cross-fetch@3.1.5:
   version "3.1.5"
   resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.5.tgz#e1389f44d9e7ba767907f7af8454787952ab534f"
   integrity sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==
@@ -13384,6 +13376,13 @@ cross-fetch@4.0.0:
   dependencies:
     node-fetch "^2.6.12"
 
+cross-fetch@^3.0.4, cross-fetch@^3.1.5:
+  version "3.1.8"
+  resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.8.tgz#0327eba65fd68a7d119f8fb2bf9334a1a7956f82"
+  integrity sha512-cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg==
+  dependencies:
+    node-fetch "^2.6.12"
+
 cross-spawn@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-4.0.2.tgz#7b9247621c23adfdd3856004a823cbe397424d41"
@@ -22619,13 +22618,14 @@ please-upgrade-node@^3.1.1, please-upgrade-node@^3.2.0:
   dependencies:
     semver-compare "^1.0.0"
 
-plist@3.0.5, plist@3.1.0, plist@^3.0.1, plist@^3.0.5:
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.5.tgz#2cbeb52d10e3cdccccf0c11a63a85d830970a987"
-  integrity sha512-83vX4eYdQp3vP9SxuYgEM/G/pJQqLUz/V/xzPrzruLs7fz7jxGQ1msZ/mg1nwZxUSuOp4sb+/bEIbRrbzZRxDA==
+plist@3.1.0, plist@^3.0.1, plist@^3.0.5:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/plist/-/plist-3.1.0.tgz#797a516a93e62f5bde55e0b9cc9c967f860893c9"
+  integrity sha512-uysumyrvkUX0rX/dEVqt8gC3sTBzd4zoWfLeS29nb53imdaXVvLINYXTI2GNqzaMuvacNx4uJQ8+b3zXR0pkgQ==
   dependencies:
+    "@xmldom/xmldom" "^0.8.8"
     base64-js "^1.5.1"
-    xmlbuilder "^9.0.7"
+    xmlbuilder "^15.1.1"
 
 plugin-error@^0.1.2:
   version "0.1.2"
@@ -27901,11 +27901,6 @@ webpack@5, webpack@^5.88.2:
     watchpack "^2.4.0"
     webpack-sources "^3.2.3"
 
-whatwg-fetch@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f"
-  integrity sha512-dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng==
-
 whatwg-fetch@^3.0.0, whatwg-fetch@^3.4.1:
   version "3.6.2"
   resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz#dced24f37f2624ed0281725d51d0e2e3fe677f8c"
@@ -28249,7 +28244,7 @@ xmlbuilder@^15.1.1:
   resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-15.1.1.tgz#9dcdce49eea66d8d10b42cae94a79c3c8d0c2ec5"
   integrity sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==
 
-xmlbuilder@^9.0.1, xmlbuilder@^9.0.7:
+xmlbuilder@^9.0.1:
   version "9.0.7"
   resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
   integrity sha512-7YXTQc3P2l9+0rjaUbLwMKRhtmwg1M1eDf6nag7urC7pIPYLD9W/jmzQ4ptRSUbodw5S0jfoGTflLemQibSpeQ==