diff --git a/src/app/global-error.tsx b/src/app/global-error.tsx index b2518d9b..adb4dbeb 100644 --- a/src/app/global-error.tsx +++ b/src/app/global-error.tsx @@ -81,7 +81,7 @@ const GlobalError = ({ error, reset }: GlobalErrorViewProps) => { locales={languages as unknown as Intl.LanguagesKeys[]} >
-
+
= (props) => { } = props const controlId = useId() - const { isMobile } = device.useData() + const { isDesktop } = device.useData() const testId = dataTestId || `input-${controlId}` const inputRef = useRef(null) @@ -38,8 +38,8 @@ const AmountInput: React.FC = (props) => { className={cx(s.input, className, 'w-full', { 'text-dark': !error, 'text-error': error, - 'text-h20': isMobile, - 'text-t40m': !isMobile, + 'text-h20': !isDesktop, + 'text-t40m': isDesktop, })} ref={inputRef} placeholder="0" diff --git a/src/components/AutoHeightToggle/AutoHeightToggle.tsx b/src/components/AutoHeightToggle/AutoHeightToggle.tsx index 823fd443..690040b9 100644 --- a/src/components/AutoHeightToggle/AutoHeightToggle.tsx +++ b/src/components/AutoHeightToggle/AutoHeightToggle.tsx @@ -35,14 +35,14 @@ const AutoHeightToggle: React.FC = (props) => { const marginTop = parseFloat(getComputedStyle(contentRef.current as HTMLDivElement).marginTop) if (containerRef.current) { - containerRef.current.style.height = `calc(${padding * 2}rem + ${contentHeight + containerHeight + marginTop}px)` + containerRef.current.style.height = `calc(${padding * 2}px + ${contentHeight + containerHeight + marginTop}px)` } } else { const height = childrenRef.current?.clientHeight if (containerRef.current) { - containerRef.current.style.height = `calc(${padding * 2}rem + ${height}px)` + containerRef.current.style.height = `calc(${padding * 2}px + ${height}px)` } } }, [ isOpen, toggleContent ]) diff --git a/src/components/Bone/Bone.module.scss b/src/components/Bone/Bone.module.scss index 8ce14960..8f9a5b1a 100644 --- a/src/components/Bone/Bone.module.scss +++ b/src/components/Bone/Bone.module.scss @@ -26,7 +26,7 @@ @keyframes bone { 0% { - transform: translateY(6rem) scale(0.98); + transform: translateY(6px) scale(0.98); opacity: .2; } 85%, diff --git a/src/components/Bone/Bone.tsx b/src/components/Bone/Bone.tsx index 25100c08..494d6254 100644 --- a/src/components/Bone/Bone.tsx +++ b/src/components/Bone/Bone.tsx @@ -29,11 +29,11 @@ const Bone: React.FC = (props: any) => { const style: any = styles if (width) { - style.width = style.minWidth = `${width}rem` + style.width = style.minWidth = `${width}px` } if (height) { - style.height = style.minHeight = `${height}rem` + style.height = style.minHeight = `${height}px` } return style diff --git a/src/components/Button/Button.tsx b/src/components/Button/Button.tsx index d1919b34..c1397c75 100644 --- a/src/components/Button/Button.tsx +++ b/src/components/Button/Button.tsx @@ -87,11 +87,11 @@ const Button: React.FC = (props) => { }, [ loading, disabled, color ]) const buttonSizeClassName = cx({ - 'min-w-[28rem] h-[28rem]': size === 'xs', + 'min-w-[28px] h-[28px]': size === 'xs', 'min-w-32 h-32': size === 's', - 'min-w-[44rem] h-[44rem]': size === 'm', + 'min-w-[44px] h-[44px]': size === 'm', 'min-w-60 h-60': size === 'l', - 'min-w-[70rem] h-[70rem]': size === 'xl', + 'min-w-[70px] h-[70px]': size === 'xl', }) const buttonPaddingClassName = cx({ diff --git a/src/components/ButtonRangePicker/ButtonRangePicker.module.scss b/src/components/ButtonRangePicker/ButtonRangePicker.module.scss index 628dd8f9..3f5466fb 100644 --- a/src/components/ButtonRangePicker/ButtonRangePicker.module.scss +++ b/src/components/ButtonRangePicker/ButtonRangePicker.module.scss @@ -1,3 +1,3 @@ .rounded { - border-radius: 11rem; + border-radius: 11px; } diff --git a/src/components/Chart/Chart.tsx b/src/components/Chart/Chart.tsx index 739fcb37..fee2fb30 100644 --- a/src/components/Chart/Chart.tsx +++ b/src/components/Chart/Chart.tsx @@ -43,7 +43,7 @@ const Chart: React.FC = (props) => {
= ({ className }) => { - const { isMobile } = device.useData() - const columns = isMobile ? 4 : 6 + const { isDesktop } = device.useData() + const columns = isDesktop ? 6 : 4 return (
@@ -27,7 +27,7 @@ const Skeleton: React.FC = ({ className }) => { key={index} className="absolute bottom-4 mb-48" style={{ - height: `${50 + index * 30}rem`, + height: `${50 + index * 30}px`, left: `${Math.max(((index / columns) * 95), 4)}%`, width: `${50 / columns}%`, }} @@ -44,7 +44,7 @@ const Skeleton: React.FC = ({ className }) => {
- +
diff --git a/src/components/Counter/Counter.module.scss b/src/components/Counter/Counter.module.scss index a1fe5492..82edbed8 100644 --- a/src/components/Counter/Counter.module.scss +++ b/src/components/Counter/Counter.module.scss @@ -1,6 +1,6 @@ .counter { - min-width: 20rem; - height: 20rem; + min-width: 20px; + height: 20px; @include dark-theme { color: $color-dark; diff --git a/src/components/Dropdown/Option/Option.module.scss b/src/components/Dropdown/Option/Option.module.scss index 0576781f..1485c99a 100644 --- a/src/components/Dropdown/Option/Option.module.scss +++ b/src/components/Dropdown/Option/Option.module.scss @@ -1,6 +1,6 @@ .option { - min-width: 160rem; - height: 48rem; + min-width: 160px; + height: 48px; &:hover, &:focus { @@ -9,7 +9,7 @@ } .withSubTitle { - height: 52rem; + height: 52px; } .logo { diff --git a/src/components/Image/util/getImageStyle.ts b/src/components/Image/util/getImageStyle.ts index 480f639e..e224e33e 100644 --- a/src/components/Image/util/getImageStyle.ts +++ b/src/components/Image/util/getImageStyle.ts @@ -8,7 +8,7 @@ type Input = { } const getImageStyle = ({ size, color, imageUrl }: Input) => { - const remSize = size ? `${size}rem` : undefined + const remSize = size ? `${size}px` : undefined const dimensions: CSSProperties = { width: remSize, diff --git a/src/components/Input/InputButton/InputButton.module.scss b/src/components/Input/InputButton/InputButton.module.scss index a17e602f..31e5aa13 100644 --- a/src/components/Input/InputButton/InputButton.module.scss +++ b/src/components/Input/InputButton/InputButton.module.scss @@ -1,4 +1,4 @@ .button { - height: 24rem; + height: 24px; background-color: rgba($color-dark-rgb, .06); } diff --git a/src/components/Input/InputView/InputView.module.scss b/src/components/Input/InputView/InputView.module.scss index d05b6b1f..0fb52307 100644 --- a/src/components/Input/InputView/InputView.module.scss +++ b/src/components/Input/InputView/InputView.module.scss @@ -21,16 +21,16 @@ $bg-color-error-hover: rgba($color-error-rgb, .15); @include field-colors($border-color-default, $bg-color-default); &.isMultiline { - min-height: 20rem; + min-height: 20px; .crossButton { - top: 12rem; - right: 16rem; + top: 12px; + right: 16px; } } &:not(.isMultiline) { - height: 48rem; + height: 48px; } &:not(.disabled) { @@ -60,7 +60,7 @@ $bg-color-error-hover: rgba($color-error-rgb, .15); &.focused { .label { - top: 5rem; + top: 5px; } } @@ -74,7 +74,7 @@ $bg-color-error-hover: rgba($color-error-rgb, .15); } .label { - top: 14rem; + top: 14px; pointer-events: none; @include basic-transition(); } @@ -88,7 +88,7 @@ $bg-color-error-hover: rgba($color-error-rgb, .15); caret-color: $color-dark; &.isMultiline { - line-height: 20rem; + line-height: 20px; } &:focus { diff --git a/src/components/MenuDropdown/Option/Option.module.scss b/src/components/MenuDropdown/Option/Option.module.scss index 79a9de24..d3186013 100644 --- a/src/components/MenuDropdown/Option/Option.module.scss +++ b/src/components/MenuDropdown/Option/Option.module.scss @@ -1,5 +1,5 @@ .option { - min-width: 160rem; + min-width: 160px; @media (hover: hover) { &:hover { diff --git a/src/components/MenuDropdown/Option/Option.tsx b/src/components/MenuDropdown/Option/Option.tsx index 0168d24b..d197829d 100644 --- a/src/components/MenuDropdown/Option/Option.tsx +++ b/src/components/MenuDropdown/Option/Option.tsx @@ -39,7 +39,7 @@ const Option: React.FC = (props) => { className={cx(s.option, className, 'flex items-center pl-16 pr-24 cursor-pointer', { 'bg-primary/10': active, 'h-48': !subTitle, - 'h-[52rem]': subTitle, + 'h-[52px]': subTitle, })} data-testid={dataTestId} onClick={onClick} diff --git a/src/components/Modal/Content/Buttons/Buttons.module.scss b/src/components/Modal/Content/Buttons/Buttons.module.scss index 065d2880..a4ccd401 100644 --- a/src/components/Modal/Content/Buttons/Buttons.module.scss +++ b/src/components/Modal/Content/Buttons/Buttons.module.scss @@ -1,5 +1,5 @@ @include desktop { .button { - min-width: 210rem; + min-width: 210px; } } diff --git a/src/components/Modal/Content/Content.tsx b/src/components/Modal/Content/Content.tsx index b0b1b130..3d2c3336 100644 --- a/src/components/Modal/Content/Content.tsx +++ b/src/components/Modal/Content/Content.tsx @@ -43,7 +43,7 @@ const Content: React.FC = (props) => { handleClose, } = props - const { isMobile } = device.useData() + const { isDesktop } = device.useData() const isWide = size === 'wide' const isNarrow = size === 'narrow' @@ -119,7 +119,7 @@ const Content: React.FC = (props) => { {isNarrow && descriptionNode} diff --git a/src/components/Modal/Modal.module.scss b/src/components/Modal/Modal.module.scss index 61c0352f..dd80d8bd 100644 --- a/src/components/Modal/Modal.module.scss +++ b/src/components/Modal/Modal.module.scss @@ -1,7 +1,7 @@ .overlay { overflow-y: auto; - -webkit-backdrop-filter: blur(28rem); - backdrop-filter: blur(28rem); + -webkit-backdrop-filter: blur(28px); + backdrop-filter: blur(28px); @include fade-in(animation, 300ms, ease); @include light-theme { @@ -51,10 +51,10 @@ @include desktop { .narrow { - width: 480rem; + width: 480px; } .wide { - width: 800rem; + width: 800px; } } diff --git a/src/components/Modal/Modal.tsx b/src/components/Modal/Modal.tsx index 3a46349b..536965e4 100644 --- a/src/components/Modal/Modal.tsx +++ b/src/components/Modal/Modal.tsx @@ -29,7 +29,7 @@ const Modal: React.FC = (props) => { // This state use for animation const [ isOpen, setIsOpen ] = useState(true) - const { isMobile, isDesktop } = device.useData() + const { isDesktop } = device.useData() useEffect(() => { // Headless UI Dialog sets the #global-wrapper to inert, @@ -117,8 +117,8 @@ const Modal: React.FC = (props) => { > diff --git a/src/components/Notification/Notification.module.scss b/src/components/Notification/Notification.module.scss index 4b2c4fc1..1d4fa44b 100644 --- a/src/components/Notification/Notification.module.scss +++ b/src/components/Notification/Notification.module.scss @@ -1,6 +1,6 @@ .notification { - min-width: 210rem; - max-width: 560rem; + min-width: 210px; + max-width: 560px; background-color: $color-light; animation: openNotification 500ms ease; @@ -34,8 +34,8 @@ .closeButton { top: 50%; - right: 16rem; - margin-top: -12rem; + right: 16px; + margin-top: -12px; background-color: rgba($color-dark-rgb, .05); pointer-events: auto; } diff --git a/src/components/PercentInput/PercentInput.tsx b/src/components/PercentInput/PercentInput.tsx index 548f5e0b..2066939f 100644 --- a/src/components/PercentInput/PercentInput.tsx +++ b/src/components/PercentInput/PercentInput.tsx @@ -36,7 +36,7 @@ export type PercentInputProps = { } const PercentInput: React.FC = ({ field, isDisabled, dataTestId }) => { - const { isMobile } = device.useData() + const { isDesktop } = device.useData() const { value, error } = forms.useFieldValue(field) @@ -106,12 +106,12 @@ const PercentInput: React.FC = ({ field, isDisabled, dataTest return (
= (props) => { const { className, buttonClassName, childClassName, headNode, children } = props - const { isMobile } = device.useData() + const { isDesktop } = device.useData() const [ isOpen, setIsOpen ] = useState(false) const { refs, floatingStyles, context } = useFloating({ open: isOpen, - placement: isMobile ? 'top' : 'top-end', + placement: isDesktop ? 'top-end' : 'top', middleware: [ offset(10), flip({ @@ -94,7 +94,7 @@ const PopupInfo: React.FC = (props) => { {children}
{ - isMobile && ( + !isDesktop && ( = (props: RangeSliderViewP }) const percent = Math.min((value - min) / (max - min) * 100, 100) - const thumbStyle = { left: `calc(${percent}% - ${25 * percent / 100}rem)` } + const thumbStyle = { left: `calc(${percent}% - ${25 * percent / 100}px)` } return (
= (props) => { const { className, token, dataTestId } = props - const { isMobile } = device.useData() + const { isDesktop } = device.useData() return (
@@ -26,7 +26,7 @@ const Token: React.FC = (props) => { /> diff --git a/src/components/TokenAmountInput/Token/Token.tsx b/src/components/TokenAmountInput/Token/Token.tsx index 62439d76..e9c5a2e9 100644 --- a/src/components/TokenAmountInput/Token/Token.tsx +++ b/src/components/TokenAmountInput/Token/Token.tsx @@ -16,7 +16,7 @@ type TokenProps = { const Token: React.FC = (props) => { const { className, token, dataTestId } = props - const { isMobile } = device.useData() + const { isDesktop } = device.useData() return (
@@ -26,7 +26,7 @@ const Token: React.FC = (props) => { /> diff --git a/src/components/TokenAmountInputView/TokenAmountInputView.tsx b/src/components/TokenAmountInputView/TokenAmountInputView.tsx index 7d264a5a..08160d7d 100644 --- a/src/components/TokenAmountInputView/TokenAmountInputView.tsx +++ b/src/components/TokenAmountInputView/TokenAmountInputView.tsx @@ -45,7 +45,7 @@ const TokenAmountInputView: React.FC = (props) => { onMaxButtonClick, } = props - const { isMobile } = device.useData() + const { isDesktop } = device.useData() const { error } = forms.useFieldValue(field) const { formattedValue, handleChange, setSpecialFormat } = useSpecialFormat({ field, @@ -63,7 +63,7 @@ const TokenAmountInputView: React.FC = (props) => { @@ -72,7 +72,7 @@ const TokenAmountInputView: React.FC = (props) => {
= (props) => {
{ - !isMobile && ( + isDesktop && ( = (props) => { } = props const { chainId } = useConfig() - const { isMobile } = device.useData() + const { isDesktop } = device.useData() const { isFetching, open } = useTokenDropdown({ isFetchingDisabled, }) @@ -71,7 +71,7 @@ const TokenDropdown: React.FC = (props) => { contentClassName={contentClassName} dataTestId={dataTestId} middleware={( - isMobile + !isDesktop ? { offsetOptions: { mainAxis: 26, diff --git a/src/components/TokenDropdown/TokenOptions/Option/Option.module.scss b/src/components/TokenDropdown/TokenOptions/Option/Option.module.scss index 2c417d15..98818473 100644 --- a/src/components/TokenDropdown/TokenOptions/Option/Option.module.scss +++ b/src/components/TokenDropdown/TokenOptions/Option/Option.module.scss @@ -1,5 +1,5 @@ .option { - height: 56rem; + height: 56px; &:hover, &:focus { diff --git a/src/components/TokenDropdown/TokenOptions/TokenOptions.tsx b/src/components/TokenDropdown/TokenOptions/TokenOptions.tsx index b2fcc0bc..47849d95 100644 --- a/src/components/TokenDropdown/TokenOptions/TokenOptions.tsx +++ b/src/components/TokenDropdown/TokenOptions/TokenOptions.tsx @@ -28,7 +28,7 @@ const TokenOptions: React.FC = (props) => { const { sdk, isGnosis } = useConfig() - const { isMobile } = device.useData() + const { isDesktop } = device.useData() const { value: search } = forms.useFieldValue(field) const filteredTokens = useMemo(() => { @@ -55,8 +55,8 @@ const TokenOptions: React.FC = (props) => { <> = (props) => { className="overflow-y-auto" fadeClassName="fixed" style={{ - height: `calc(5 * 56rem - 28rem)`, + height: `calc(5 * 56px - 28px)`, }} >
@@ -85,8 +85,8 @@ const TokenOptions: React.FC = (props) => { fadeClassName="fixed" style={{ height: filteredTokens.length > 5 - ? `calc(5 * 56rem - 28rem)` - : `calc(${filteredTokens.length} * 56rem)`, + ? `calc(5 * 56px - 28px)` + : `calc(${filteredTokens.length} * 56px)`, }} >
diff --git a/src/components/TokenDropdown/TokenOptions/TokenSearch/TokenSearch.tsx b/src/components/TokenDropdown/TokenOptions/TokenSearch/TokenSearch.tsx index 140b222a..b06e04d8 100644 --- a/src/components/TokenDropdown/TokenOptions/TokenSearch/TokenSearch.tsx +++ b/src/components/TokenDropdown/TokenOptions/TokenSearch/TokenSearch.tsx @@ -24,7 +24,7 @@ const TokenSearch: React.FC = (props) => { return (
= ({ title, items, ... {...rest} > diff --git a/src/hooks/controls/useTabButton.ts b/src/hooks/controls/useTabButton.ts index e7d782a2..d2e4343a 100644 --- a/src/hooks/controls/useTabButton.ts +++ b/src/hooks/controls/useTabButton.ts @@ -13,7 +13,7 @@ const useTabButton = (props: Input, deps: any[] = []) => { const { gap = 0, index = 0, firstRenderClassName } = props || {} const { locale } = intl.useIntl() - const { isMobile } = device.useData() + const { isDesktop } = device.useData() const tabButtonRef = useRef(null) const containerRef = useRef(null) @@ -33,7 +33,7 @@ const useTabButton = (props: Input, deps: any[] = []) => { if (widths[index] && height) { return { - left: `calc(${offset}px + ${gapOffset}rem)`, + left: `calc(${offset}px + ${gapOffset}px)`, width: `${widths[index]}px`, height: `${height}px`, } @@ -70,7 +70,7 @@ const useTabButton = (props: Input, deps: any[] = []) => { useLayoutEffect(() => { setPosition() // eslint-disable-next-line react-hooks/exhaustive-deps - }, [ ...deps, locale, isMobile, setPosition ]) + }, [ ...deps, locale, isDesktop, setPosition ]) useEffect(() => { const children = containerRef.current?.children diff --git a/src/hooks/controls/useViewportHeight.ts b/src/hooks/controls/useViewportHeight.ts index 3d4de63a..12bef597 100644 --- a/src/hooks/controls/useViewportHeight.ts +++ b/src/hooks/controls/useViewportHeight.ts @@ -37,10 +37,10 @@ import device from 'modules/device' */ const useViewportHeight = () => { - const { isMobile } = device.useData() + const { isDesktop } = device.useData() useEffect(() => { - if (isMobile) { + if (!isDesktop) { const handler = () => { const vh = window.innerHeight * 0.01 @@ -55,7 +55,7 @@ const useViewportHeight = () => { document.documentElement.style.removeProperty('--vh') } } - }, [ isMobile ]) + }, [ isDesktop ]) } diff --git a/src/layouts/AppLayout/BottomLoader/BottomLoader.module.scss b/src/layouts/AppLayout/BottomLoader/BottomLoader.module.scss index b2a90e10..e2aa4432 100644 --- a/src/layouts/AppLayout/BottomLoader/BottomLoader.module.scss +++ b/src/layouts/AppLayout/BottomLoader/BottomLoader.module.scss @@ -1,5 +1,5 @@ .loader { - backdrop-filter: blur(30rem); + backdrop-filter: blur(30px); transition: all 0.3s ease-in-out; animation: openLoader 0.3s ease-in-out; @@ -34,7 +34,7 @@ @keyframes openLoader { from { - transform: translateX(calc(100% + 24rem)); + transform: translateX(calc(100% + 24px)); opacity: 0; } to { diff --git a/src/layouts/AppLayout/Header/BurgerButton/BurgerButton.module.scss b/src/layouts/AppLayout/Header/BurgerButton/BurgerButton.module.scss index fa0a4d0f..b35c997d 100644 --- a/src/layouts/AppLayout/Header/BurgerButton/BurgerButton.module.scss +++ b/src/layouts/AppLayout/Header/BurgerButton/BurgerButton.module.scss @@ -1,10 +1,10 @@ .wrapper { - width: 44rem; + width: 44px; } .container { - width: 24rem; - height: 24rem; + width: 24px; + height: 24px; } .line { diff --git a/src/layouts/AppLayout/Header/BurgerButton/BurgerButton.tsx b/src/layouts/AppLayout/Header/BurgerButton/BurgerButton.tsx index 62a4d065..8695a8c3 100644 --- a/src/layouts/AppLayout/Header/BurgerButton/BurgerButton.tsx +++ b/src/layouts/AppLayout/Header/BurgerButton/BurgerButton.tsx @@ -25,7 +25,7 @@ const BurgerButton: React.FC = (props) => { return ( { - const { isMobile } = device.useData() + const { isDesktop } = device.useData() const { address, accountName, activeWallet } = useConfig() const addressOption = accountName || methods.shortenAddress(address) @@ -18,8 +18,8 @@ const useAccount = () => { return useMemo(() => ({ logo, - title: isMobile ? '' : addressOption, - }), [ addressOption, isMobile, logo ]) + title: !isDesktop ? '' : addressOption, + }), [ addressOption, isDesktop, logo ]) } diff --git a/src/layouts/AppLayout/Header/Connect/Connect.tsx b/src/layouts/AppLayout/Header/Connect/Connect.tsx index fe1de0e5..0be5298b 100644 --- a/src/layouts/AppLayout/Header/Connect/Connect.tsx +++ b/src/layouts/AppLayout/Header/Connect/Connect.tsx @@ -24,7 +24,7 @@ const networkSizes = { const Connect: React.FC = ({ className }) => { const { address, networkId, autoConnectChecked } = useConfig() - const { isMobile } = device.useData() + const { isDesktop } = device.useData() if (!autoConnectChecked) { const networkWidth = networkSizes[networkId] || networkSizes.mainnet @@ -35,14 +35,14 @@ const Connect: React.FC = ({ className }) => { supportedChains.length > 1 && ( ) }
@@ -57,7 +57,7 @@ const Connect: React.FC = ({ className }) => { ) : (