Merge branch 'develop' into developer-settings

MetaMask · Jul 19, 2024 · 5fcc2a2 · 5fcc2a2
2 parents 05f5945 + 61c7d16
commit 5fcc2a2
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/ui/components/multichain/pages/connections/__snapshots__/connections.test.tsx.snap b/ui/components/multichain/pages/connections/__snapshots__/connections.test.tsx.snap
@@ -6,7 +6,7 @@ exports[`Connections Content should render correctly 1`] = `
     class="mm-box multichain-page mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--width-full mm-box--height-full mm-box--background-color-background-alternative"
   >
     <div
-      class="mm-box multichain-page__inner-container connections-page mm-box--display-flex mm-box--flex-direction-column mm-box--width-full mm-box--height-full mm-box--background-color-background-default"
+      class="mm-box multichain-page__inner-container main-container connections-page mm-box--display-flex mm-box--flex-direction-column mm-box--width-full mm-box--height-full mm-box--background-color-background-default"
       data-testid="connections-page"
     >
       <div

diff --git a/ui/components/multichain/pages/connections/connections.tsx b/ui/components/multichain/pages/connections/connections.tsx
@@ -191,7 +191,10 @@ export const Connections = () => {
   );
 
   return (
-    <Page data-testid="connections-page" className="connections-page">
+    <Page
+      data-testid="connections-page"
+      className="main-container connections-page"
+    >
       <Header
         backgroundColor={BackgroundColor.backgroundDefault}
         startAccessory={

diff --git a/ui/components/multichain/pages/permissions-page/__snapshots__/permissions-page.test.js.snap b/ui/components/multichain/pages/permissions-page/__snapshots__/permissions-page.test.js.snap
@@ -6,7 +6,7 @@ exports[`All Connections render renders correctly 1`] = `
     class="mm-box multichain-page mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-center mm-box--width-full mm-box--height-full mm-box--background-color-background-alternative"
   >
     <div
-      class="mm-box multichain-page__inner-container mm-box--display-flex mm-box--flex-direction-column mm-box--width-full mm-box--height-full mm-box--background-color-background-default"
+      class="mm-box multichain-page__inner-container main-container mm-box--display-flex mm-box--flex-direction-column mm-box--width-full mm-box--height-full mm-box--background-color-background-default"
       data-testid="permissions-page"
     >
       <div

diff --git a/ui/components/multichain/pages/permissions-page/permissions-page.js b/ui/components/multichain/pages/permissions-page/permissions-page.js
@@ -69,7 +69,7 @@ export const PermissionsPage = () => {
     });
 
   return (
-    <Page data-testid="permissions-page">
+    <Page className="main-container" data-testid="permissions-page">
       <Header
         backgroundColor={BackgroundColor.backgroundDefault}
         startAccessory={