From 012a5b37c3c8f11d713d97a9a88b1f56babde601 Mon Sep 17 00:00:00 2001 From: georgewrmarshall Date: Tue, 27 Oct 2026 16:28:14 -0700 Subject: [PATCH 1/6] chore: upgrade design system packages to v75.0.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Register Grotzec Cond Bold as the hero typeface and exclude the commercial font from the repository license. The single Bold cut covers weights 400–700, which is the range DisplayXl and the design-system bold token actually request. Co-authored-by: Cursor --- LICENSE | 8 +++ package.json | 8 +-- .../network-list-item.test.js.snap | 2 +- ui/css/utilities/fonts.scss | 12 +++++ .../fonts/GrotzecCond/GrotzecCond-Bold.woff2 | Bin 0 -> 32360 bytes ui/css/utilities/fonts/GrotzecCond/LICENSE | 9 ++++ ui/helpers/constants/design-system.ts | 2 +- yarn.lock | 48 +++++++++--------- 8 files changed, 59 insertions(+), 30 deletions(-) create mode 100644 ui/css/utilities/fonts/GrotzecCond/GrotzecCond-Bold.woff2 create mode 100644 ui/css/utilities/fonts/GrotzecCond/LICENSE diff --git a/LICENSE b/LICENSE index 6e31b327d7f8..a6827f6e2fed 100644 --- a/LICENSE +++ b/LICENSE @@ -16,3 +16,11 @@ You are granted a non-exclusive, non-transferable, non-sublicensable license to You will not use any trade mark, service mark, trade name, logo of ConsenSys or any other company or organization in a way that is likely or intended to cause confusion about the owner or authorized user of such marks, names or logos. If you have any questions, comments or interest in pursuing any other use cases, please reach out to us at communications@metamask.io. + +EXCLUDED FONT SOFTWARE + +The font files for Grotzec Condensed Bold located in ui/css/utilities/fonts/GrotzecCond (the "Font Files") are commercial font software owned by Secretonix Lda, trading as Feliciano Type, and are licensed to ConsenSys Software Inc. for use solely within the MetaMask application. + +The Font Files are excluded from the license above. The license granted in this file does not extend to the Font Files, and no right to use, copy, reproduce, modify, subset, embed, distribute, or create derivative works of the Font Files is granted. Their presence in this repository, or in any copy of it, grants no license to them. All rights in the Font Files are reserved by Feliciano Type. + +See ui/css/utilities/fonts/GrotzecCond/LICENSE for the full notice. To license this typeface, visit http://www.felicianotype.com or contact mario@felicianotypefoundry.com. diff --git a/package.json b/package.json index 061c5e289ef6..8ee51b27c925 100644 --- a/package.json +++ b/package.json @@ -435,9 +435,9 @@ "@metamask/delegation-controller": "^3.0.2", "@metamask/delegation-core": "^2.0.0", "@metamask/delegation-deployments": "^2.1.0", - "@metamask/design-system-react": "^0.45.3", - "@metamask/design-system-tailwind-preset": "^0.14.0", - "@metamask/design-tokens": "^11.1.0", + "@metamask/design-system-react": "^0.47.0", + "@metamask/design-system-tailwind-preset": "^0.15.0", + "@metamask/design-tokens": "^12.0.0", "@metamask/dummy-package": "workspace:*", "@metamask/eip-5792-middleware": "3.0.3", "@metamask/eip-7702-internal-rpc-middleware": "^0.1.0", @@ -651,7 +651,7 @@ "@metamask/bitcoin-regtest-up": "^1.0.0", "@metamask/browser-playground": "0.8.1", "@metamask/client-mcp-core": "0.12.0", - "@metamask/design-system-shared": "^0.39.0", + "@metamask/design-system-shared": "^0.41.0", "@metamask/eslint-config": "^14.1.1", "@metamask/eslint-config-jest": "^14.1.1", "@metamask/eslint-config-mocha": "^14.0.1", diff --git a/ui/components/multichain/network-list-item/__snapshots__/network-list-item.test.js.snap b/ui/components/multichain/network-list-item/__snapshots__/network-list-item.test.js.snap index cb1f7fce7e18..25fd9c914348 100644 --- a/ui/components/multichain/network-list-item/__snapshots__/network-list-item.test.js.snap +++ b/ui/components/multichain/network-list-item/__snapshots__/network-list-item.test.js.snap @@ -54,7 +54,7 @@ exports[`NetworkListItem renders properly 1`] = ` xmlns="http://www.w3.org/2000/svg" > diff --git a/ui/css/utilities/fonts.scss b/ui/css/utilities/fonts.scss index ded8cbc68d89..90c8623ec83c 100644 --- a/ui/css/utilities/fonts.scss +++ b/ui/css/utilities/fonts.scss @@ -82,6 +82,18 @@ $font-path: './fonts'; font-style: italic; } +// Hero: Grotzec Cond Bold is the only licensed cut. +// TextVariant.DisplayXl + FontFamily.Hero computes to --font-weight-bold (600) +// below md and --font-weight-medium (500) at md. Design-system bold is 600, +// not 700. The range serves 400–700 from this file so the browser does not +// synthesize a missing weight. +@font-face { + font-family: 'Grotzec Cond'; + font-style: normal; + font-weight: 400 700; + src: url('#{$font-path}/GrotzecCond/GrotzecCond-Bold.woff2') format('woff2'); +} + @font-face { font-family: 'MMSans'; src: url('#{$font-path}/MMSans/MM_Sans-Variable.woff2') format('woff2'); diff --git a/ui/css/utilities/fonts/GrotzecCond/GrotzecCond-Bold.woff2 b/ui/css/utilities/fonts/GrotzecCond/GrotzecCond-Bold.woff2 new file mode 100644 index 0000000000000000000000000000000000000000..e218d02011c8131e2341a476cb73981f5347d91c GIT binary patch literal 32360 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 Date: Tue, 27 Oct 2026 16:28:23 -0700 Subject: [PATCH 2/6] feat(shield): adopt MarketingMoment on the entry modal Use the shared marketing layout for Transaction Shield, keep the hero title metrics stable while Grotzec loads, and pin the actions below the scrolling copy. Co-authored-by: Cursor --- .../app/shield-entry-modal/index.scss | 13 -- .../shield-entry-modal/shield-entry-modal.tsx | 117 +++++++----------- .../marketing-moment-title.test.tsx | 7 +- .../marketing-moment-title.tsx | 6 +- .../marketing-moment.test.tsx | 12 ++ .../ui/marketing-moment/marketing-moment.tsx | 40 +++--- 6 files changed, 93 insertions(+), 102 deletions(-) diff --git a/ui/components/app/shield-entry-modal/index.scss b/ui/components/app/shield-entry-modal/index.scss index e09fc9631820..b78d3ae1c8d2 100644 --- a/ui/components/app/shield-entry-modal/index.scss +++ b/ui/components/app/shield-entry-modal/index.scss @@ -1,15 +1,6 @@ @use "design-system"; .shield-entry-modal { - .shield-entry-modal__title { - line-height: 1em; - font-size: 2.25rem; - - @include design-system.screen-sm-max { - font-size: 2rem; - } - } - .shield-entry-modal__content { .shield-entry-modal__dialog { background-color: var(--color-accent03-dark); @@ -29,10 +20,6 @@ max-width: unset; border-radius: 0; } - - .shield-entry-modal__footer { - margin-top: auto; - } } } diff --git a/ui/components/app/shield-entry-modal/shield-entry-modal.tsx b/ui/components/app/shield-entry-modal/shield-entry-modal.tsx index bdbae235f605..e128527bd497 100644 --- a/ui/components/app/shield-entry-modal/shield-entry-modal.tsx +++ b/ui/components/app/shield-entry-modal/shield-entry-modal.tsx @@ -8,25 +8,21 @@ import { SubscriptionUserEvent, } from '@metamask/subscription-controller'; import { - Box, - Button, - ButtonSize, - ButtonVariant, - FontFamily, + BoxJustifyContent, FontWeight, - Text, TextVariant, } from '@metamask/design-system-react'; -import classnames from 'clsx'; import log from 'loglevel'; +import { + MarketingMoment, + type MarketingMomentAction, +} from '../../ui/marketing-moment'; import { useI18nContext } from '../../../hooks/useI18nContext'; import { Modal, ModalContent, ModalHeader, ModalOverlay, - ModalFooter, - ModalBody, } from '../../component-library'; import { setShowShieldEntryModalOnce, @@ -46,12 +42,6 @@ import { ShieldMetricsSourceEnum, ShieldCtaActionClickedEnum, } from '../../../../shared/constants/subscriptions'; -import { - AlignItems, - BlockSize, - Display, - FlexDirection, -} from '../../../helpers/constants/design-system'; import { TRANSACTION_SHIELD_LINK } from '../../../helpers/constants/common'; import { ThemeType } from '../../../../shared/constants/preferences'; import { @@ -235,11 +225,12 @@ const ShieldEntryModal = ({ { if (actionLoading) { return; @@ -253,66 +244,52 @@ const ShieldEntryModal = ({ className: 'absolute top-2 right-2', }} /> - - - {modalType === MODAL_TYPE.A + - - {modalType === MODAL_TYPE.A + : t('shieldEntryModalTitleB') + } + titleProps={{ className: 'text-accent04-light' }} + description={ + modalType === MODAL_TYPE.A ? t('shieldEntryModalSubtitleA', ['$10,000']) - : t('shieldEntryModalSubtitleB', ['$10,000'])} - - + : t('shieldEntryModalSubtitleB', ['$10,000']) + } + descriptionProps={{ + variant: TextVariant.BodyMd, + fontWeight: FontWeight.Medium, + className: 'text-accent04-light', + }} + artworkWrapperProps={{ + justifyContent: isPopup + ? BoxJustifyContent.End + : BoxJustifyContent.Center, + }} + artwork={ - - - - - - + } + primaryAction={ + { + label: t('shieldEntryModalGetStarted'), + onClick: handleOnGetStarted, + isDisabled: actionLoading, + 'data-testid': 'shield-entry-modal-get-started-button', + } as MarketingMomentAction + } + secondaryAction={ + { + label: t('learnMoreUpperCase'), + onClick: handleOnLearnMoreClick, + isDisabled: actionLoading, + 'data-testid': 'shield-entry-modal-learn-more-button', + } as MarketingMomentAction + } + /> ); diff --git a/ui/components/ui/marketing-moment-title/marketing-moment-title.test.tsx b/ui/components/ui/marketing-moment-title/marketing-moment-title.test.tsx index 5774fe507055..e0f57bb409dc 100644 --- a/ui/components/ui/marketing-moment-title/marketing-moment-title.test.tsx +++ b/ui/components/ui/marketing-moment-title/marketing-moment-title.test.tsx @@ -9,9 +9,10 @@ describe('MarketingMomentTitle', () => { it('renders the title text', () => { render(Perps are here); - expect(screen.getByRole('heading', { level: 1 })).toHaveTextContent( - 'Perps are here', - ); + const title = screen.getByRole('heading', { level: 1 }); + + expect(title).toHaveTextContent('Perps are here'); + expect(title).toHaveClass('[font-size-adjust:from-font]'); }); it('keeps a caller style', () => { diff --git a/ui/components/ui/marketing-moment-title/marketing-moment-title.tsx b/ui/components/ui/marketing-moment-title/marketing-moment-title.tsx index 2018c5760947..ab40c4f5fbde 100644 --- a/ui/components/ui/marketing-moment-title/marketing-moment-title.tsx +++ b/ui/components/ui/marketing-moment-title/marketing-moment-title.tsx @@ -18,7 +18,7 @@ import { * @param props.children */ export const MarketingMomentTitle = ({ - variant = TextVariant.DisplayLg, + variant = TextVariant.DisplayXl, className, children, ...props @@ -29,8 +29,10 @@ export const MarketingMomentTitle = ({ fontFamily={FontFamily.Hero} // 80% line height and -2% tracking. The md: classes keep those metrics // when the variant switches to its large-screen leading and tracking. + // from-font keeps fallback metrics aligned with Grotzec while it loads. + // TODO: @MetaMask/design-system-engineers !important for now will review why these overrides are not working as expected className={twMerge( - 'text-balance leading-[0.8] tracking-[-0.02em] md:leading-[0.8] md:tracking-[-0.02em]', + 'text-balance [font-size-adjust:from-font] !leading-[0.8] !tracking-[-0.02em] md:!leading-[0.8] md:!tracking-[-0.02em]', className, )} > diff --git a/ui/components/ui/marketing-moment/marketing-moment.test.tsx b/ui/components/ui/marketing-moment/marketing-moment.test.tsx index 5d9b2f62783e..e2a60761cf65 100644 --- a/ui/components/ui/marketing-moment/marketing-moment.test.tsx +++ b/ui/components/ui/marketing-moment/marketing-moment.test.tsx @@ -96,6 +96,18 @@ describe('MarketingMoment', () => { expect(onSecondaryClick).toHaveBeenCalledTimes(1); }); + it('keeps the actions outside the scrolling content', () => { + renderMoment(); + + const root = screen.getByTestId('marketing-moment'); + const scroller = root.querySelector('.overflow-y-auto'); + const primary = screen.getAllByRole('button')[0]; + + expect(root).toHaveClass('overflow-hidden'); + expect(scroller).not.toBeNull(); + expect(scroller).not.toContainElement(primary); + }); + it('omits every slot that is not provided', () => { renderMoment({ title: undefined, diff --git a/ui/components/ui/marketing-moment/marketing-moment.tsx b/ui/components/ui/marketing-moment/marketing-moment.tsx index 2cc6a9061ce4..55c59a714be1 100644 --- a/ui/components/ui/marketing-moment/marketing-moment.tsx +++ b/ui/components/ui/marketing-moment/marketing-moment.tsx @@ -107,27 +107,39 @@ export const MarketingMoment = ({ data-testid={dataTestId} flexDirection={BoxFlexDirection.Column} className={twMerge( - 'h-full min-h-0 w-full flex-1 overflow-y-auto', + 'h-full min-h-0 w-full flex-1 overflow-hidden', className, )} > - - {renderTitle()} - {renderDescription()} - {children} - - - {artwork ? ( + - {artwork} + {renderTitle()} + {renderDescription()} + {children} - ) : null} + + {artwork ? ( + + {artwork} + + ) : null} + {primaryAction || secondaryAction ? ( Date: Tue, 27 Oct 2026 16:28:34 -0700 Subject: [PATCH 3/6] feat(onboarding): adopt MarketingMoment on the wallet-ready screen Show the hero title, animation, and actions through the shared marketing layout after a wallet is created. Co-authored-by: Cursor --- .../creation-successful.stories.tsx | 1 + .../creation-successful.tsx | 123 ++++++++++-------- .../creation-successful/index.scss | 11 -- 3 files changed, 70 insertions(+), 65 deletions(-) diff --git a/ui/pages/onboarding-flow/creation-successful/creation-successful.stories.tsx b/ui/pages/onboarding-flow/creation-successful/creation-successful.stories.tsx index 2548007e7f2c..472d805ef6bf 100644 --- a/ui/pages/onboarding-flow/creation-successful/creation-successful.stories.tsx +++ b/ui/pages/onboarding-flow/creation-successful/creation-successful.stories.tsx @@ -1,6 +1,7 @@ import React from 'react'; import RiveWasmProvider from '../../../contexts/rive-wasm'; import CreationSuccessful from './creation-successful'; +import './index.scss'; export default { title: 'Pages/OnboardingFlow/CreationSuccessful', diff --git a/ui/pages/onboarding-flow/creation-successful/creation-successful.tsx b/ui/pages/onboarding-flow/creation-successful/creation-successful.tsx index 8e0d30f48a61..8a22f171b906 100644 --- a/ui/pages/onboarding-flow/creation-successful/creation-successful.tsx +++ b/ui/pages/onboarding-flow/creation-successful/creation-successful.tsx @@ -14,6 +14,10 @@ import { BoxAlignItems, TextButton, } from '@metamask/design-system-react'; +import { + MarketingMoment, + type MarketingMomentAction, +} from '../../../components/ui/marketing-moment'; import { useI18nContext } from '../../../hooks/useI18nContext'; import { ONBOARDING_PRIVACY_SETTINGS_ROUTE, @@ -169,12 +173,41 @@ export default function CreationSuccessful() { ); }; + const openWalletDisabled = isSidePanelEnabled && isSidePanelOpen; + const handleLearnMoreClick = () => { global.platform.openTab({ url: learnMoreLink, }); }; + if (!isFromSettingsSRPBackup) { + return ( + } + primaryAction={ + { + label: doneButtonLabel, + onClick: onDone, + isDisabled: openWalletDisabled, + 'data-testid': 'onboarding-complete-done', + } as MarketingMomentAction + } + secondaryAction={ + { + label: t('manageDefaultSettings'), + onClick: () => navigate(ONBOARDING_PRIVACY_SETTINGS_ROUTE), + isDisabled: openWalletDisabled, + 'data-testid': 'manage-default-settings', + } as MarketingMomentAction + } + /> + ); + } + return ( - {isFromSettingsSRPBackup && ( - - + + - - {t('yourWalletIsReadyFromReminder')} - - - {renderFox} - - - {renderDetails1} - - - {t('walletReadyLearn', [ - - {t('learnHow')} - , - ])} - + {t('yourWalletIsReadyFromReminder')} + + + {renderFox} + + {renderDetails1} + + + {t('walletReadyLearn', [ + + {t('learnHow')} + , + ])} + - )} - {!isFromSettingsSRPBackup && } - {!isFromSettingsSRPBackup && ( - {t('yourWalletIsReady')} - )} + {renderDoneButton()} - {!isFromSettingsSRPBackup && ( - - )} ); } diff --git a/ui/pages/onboarding-flow/creation-successful/index.scss b/ui/pages/onboarding-flow/creation-successful/index.scss index d04d5f472fd9..855bfa4d5b75 100644 --- a/ui/pages/onboarding-flow/creation-successful/index.scss +++ b/ui/pages/onboarding-flow/creation-successful/index.scss @@ -4,17 +4,6 @@ img { align-self: center; } - - .title { - text-align: center; - font-family: var(--font-family-accent); - font-size: 40px; - font-style: normal; - font-weight: 400; - line-height: 40px; /* 100% */ - letter-spacing: -0.26px; - margin-bottom: 48px; - } } .riv-animation { From 95385ef3097c588665f04b0791c7787ce7fc02b5 Mon Sep 17 00:00:00 2001 From: georgewrmarshall Date: Wed, 28 Oct 2026 13:21:45 -0700 Subject: [PATCH 4/6] chore: remove css import --- .../creation-successful/creation-successful.stories.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/ui/pages/onboarding-flow/creation-successful/creation-successful.stories.tsx b/ui/pages/onboarding-flow/creation-successful/creation-successful.stories.tsx index 472d805ef6bf..2548007e7f2c 100644 --- a/ui/pages/onboarding-flow/creation-successful/creation-successful.stories.tsx +++ b/ui/pages/onboarding-flow/creation-successful/creation-successful.stories.tsx @@ -1,7 +1,6 @@ import React from 'react'; import RiveWasmProvider from '../../../contexts/rive-wasm'; import CreationSuccessful from './creation-successful'; -import './index.scss'; export default { title: 'Pages/OnboardingFlow/CreationSuccessful', From bb64f1c78cc0422293ae6f8ddb746be59de91bcf Mon Sep 17 00:00:00 2001 From: georgewrmarshall Date: Wed, 28 Oct 2026 13:30:56 -0700 Subject: [PATCH 5/6] chore(onboarding): replace wallet-ready layout styles with Tailwind Show the SRP backup reminder in Storybook and drop the stylesheet now that the illustration is sized with utility classes. Co-authored-by: Cursor --- .../creation-successful.stories.tsx | 13 ++++++++-- .../creation-successful.tsx | 4 ++-- .../creation-successful/index.scss | 24 ------------------- .../wallet-ready-animation.tsx | 9 ++++--- ui/pages/onboarding-flow/index.scss | 1 - 5 files changed, 19 insertions(+), 32 deletions(-) delete mode 100644 ui/pages/onboarding-flow/creation-successful/index.scss diff --git a/ui/pages/onboarding-flow/creation-successful/creation-successful.stories.tsx b/ui/pages/onboarding-flow/creation-successful/creation-successful.stories.tsx index 2548007e7f2c..40eba3394d23 100644 --- a/ui/pages/onboarding-flow/creation-successful/creation-successful.stories.tsx +++ b/ui/pages/onboarding-flow/creation-successful/creation-successful.stories.tsx @@ -6,7 +6,7 @@ export default { title: 'Pages/OnboardingFlow/CreationSuccessful', }; -export const DefaultStory = () => { +const CreationSuccessfulStory = () => { return ( @@ -14,4 +14,13 @@ export const DefaultStory = () => { ); }; -DefaultStory.storyName = 'Default'; +export const DefaultStory = () => ; + +DefaultStory.storyName = 'Wallet ready'; + +export const SrpBackupReminderStory = () => ; + +SrpBackupReminderStory.storyName = 'SRP backup reminder'; +SrpBackupReminderStory.parameters = { + initialEntries: ['/?isFromReminder=true'], +}; diff --git a/ui/pages/onboarding-flow/creation-successful/creation-successful.tsx b/ui/pages/onboarding-flow/creation-successful/creation-successful.tsx index 8a22f171b906..85679f99b126 100644 --- a/ui/pages/onboarding-flow/creation-successful/creation-successful.tsx +++ b/ui/pages/onboarding-flow/creation-successful/creation-successful.tsx @@ -184,7 +184,7 @@ export default function CreationSuccessful() { if (!isFromSettingsSRPBackup) { return ( } @@ -213,7 +213,7 @@ export default function CreationSuccessful() { flexDirection={BoxFlexDirection.Column} justifyContent={BoxJustifyContent.Between} gap={6} - className="creation-successful h-full" + className="h-full" data-testid="parent-selector-onboarding-complete" > diff --git a/ui/pages/onboarding-flow/creation-successful/index.scss b/ui/pages/onboarding-flow/creation-successful/index.scss deleted file mode 100644 index 855bfa4d5b75..000000000000 --- a/ui/pages/onboarding-flow/creation-successful/index.scss +++ /dev/null @@ -1,24 +0,0 @@ -@use "design-system"; - -.creation-successful { - img { - align-self: center; - } -} - -.riv-animation { - &__wallet-ready-container { - height: 400px; - width: 100%; - display: flex; - justify-content: center; - align-items: flex-end; - pointer-events: none; - } - - - &__canvas { - height: 100%; - width: 100%; - } -} diff --git a/ui/pages/onboarding-flow/creation-successful/wallet-ready-animation.tsx b/ui/pages/onboarding-flow/creation-successful/wallet-ready-animation.tsx index c8c41b8b04e4..c796c783ef70 100644 --- a/ui/pages/onboarding-flow/creation-successful/wallet-ready-animation.tsx +++ b/ui/pages/onboarding-flow/creation-successful/wallet-ready-animation.tsx @@ -14,6 +14,9 @@ import { useRiveWasmFile, } from '../../../contexts/rive-wasm'; +const walletReadyContainerClassName = + 'pointer-events-none flex h-[400px] w-full items-end justify-center'; + export default function WalletReadyAnimation() { const theme = useTheme(); const context = useRiveWasmContext(); @@ -83,12 +86,12 @@ export default function WalletReadyAnimation() { status === 'loading' || status === 'failed' ) { - return ; + return ; } return ( - - + + ); } diff --git a/ui/pages/onboarding-flow/index.scss b/ui/pages/onboarding-flow/index.scss index 47f70a9a42cf..3dba46a4a43d 100644 --- a/ui/pages/onboarding-flow/index.scss +++ b/ui/pages/onboarding-flow/index.scss @@ -4,7 +4,6 @@ @import 'onboarding-app-header/index'; @import 'privacy-settings/index'; @import 'create-password/index'; -@import 'creation-successful/index'; @import 'welcome/index'; @import 'metametrics/index'; From 75642594e6c429ba153bd30ef0f7a68acc3e2977 Mon Sep 17 00:00:00 2001 From: georgewrmarshall Date: Wed, 28 Oct 2026 13:47:41 -0700 Subject: [PATCH 6/6] fix(onboarding): switch the reminder story and size artwork from the wrapper Storybook reused one router, so the reminder query never applied. The animation height now lives on the marketing moment artwork wrapper. Co-authored-by: Cursor --- .storybook/preview.js | 5 ++++- .../creation-successful/creation-successful.tsx | 3 +++ .../creation-successful/wallet-ready-animation.tsx | 12 ++---------- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/.storybook/preview.js b/.storybook/preview.js index 41d9610daf6a..96c027b3cd85 100644 --- a/.storybook/preview.js +++ b/.storybook/preview.js @@ -127,7 +127,10 @@ const metamaskDecorator = (story, context) => { return ( - + undefined, diff --git a/ui/pages/onboarding-flow/creation-successful/creation-successful.tsx b/ui/pages/onboarding-flow/creation-successful/creation-successful.tsx index 85679f99b126..c59685b866b9 100644 --- a/ui/pages/onboarding-flow/creation-successful/creation-successful.tsx +++ b/ui/pages/onboarding-flow/creation-successful/creation-successful.tsx @@ -188,6 +188,9 @@ export default function CreationSuccessful() { data-testid="parent-selector-onboarding-complete" title={t('yourWalletIsReady')} artwork={} + artworkWrapperProps={{ + className: 'pointer-events-none h-[400px] flex-none', + }} primaryAction={ { label: doneButtonLabel, diff --git a/ui/pages/onboarding-flow/creation-successful/wallet-ready-animation.tsx b/ui/pages/onboarding-flow/creation-successful/wallet-ready-animation.tsx index c796c783ef70..4591bafcc19a 100644 --- a/ui/pages/onboarding-flow/creation-successful/wallet-ready-animation.tsx +++ b/ui/pages/onboarding-flow/creation-successful/wallet-ready-animation.tsx @@ -6,7 +6,6 @@ import { Alignment, useRiveFile, } from '@rive-app/react-canvas'; -import { Box } from '@metamask/design-system-react'; import { useTheme } from '../../../hooks/useTheme'; import { ThemeType } from '../../../../shared/constants/preferences'; import { @@ -14,9 +13,6 @@ import { useRiveWasmFile, } from '../../../contexts/rive-wasm'; -const walletReadyContainerClassName = - 'pointer-events-none flex h-[400px] w-full items-end justify-center'; - export default function WalletReadyAnimation() { const theme = useTheme(); const context = useRiveWasmContext(); @@ -86,12 +82,8 @@ export default function WalletReadyAnimation() { status === 'loading' || status === 'failed' ) { - return ; + return null; } - return ( - - - - ); + return ; }