fix: Refine slippage buttons to match trade patterns #36556
+32
−84
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,11 +2,10 @@ import React, { useState, useEffect } from 'react'; | |
| import { useDispatch, useSelector } from 'react-redux'; | ||
| import { BRIDGE_DEFAULT_SLIPPAGE } from '@metamask/bridge-controller'; | ||
| import { | ||
| ButtonPrimary, | ||
| ButtonPrimarySize, | ||
| ButtonSecondary, | ||
| ButtonSecondarySize, | ||
| Modal, | ||
| ModalContent, | ||
| ModalFooter, | ||
|
|
@@ -19,17 +18,16 @@ import { | |
| BannerAlert, | ||
| BannerAlertSeverity, | ||
| Box, | ||
| TextFieldSize, | ||
| } from '../../../components/component-library'; | ||
| import { useI18nContext } from '../../../hooks/useI18nContext'; | ||
| import { | ||
| BlockSize, | ||
| BorderColor, | ||
| JustifyContent, | ||
| TextVariant, | ||
| SEVERITIES, | ||
| BorderRadius, | ||
| } from '../../../helpers/constants/design-system'; | ||
| import { getIsSolanaSwap, getSlippage } from '../../../ducks/bridge/selectors'; | ||
| import { setSlippage } from '../../../ducks/bridge/actions'; | ||
|
|
@@ -109,127 +107,114 @@ export const BridgeTransactionSettingsModal = ({ | |
| <ModalOverlay /> | ||
| <ModalContent> | ||
| <ModalHeader onClose={onClose}>{t('transactionSettings')}</ModalHeader> | ||
| <Column gap={3} paddingInline={4} paddingBottom={4}> | ||
| <Row gap={1} justifyContent={JustifyContent.flexStart}> | ||
| <Text variant={TextVariant.bodyMdMedium}> | ||
| {t('swapsMaxSlippage')} | ||
| </Text> | ||
| <Tooltip position={PopoverPosition.Top} style={{ zIndex: 1051 }}> | ||
| {t('swapSlippageTooltip')} | ||
| </Tooltip> | ||
| </Row> | ||
| <Row gap={2} justifyContent={JustifyContent.flexStart}> | ||
| {shouldShowAutoOption && ( | ||
| <> | ||
| {isAutoSelected ? ( | ||
| <ButtonPrimary | ||
| size={ButtonPrimarySize.Md} | ||
| onClick={(e: React.MouseEvent<HTMLAnchorElement>) => { | ||
| e.preventDefault(); | ||
| e.stopPropagation(); | ||
| setLocalSlippage(undefined); | ||
| setCustomSlippage(undefined); | ||
| setIsAutoSelected(true); | ||
| }} | ||
| > | ||
| {t('swapSlippageAutoDescription')} | ||
| </ButtonPrimary> | ||
| ) : ( | ||
| <ButtonSecondary | ||
| size={ButtonSecondarySize.Md} | ||
| onClick={(e: React.MouseEvent<HTMLAnchorElement>) => { | ||
| e.preventDefault(); | ||
| e.stopPropagation(); | ||
| setLocalSlippage(undefined); | ||
| setCustomSlippage(undefined); | ||
| setIsAutoSelected(true); | ||
| }} | ||
| > | ||
| {t('swapSlippageAutoDescription')} | ||
| </ButtonSecondary> | ||
| )} | ||
| </> | ||
| )} | ||
| {HARDCODED_SLIPPAGE_OPTIONS.map((hardcodedSlippage) => { | ||
| const isSelected = | ||
| isAutoSelected === false && localSlippage === hardcodedSlippage; | ||
|
||
| return isSelected ? ( | ||
| <ButtonPrimary | ||
| key={hardcodedSlippage} | ||
| size={ButtonPrimarySize.Md} | ||
| onClick={(e: React.MouseEvent<HTMLAnchorElement>) => { | ||
| e.preventDefault(); | ||
| e.stopPropagation(); | ||
| setLocalSlippage(hardcodedSlippage); | ||
| setCustomSlippage(undefined); | ||
| setIsAutoSelected(false); | ||
| }} | ||
| > | ||
| {hardcodedSlippage}% | ||
| </ButtonPrimary> | ||
| ) : ( | ||
| <ButtonSecondary | ||
| key={hardcodedSlippage} | ||
| size={ButtonSecondarySize.Md} | ||
| onClick={(e: React.MouseEvent<HTMLAnchorElement>) => { | ||
| e.preventDefault(); | ||
| e.stopPropagation(); | ||
| setLocalSlippage(hardcodedSlippage); | ||
| setCustomSlippage(undefined); | ||
| setIsAutoSelected(false); | ||
| }} | ||
| > | ||
| {hardcodedSlippage}% | ||
| </ButtonSecondary> | ||
| ); | ||
| })} | ||
| {showCustomButton && ( | ||
| <> | ||
|
||
| {customSlippage === undefined ? ( | ||
| <ButtonSecondary | ||
| size={ButtonSecondarySize.Md} | ||
| onClick={(e: React.MouseEvent<HTMLAnchorElement>) => { | ||
| e.preventDefault(); | ||
| e.stopPropagation(); | ||
| setShowCustomButton(false); | ||
| setIsAutoSelected(false); | ||
| }} | ||
| > | ||
| {t('customSlippage')} | ||
| </ButtonSecondary> | ||
| ) : ( | ||
| <ButtonPrimary | ||
| size={ButtonPrimarySize.Md} | ||
| onClick={(e: React.MouseEvent<HTMLAnchorElement>) => { | ||
| e.preventDefault(); | ||
| e.stopPropagation(); | ||
| setShowCustomButton(false); | ||
| setIsAutoSelected(false); | ||
| }} | ||
| > | ||
| {`${customSlippage}%`} | ||
| </ButtonPrimary> | ||
| )} | ||
| </> | ||
| )} | ||
| {!showCustomButton && ( | ||
| <TextField | ||
| size={TextFieldSize.Md} | ||
| borderColor={BorderColor.borderMuted} | ||
| borderRadius={BorderRadius.XL} | ||
| type={TextFieldType.Text} | ||
| value={customSlippage} | ||
| onChange={(e) => { | ||
|
|
@@ -266,8 +251,7 @@ export const BridgeTransactionSettingsModal = ({ | |
| <ModalFooter> | ||
| <ButtonPrimary | ||
| width={BlockSize.Full} | ||
| size={ButtonPrimarySize.Lg} | ||
| disabled={(() => { | ||
| // Calculate what the new slippage would be | ||
| const newSlippage = isAutoSelected | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -102,7 +102,6 @@ | |
| } | ||
|
|
||
| .mm-text-field { | ||
| width: 94px; | ||
|
|
||
| &--focused, | ||
|
|
@@ -111,10 +110,7 @@ | |
| } | ||
|
|
||
| input { | ||
| width: 100%; | ||
| } | ||
| } | ||
| } | ||
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.
Bug: Slippage Button Selection Logic Bug
The selection logic for hardcoded slippage buttons now explicitly checks for
isAutoSelected === falseinstead of any falsy value. This can cause hardcoded slippage options to appear unselected ifisAutoSelectedisundefinedduring initialization or state updates.