m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Show STX switch for wrapping / unwrapping (#14225)

Browse Source
This commit is contained in:
Daniel 2022-03-30 10:02:55 +02:00 committed by GitHub
parent 4f1cee4b87
commit 69d7c51c56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 96 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/pages/swaps/build-quote/build-quote.js
View File

@ -825,7 +825,8 @@ export default function BuildQuote({
)} )}
</div> </div>
))} ))}
{!isDirectWrappingEnabled && ( {(smartTransactionsEnabled ||
(!smartTransactionsEnabled && !isDirectWrappingEnabled)) && (
<div className="build-quote__slippage-buttons-container"> <div className="build-quote__slippage-buttons-container">
<SlippageButtons <SlippageButtons
onSelect={(newSlippage) => { onSelect={(newSlippage) => {
@ -837,6 +838,7 @@ export default function BuildQuote({
smartTransactionsOptInStatus={smartTransactionsOptInStatus} smartTransactionsOptInStatus={smartTransactionsOptInStatus}
setSmartTransactionsOptInStatus={setSmartTransactionsOptInStatus} setSmartTransactionsOptInStatus={setSmartTransactionsOptInStatus}
currentSmartTransactionsError={currentSmartTransactionsError} currentSmartTransactionsError={currentSmartTransactionsError}
isDirectWrappingEnabled={isDirectWrappingEnabled}
/> />
</div> </div>
)} )}

15
ui/pages/swaps/slippage-buttons/slippage-buttons.js
View File

@ -24,6 +24,7 @@ export default function SlippageButtons({
smartTransactionsOptInStatus, smartTransactionsOptInStatus,
setSmartTransactionsOptInStatus, setSmartTransactionsOptInStatus,
currentSmartTransactionsError, currentSmartTransactionsError,
isDirectWrappingEnabled,
}) { }) {
const t = useContext(I18nContext); const t = useContext(I18nContext);
const [customValue, setCustomValue] = useState(() => { const [customValue, setCustomValue] = useState(() => {
@ -103,6 +104,7 @@ export default function SlippageButtons({
<div className="slippage-buttons__content"> <div className="slippage-buttons__content">
{open && ( {open && (
<> <>
{!isDirectWrappingEnabled && (
<div className="slippage-buttons__dropdown-content"> <div className="slippage-buttons__dropdown-content">
<div className="slippage-buttons__buttons-prefix"> <div className="slippage-buttons__buttons-prefix">
<div className="slippage-buttons__prefix-text"> <div className="slippage-buttons__prefix-text">
@ -160,9 +162,12 @@ export default function SlippageButtons({
> >
{enteringCustomValue ? ( {enteringCustomValue ? (
<div <div
className={classnames('slippage-buttons__custom-input', { className={classnames(
'slippage-buttons__custom-input',
{
'slippage-buttons__custom-input--danger': errorText, 'slippage-buttons__custom-input--danger': errorText,
})} },
)}
> >
<input <input
onChange={(event) => { onChange={(event) => {
@ -186,11 +191,14 @@ export default function SlippageButtons({
customValueText customValueText
)} )}
{(customValue || enteringCustomValue) && ( {(customValue || enteringCustomValue) && (
<div className="slippage-buttons__percentage-suffix">%</div> <div className="slippage-buttons__percentage-suffix">
%
</div>
)} )}
</Button> </Button>
</ButtonGroup> </ButtonGroup>
</div> </div>
)}
{smartTransactionsEnabled && ( {smartTransactionsEnabled && (
<Box marginTop={2} display={DISPLAY.FLEX}> <Box marginTop={2} display={DISPLAY.FLEX}>
<Box <Box
@ -246,4 +254,5 @@ SlippageButtons.propTypes = {
smartTransactionsOptInStatus: PropTypes.bool, smartTransactionsOptInStatus: PropTypes.bool,
setSmartTransactionsOptInStatus: PropTypes.func, setSmartTransactionsOptInStatus: PropTypes.func,
currentSmartTransactionsError: PropTypes.string, currentSmartTransactionsError: PropTypes.string,
isDirectWrappingEnabled: PropTypes.bool,
}; };