Skip to content

Commit 82cc434

Browse files
authored
Merge pull request #47961 from MetaMask/stable-sync-release-13.58.0
chore: sync stable into release/13.58.0
2 parents 542ef95 + 8f83e78 commit 82cc434

3 files changed

Lines changed: 20 additions & 1 deletion

File tree

‎CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
7979

8080
### Changed
8181

82+
- Updated the Money onboarding splash with new hero artwork, heading styles, and card layout (#47716)
83+
- Updated the Perps withdrawal amount input to the Grotzec typeface (#47560)
8284
- Updated the MetaMask Pay amount input to the Grotzec typeface (#47565)
8385
- Made bottom navigation available by default (#47206)
8486
- Showed more of recipient addresses in Send (#47533)
@@ -92,6 +94,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
9294

9395
### Fixed
9496

97+
- Fixed a bug where the close button on the Transaction Shield intro modal in Settings could not be clicked (#47916)
9598
- Fixed the nickname modal address field appearing disabled while keeping it read-only (#47593)
9699
- Fixed the token details header to show the token name with its ticker beneath it (#47552)
97100
- Fixed Tron balances being ignored when determining whether to show the wallet empty state (#47570)

‎ui/components/app/shield-entry-modal/shield-entry-modal.test.tsx‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,13 +94,27 @@ describe('Shield Entry Modal', () => {
9494

9595
const closeButton = getByTestId('shield-entry-modal-close-button');
9696
expect(closeButton).toHaveAccessibleName('Close');
97+
expect(closeButton.closest('header')).toHaveClass('z-10');
9798
fireEvent.click(closeButton);
9899
expect(setShowShieldEntryModalOnceSpy).toHaveBeenCalledWith({
99100
show: false,
100101
hasUserInteractedWithModal: true,
101102
});
102103
});
103104

105+
it('dismisses through the local onClose callback when event submission is skipped', () => {
106+
const onClose = jest.fn();
107+
const { getByTestId } = renderWithProvider(
108+
<ShieldEntryModal skipEventSubmission onClose={onClose} />,
109+
mockStore,
110+
);
111+
112+
fireEvent.click(getByTestId('shield-entry-modal-close-button'));
113+
114+
expect(onClose).toHaveBeenCalledTimes(1);
115+
expect(setShowShieldEntryModalOnceSpy).not.toHaveBeenCalled();
116+
});
117+
104118
it('should call onGetStarted when the get started button is clicked', async () => {
105119
const { getByTestId } = renderWithProvider(<ShieldEntryModal />, mockStore);
106120

‎ui/components/app/shield-entry-modal/shield-entry-modal.tsx‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,9 @@ const ShieldEntryModal = ({
235235
'data-testid': 'shield-entry-modal-close-button',
236236
ariaLabel: t('close'),
237237
}}
238-
className="absolute top-4 left-0 right-0 w-full"
238+
// ModalBody is position:relative and paints after this header.
239+
// Without a z-index the close control stays visible but cannot be clicked.
240+
className="absolute top-4 left-0 right-0 z-10 w-full"
239241
/>
240242
<ModalBody className="overflow-y-auto py-0 [scrollbar-width:none] [&::-webkit-scrollbar]:hidden">
241243
<MarketingMoment

0 commit comments

Comments
 (0)