fix(TMCU-1045): Remove useElevatedSurface shim from Core UX bottom sheets #33162
+2
−26
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -361,17 +361,9 @@ jest.mock('../../../util/navigation/navUtils', () => ({ | |
| useParams: () => mockUseParams(), | ||
| })); | ||
|
|
||
| describe('TradeWalletActions', () => { | ||
| beforeEach(() => { | ||
| jest.clearAllMocks(); | ||
| mockParentCanGoBack = true; | ||
| jest | ||
| .spyOn(global, 'requestAnimationFrame') | ||
|
|
@@ -445,42 +437,6 @@ describe('TradeWalletActions', () => { | |
| ).toBeNull(); | ||
| }); | ||
|
|
||
| it('should render earn button if the stablecoin lending feature is enabled', () => { | ||
|
Contributor
Author
There was a problem hiding this comment. Revert the changes to this file
Contributor
Author
There was a problem hiding this comment. @cursoragent Revert the changes to this file
Contributor
There was a problem hiding this comment. Reverted
Pushed in commit Note: Those two tests will fail until the related changes are also reverted in:
  |
||
| ( | ||
| selectStablecoinLendingEnabledFlag as jest.MockedFunction< | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -36,13 +36,8 @@ import { | |
| TextVariant, | ||
| } from '@metamask/design-system-react-native'; | ||
| import { | ||
| useTailwind, | ||
| } from '@metamask/design-system-twrnc-preset'; | ||
| import { BatchSellMetricsLocation } from '@metamask/bridge-controller'; | ||
| import { | ||
| useSafeAreaFrame, | ||
|
|
@@ -118,8 +113,6 @@ function TradeWalletActions() { | |
| const insetsTop = Platform.OS === 'android' ? insets.top : 0; | ||
|
|
||
| const tw = useTailwind(); | ||
| const theme = useTheme(); | ||
| const { colors } = theme; | ||
|
|
||
|
|
@@ -317,8 +310,6 @@ function TradeWalletActions() { | |
| [dismissRootModalFlow, exitingAnimationWithCallback], | ||
| ); | ||
|
|
||
| const actionList = ( | ||
| <> | ||
| {shouldRenderBatchSell && ( | ||
|
|
@@ -391,56 +382,23 @@ function TradeWalletActions() { | |
| <View style={tw.style('px-4')}> | ||
| <View | ||
| testID={WalletActionsBottomSheetSelectorsIDs.MENU_CONTAINER} | ||
| style={tw.style('bg-default p-4 rounded-t-2xl px-0')} | ||
| > | ||
| {actionList} | ||
| </View> | ||
| <View | ||
| style={tw.style('flex-row mt-[-1px]', { height: bottomMaskHeight })} | ||
| > | ||
| <View style={tw.style('bg-default flex-1 rounded-bl-2xl')} /> | ||
| <BottomShape | ||
| width={buttonLayout.width * 4} | ||
| height={bottomMaskHeight} | ||
| peakHeight={16} | ||
| peakBezierLength={25} | ||
| baseBezierLength={55} | ||
| fill={colors.background.default} | ||
| /> | ||
| <View style={tw.style('bg-default flex-1 rounded-br-2xl')} /> | ||
|
Contributor
There was a problem hiding this comment. Trade menu loses elevated surfaceLow Severity The custom trade actions sheet is not an MMDS   Reviewed by Cursor Bugbot for commit 3fb3c08. Configure here. |
||
| </View> | ||
| </View> | ||
| </Animated.View> | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| import React, { useMemo } from 'react'; | ||
| import Svg, { Path } from 'react-native-svg'; | ||
|
|
||
| function BottomShape({ | ||
| width, | ||
|
|
@@ -8,8 +8,6 @@ function BottomShape({ | |
| peakBezierLength = 25, | ||
| baseBezierLength = 55, | ||
| fill = 'black', | ||
| ...svgProps | ||
| }: { | ||
| width: number; | ||
|
|
@@ -18,8 +16,6 @@ function BottomShape({ | |
| peakBezierLength?: number; | ||
| baseBezierLength?: number; | ||
| fill?: string; | ||
| }) { | ||
| const pathData = useMemo(() => { | ||
| const centerX = width / 2; | ||
|
|
@@ -32,25 +28,6 @@ function BottomShape({ | |
| const rightBaseX = centerX + baseBezierLength; | ||
| const rightBaseY = height; | ||
|
|
||
| return ` | ||
| M 0 ${height} | ||
| V 0 | ||
|
|
@@ -67,18 +44,11 @@ function BottomShape({ | |
| ` | ||
| .replace(/\s+/g, ' ') | ||
| .trim(); | ||
| }, [width, height, peakHeight, peakBezierLength, baseBezierLength]); | ||
|
|
||
| return ( | ||
| <Svg width={width} height={height} {...svgProps}> | ||
| <Path d={pathData} fill={fill} /> | ||
| </Svg> | ||
| ); | ||
| } | ||
|
Contributor
Author
There was a problem hiding this comment. @cursoragent revert the changes to this file
Contributor
There was a problem hiding this comment. Reverted Pushed in commit |
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
MMDS BottomSheet callsites no longer need twClassName={surfaceClass} because BottomSheetDialog owns elevated surface styling since design-system-react-native 0.33. CustomNetworkSelector and NetworkMultiSelectorList instead drop per-row surfaceClass that duplicated the parent sheet background. AddressSelector and DeleteNetworkModal match the BottomSheet pattern in this PR.