Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 4 additions & 0 deletions src/ui/assets/perps/IconTitleSelectDark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 3 additions & 1 deletion src/ui/style/antd-overwrite.less
Original file line number Diff line number Diff line change
Expand Up @@ -569,18 +569,20 @@ textarea {
}
}

.perps-edit-tp-sl-modal,
.perps-close-all-position-modal {
.ant-modal-content {
border-radius: 16px;
}

.ant-modal-body {
border-radius: 16px;
border-radius: 12px;
}

.ant-modal-confirm-content {
margin-top: 0;
}

}


Expand Down
2 changes: 1 addition & 1 deletion src/ui/views/Perps/components/AssetMetaItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export const AssetItem: React.FC<{
return (
<div
className="
bg-rb-neutral-bg-1
bg-r-neutral-card-1
flex items-center justify-between cursor-pointer
hover:bg-r-blue-light-1 px-16 py-12
rounded-[8px]
Expand Down
16 changes: 13 additions & 3 deletions src/ui/views/Perps/components/EditTpSlTag.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import { formatTpOrSlPrice, validatePriceInput } from '../utils';
import { AssetPriceInfo } from './AssetPriceInfo';
import { MarketData } from '@/ui/models/perps';
import { WsActiveAssetCtx } from '@rabby-wallet/hyperliquid-sdk';
import { useThemeMode } from '@/ui/hooks/usePreference';
interface EditTpSlTagProps {
coin: string;
entryPrice?: number;
Expand Down Expand Up @@ -53,6 +54,7 @@ export const EditTpSlTag: React.FC<EditTpSlTagProps> = ({
const { t } = useTranslation();
const [modalVisible, setModalVisible] = React.useState(false);
const [autoClosePrice, setAutoClosePrice] = React.useState<string>('');
const { isDarkTheme } = useThemeMode();
const [inputFocused, setInputFocused] = React.useState(false);
const [loading, setLoading] = React.useState(false);
const inputRef = React.useRef<any>(null);
Expand Down Expand Up @@ -287,14 +289,22 @@ export const EditTpSlTag: React.FC<EditTpSlTagProps> = ({
onCancel={() => !loading && setModalVisible(false)}
width={352}
footer={null}
className={clsx('is-support-darkmode')}
className={clsx(
'perps-bridge-swap-modal perps-edit-tp-sl-modal',
isDarkTheme
? 'perps-bridge-swap-modal-dark'
: 'perps-bridge-swap-modal-light'
)}
centered
bodyStyle={{
background: 'var(--r-neutral-card-2, #F5F6FA)',
}}
destroyOnClose
closeIcon={
<RcIconClose className="w-20 h-20 text-r-neutral-secondary" />
<RcIconClose className="w-20 h-20 text-rb-neutral-secondary" />
}
>
<div className="flex flex-col items-center bg-r-neutral-card-2">
<div className="flex flex-col items-center">
{/* Header */}
<div className="mb-20 text-center">
<div className="text-20 font-medium text-r-neutral-title-1 mb-4">
Expand Down
7 changes: 5 additions & 2 deletions src/ui/views/Perps/screen/SingleCoin.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ import { getPerpsSDK } from '../sdkManager';
import { useMemoizedFn } from 'ahooks';
import { ReactComponent as RcIconInfo } from 'ui/assets/info-cc.svg';
import { ReactComponent as RcIconEdit } from 'ui/assets/perps/IconEditCC.svg';
import { ReactComponent as RcIconTitleSelectCC } from 'ui/assets/perps/IconTitleSelectCC.svg';
import { ReactComponent as RcIconTitleSelect } from 'ui/assets/perps/IconTitleSelect.svg';
import { ReactComponent as RcIconTitleSelectDark } from 'ui/assets/perps/IconTitleSelectDark.svg';
import { EditMarginPopup } from '../popup/EditMarginPopup';
import { RiskLevelPopup } from '../popup/RiskLevelPopup';
import {
Expand Down Expand Up @@ -42,6 +43,7 @@ import ThemeIcon from '@/ui/component/ThemeMode/ThemeIcon';
import { SearchPerpsPopup } from '../popup/SearchPerpsPopup';
import DistanceToLiquidationTag from '../components/DistanceToLiquidationTag';
import { EditTpSlTag } from '../components/EditTpSlTag';
import { useThemeMode } from '@/ui/hooks/usePreference';

export const formatPercent = (value: number, decimals = 8) => {
return `${(value * 100).toFixed(decimals)}%`;
Expand All @@ -51,6 +53,7 @@ export const PerpsSingleCoin = () => {
const { coin: _coin } = useParams<{ coin: string }>();
const history = useHistory();
const { t } = useTranslation();
const { isDarkTheme } = useThemeMode();
const dispatch = useRabbyDispatch();
const {
positionAndOpenOrders,
Expand Down Expand Up @@ -381,7 +384,7 @@ export const PerpsSingleCoin = () => {
</span>
<ThemeIcon
className="icon text-r-neutral-title-1"
src={RcIconTitleSelectCC}
src={isDarkTheme ? RcIconTitleSelectDark : RcIconTitleSelect}
/>
</div>
</div>
Expand Down
Loading