Skip to content

fix bootstrap disabled class conflict #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Ho3einWave merged 2 commits into from
Jan 7, 2025
Merged

fix bootstrap disabled class conflict #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4befee
refactor: rename disabled class to inactive-border in SlippageSetting…
Ho3einWave Jan 7, 2025
c9a61ff
Merge branch 'feature/fix-bootstrap-conflict' into develop
Ho3einWave Jan 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/components/Header/SlippageSetting.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
&:hover {
color: var(--primary-color);
}
&.disabled {
&.inactive-border {
color: var(--text-fade-color);
}
}
Expand Down Expand Up @@ -103,7 +103,7 @@
&:disabled {
cursor: not-allowed;
}
&.disabled {
&.inactive-border {
background: var(--light-shade-color);
color: var(--text-fade-color);
}
Expand Down
60 changes: 30 additions & 30 deletions lib/components/Header/SlippageSetting.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,47 +1,47 @@
import { ChangeEvent, useState } from "react";
import { AnimatePresence, motion } from "framer-motion";
import { useSwapStore } from "../../store/swap.store";
import "./SlippageSetting.scss";
import { useTranslation } from "react-i18next";
import { ChangeEvent, useState } from 'react';
import { AnimatePresence, motion } from 'framer-motion';
import { useSwapStore } from '../../store/swap.store';
import './SlippageSetting.scss';
import { useTranslation } from 'react-i18next';

const SlippageSetting = () => {
const { t } = useTranslation();

const { slippage, setSlippage } = useSwapStore();
const [userInput, setUserInput] = useState(
slippage === "auto" ? "" : slippage.toString()
slippage === 'auto' ? '' : slippage.toString()
);

const handleSlippageChange = (e: ChangeEvent<HTMLInputElement>) => {
e.preventDefault();
const decimalRegexp = /^\d*(?:\.\d{0,1})?$/;

const userInput = e.target.value.replace(/,/g, ".");
let clearedInput = "";
if (userInput === "") {
clearedInput = "".replace(/^0+$/, "0");
} else if (userInput === "." || userInput === "0.") {
clearedInput = "0.".replace(/^0+$/, "0");
const userInput = e.target.value.replace(/,/g, '.');
let clearedInput = '';
if (userInput === '') {
clearedInput = ''.replace(/^0+$/, '0');
} else if (userInput === '.' || userInput === '0.') {
clearedInput = '0.'.replace(/^0+$/, '0');
} else if (decimalRegexp.test(userInput)) {
clearedInput = userInput.replace(/^0+$/, "0");
clearedInput = userInput.replace(/^0+$/, '0');
} else {
return;
}
if (clearedInput.includes(".") || userInput === "0") {
setUserInput(clearedInput.replace(/^0+(?=\d)/, ""));
if (clearedInput.includes('.') || userInput === '0') {
setUserInput(clearedInput.replace(/^0+(?=\d)/, ''));
}
if (Number(clearedInput) > 0 && Number(clearedInput) <= 10) {
setUserInput(clearedInput.replace(/^0+(?=\d)/, ""));
setUserInput(clearedInput.replace(/^0+(?=\d)/, ''));
setSlippage(+clearedInput);
} else if (clearedInput === "") {
setUserInput("");
setSlippage("auto");
} else if (clearedInput === '') {
setUserInput('');
setSlippage('auto');
}
};

const handleOnAutoClick = () => {
setUserInput("");
setSlippage("auto");
setUserInput('');
setSlippage('auto');
};
const handleOnPercentClick = (percent: number) => {
setUserInput(percent.toString());
Expand All @@ -54,12 +54,12 @@ const SlippageSetting = () => {
data-testid="slippage-setting"
>
<button className="button-container">
<div>{t("max_slippage")}</div>
<div>{t('max_slippage')}</div>
<div
className="slippage-indicator"
data-testid="slippage-indicator"
>
{slippage === "auto" ? t("auto") : `${slippage}%`}{" "}
{slippage === 'auto' ? t('auto') : `${slippage}%`}{' '}
</div>
</button>
<AnimatePresence>
Expand All @@ -72,16 +72,16 @@ const SlippageSetting = () => {
<div
onClick={handleOnAutoClick}
className={`dropdown-item ${
slippage === "auto" ? "active" : "disabled"
slippage === 'auto' ? 'active' : 'inactive-border'
}`}
data-testid="slippage-setting-auto"
>
{t("auto")}
{t('auto')}
</div>
<div
onClick={() => handleOnPercentClick(2)}
className={`dropdown-item ${
slippage === 2 ? "active" : "disabled"
slippage === 2 ? 'active' : 'inactive-border'
}`}
data-testid="slippage-setting-2"
>
Expand All @@ -90,17 +90,17 @@ const SlippageSetting = () => {
<div
onClick={() => handleOnPercentClick(5)}
className={`dropdown-item ${
slippage === 5 ? "active" : "disabled"
slippage === 5 ? 'active' : 'inactive-border'
}`}
data-testid="slippage-setting-5"
>
5%
</div>
<div
className={`controllers dropdown-item ${
["auto", 2, 5].includes(slippage)
? "disabled"
: "active"
['auto', 2, 5].includes(slippage)
? 'inactive-border'
: 'active'
}`}
>
<input
Expand Down
Loading