Skip to content

Commit 2fa2606

Browse files
authored
fix: layout inconsistencies 3 cp-13.12.0 (#38483)
<!-- Please submit this PR as a draft initially. Do not mark it as "Ready for review" until the template has been completely filled out, and PR status checks have passed at least once. --> ## **Description** Fixes more layout inconsistencies while in fullscreen mode [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/38483?quickstart=1) ## **Changelog** <!-- If this PR is not End-User-Facing and should not show up in the CHANGELOG, you can choose to either: 1. Write `CHANGELOG entry: null` 2. Label with `no-changelog` If this PR is End-User-Facing, please write a short User-Facing description in the past tense like: `CHANGELOG entry: Added a new tab for users to see their NFTs` `CHANGELOG entry: Fixed a bug that was causing some NFTs to flicker` (This helps the Release Engineer do their job more quickly and accurately) --> CHANGELOG entry: null ## **Related issues** Fixes: https://consensyssoftware.atlassian.net/browse/CEUX-761 ## **Manual testing steps** 1. Go to this page... 2. 3. ## **Screenshots/Recordings** Scroll below ### **Before** <!-- [screenshots/recordings] --> ### **After** <!-- [screenshots/recordings] --> ## **Pre-merge author checklist** - [ ] I've followed [MetaMask Contributor Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Extension Coding Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md). - [ ] I've completed the PR template to the best of my ability - [ ] I’ve included tests if applicable - [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format if applicable - [ ] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)). Not required for external contributors. ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. <!-- CURSOR_SUMMARY --> --- > [!NOTE] > Removes width/height constraints to normalize fullscreen layouts and switches `CROSS_CHAIN_SWAP_ROUTE` to `RootLayout`. > > - **Layouts/Styles**: > - Make confirmation page full-height by adding `h-full` and adjusting `confirmation.scss` (remove explicit height auto). > - Remove max-width constraints in `asset.scss` (`.asset__content`) and `send-inner.tsx` (`redesigned__send__content`). > - Allow `bridge__container` to expand by removing `max-width: 480px`. > - **Routing**: > - Use `RootLayout` for `CROSS_CHAIN_SWAP_ROUTE` instead of `LegacyLayout`. > - **Tests**: > - Update snapshots to reflect `confirmation-page h-full` and layout changes. > > <sup>Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit 8570eff. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).</sup> <!-- /CURSOR_SUMMARY -->
1 parent 292f3c1 commit 2fa2606

13 files changed

+10
-18
lines changed

ui/pages/asset/asset.scss

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,6 @@
44
&__container {
55
background-color: var(--color-background-default);
66
}
7-
8-
&__content {
9-
max-width: 650px;
10-
width: 100%;
11-
}
127
}
138

149
.asset-navigation {

ui/pages/bridge/index.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
.bridge__container {
1717
height: 100%;
1818
min-width: 360px;
19-
max-width: 480px;
2019
overflow-y: scroll;
2120
// Scroll bar styles
2221
// Firefox

ui/pages/confirmations/confirmation/confirmation.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ export default function ConfirmationPage({
517517
confirmationId={pendingConfirmation.id}
518518
onSubmit={!templatedValues.hideSubmitButton && handleSubmit}
519519
>
520-
<div className="confirmation-page">
520+
<div className="confirmation-page h-full">
521521
<Header
522522
confirmation={pendingConfirmation}
523523
isSnapCustomUIDialog={isSnapCustomUIDialog}

ui/pages/confirmations/confirmation/confirmation.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
box-shadow: var(--shadow-size-lg) var(--color-shadow-default);
1717
width: 100%;
1818
min-height: 0;
19-
height: auto;
2019
position: relative;
2120
background: var(--color-background-default);
2221
display: grid;

ui/pages/confirmations/confirmation/templates/__snapshots__/create-named-snap-account.test.js.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
exports[`create-named-snap-account confirmation matches snapshot 1`] = `
44
<div>
55
<div
6-
class="confirmation-page"
6+
class="confirmation-page h-full"
77
>
88
<div
99
class="mm-box"

ui/pages/confirmations/confirmation/templates/__snapshots__/create-snap-account.test.js.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
exports[`create-snap-account confirmation should match snapshot 1`] = `
44
<div>
55
<div
6-
class="confirmation-page"
6+
class="confirmation-page h-full"
77
>
88
<div
99
class="mm-box confirmation-page__content mm-box--padding-0"

ui/pages/confirmations/confirmation/templates/__snapshots__/error.test.js.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
exports[`error template matches the snapshot 1`] = `
44
<div>
55
<div
6-
class="confirmation-page"
6+
class="confirmation-page h-full"
77
>
88
<div
99
class="mm-box confirmation-page__content mm-box--padding-0"

ui/pages/confirmations/confirmation/templates/__snapshots__/remove-snap-account.test.js.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
exports[`remove-snap-account confirmation should match snapshot 1`] = `
44
<div>
55
<div
6-
class="confirmation-page"
6+
class="confirmation-page h-full"
77
>
88
<div
99
class="mm-box confirmation-page__content mm-box--padding-0"

ui/pages/confirmations/confirmation/templates/__snapshots__/snap-account-redirect.test.js.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
exports[`snap-account-redirect confirmation should match snapshot 1`] = `
44
<div>
55
<div
6-
class="confirmation-page"
6+
class="confirmation-page h-full"
77
>
88
<div
99
class="mm-box confirmation-page__content mm-box--padding-0"

ui/pages/confirmations/confirmation/templates/__snapshots__/success.test.js.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
exports[`success template matches the snapshot 1`] = `
44
<div>
55
<div
6-
class="confirmation-page"
6+
class="confirmation-page h-full"
77
>
88
<div
99
class="mm-box confirmation-page__content mm-box--padding-0"

0 commit comments

Comments
 (0)