Skip to content

Commit

Permalink
Recover perp tip (#463)
Browse files Browse the repository at this point in the history 
* recover orderly tip

* update tip height

* fix pool detail tvl cache bug

---------

Co-authored-by: nature.xie <[email protected]>
  • Loading branch information
@aidai524 @xieqiancaosissi
aidai524 and xieqiancaosissi authored Jan 4, 2024
1 parent a13a4b6 commit 461e4cb
Show file tree
Hide file tree
Showing 4 changed files with 52 additions and 52 deletions.
2 changes: 1 addition & 1 deletion src/pages/Orderly/OrderlyPerpetual.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ import { CheckBox } from './components/Common';
import { parseSymbol } from './components/RecentTrade';
import { NewUserTip } from './components/Common/NewUserTip';

export const REF_ORDERLY_PERP_TIP_SIG = 'REF_ORDERLY_PERP_TIP_SIGN3';
export const REF_ORDERLY_PERP_TIP_SIG = 'REF_ORDERLY_PERP_TIP_SIGN4';

function TradingBoard() {
const isLarge = useLargeScreen();
Expand Down
4 changes: 2 additions & 2 deletions src/pages/Orderly/OrderlyTradingBoard.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -265,13 +265,13 @@ function OrderlyTradingBoard() {
<>
<div className="mx-auto relative xs:bottom-6 bottom-9">
{/* todo */}
{!isMobile && <PerpOrderlyTip />}
{/* {!isMobile && <PerpOrderlyTip />} */}
{!isMobile && <TradingBoard></TradingBoard>}

{isMobile && <MobileTradingBoard></MobileTradingBoard>}
</div>
{/* todo */}
{isMobile && <PerpOrderlyTipMobile></PerpOrderlyTipMobile>}
{/* {isMobile && <PerpOrderlyTipMobile></PerpOrderlyTipMobile>} */}
</>
);
}
Expand Down
96 changes: 48 additions & 48 deletions src/pages/Orderly/components/PerpHeader/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,42 +17,42 @@ export function PerpOrderlyTip() {

return (
<div
className="w-screen px-10 xs:pb-7 h-12 xs:rounded-2xl lg:relative xs:bottom-0 bg-gradientFromHover frcc "
className="w-screen px-10 xs:pb-7 h-10 xs:rounded-2xl lg:relative xs:bottom-0 bg-gradientFromHover frcc "
style={{
fontSize: '13px',
color: '#111F29',
zIndex: isMobile ? 999999 : '',
}}
>
<FormattedMessage
// id="perpTip"
id="perpTipDown"
// defaultMessage={
// 'Welcome to Perpetual Futures trading!{br} Please read {perpTipLink} docs to get start!'
// }
id="perpTip"
// id="perpTipDown"
defaultMessage={
'Order book system update will be conducted from 2024/1/4 07:00 AM to 2024/1/4 09:00 AM (UTC), during which time Spot and Perps will be temporarily unavailable.'
'Welcome to Perpetual Futures trading!{br} Please read {perpTipLink} docs to get start!'
}
// values={{
// perpTipLink: (
// <a
// className="font-gothamBold mx-1 underline"
// rel="noopener noreferrer nofollow"
// target="_blank"
// href="https://docs.orderly.network/perpetual-futures/introduction"
// >
// {isMobile && <br />}
// <FormattedMessage
// id="perpTipLink"
// defaultMessage="[Perpetual-futures Introduction]"
// />
// </a>
// ),
// }}
// defaultMessage={
// 'Order book system update will be conducted from 2024/1/4 07:00 AM to 2024/1/4 09:00 AM (UTC), during which time Spot and Perps will be temporarily unavailable.'
// }
values={{
perpTipLink: (
<a
className="font-gothamBold mx-1 underline"
rel="noopener noreferrer nofollow"
target="_blank"
href="https://docs.orderly.network/perpetual-futures/introduction"
>
{isMobile && <br />}
<FormattedMessage
id="perpTipLink"
defaultMessage="[Perpetual-futures Introduction]"
/>
</a>
),
}}
/>

<div
className="absolute right-3 cursor-pointer top-1 "
className="absolute right-3 cursor-pointer top-2 "
onClick={() => {
setShow(false);
localStorage.setItem(REF_ORDERLY_PERP_TIP_SIG, '1');
Expand Down Expand Up @@ -88,35 +88,35 @@ export function PerpOrderlyTipMobile() {
}}
>
<FormattedMessage
// id="perpTip"
id="perpTipDown"
// defaultMessage={
// 'Welcome to Perpetual Futures trading! Please read {perpTipLink} docs to get start!'
// }
id="perpTip"
// id="perpTipDown"
defaultMessage={
'Order book system update will be conducted from 2024/1/4 07:00 AM to 2024/1/4 09:00 AM (UTC), during which time Spot and Perps will be temporarily unavailable.'
'Welcome to Perpetual Futures trading! Please read {perpTipLink} docs to get start!'
}
// values={{
// perpTipLink: (
// <a
// className="font-gothamBold mx-1 underline"
// rel="noopener noreferrer nofollow"
// target="_blank"
// href="https://docs.orderly.network/perpetual-futures/introduction"
// >
// {/* {isMobile && <br />} */}
// <FormattedMessage
// id="perpTipLink"
// defaultMessage="[Perpetual-futures Introduction]"
// />
// </a>
// ),
// br: <br />,
// }}
// defaultMessage={
// 'Order book system update will be conducted from 2024/1/4 07:00 AM to 2024/1/4 09:00 AM (UTC), during which time Spot and Perps will be temporarily unavailable.'
// }
values={{
perpTipLink: (
<a
className="font-gothamBold mx-1 underline"
rel="noopener noreferrer nofollow"
target="_blank"
href="https://docs.orderly.network/perpetual-futures/introduction"
>
{/* {isMobile && <br />} */}
<FormattedMessage
id="perpTipLink"
defaultMessage="[Perpetual-futures Introduction]"
/>
</a>
),
br: <br />,
}}
/>

<div
className="absolute right-3 top-1 "
className="absolute right-3 top-2 "
onClick={() => {
setShow(false);
localStorage.setItem(REF_ORDERLY_PERP_TIP_SIG, '1');
Expand Down
2 changes: 1 addition & 1 deletion src/pages/pools/LiquidityPage/LiquidityPage.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ function PoolRow({
onClick={() => localStorage.setItem('fromMorePools', 'n')}
to={{
pathname: `/pool/${pool.id}`,
state: { tvl: pool.tvl, backToFarms: supportFarm },
// state: { tvl: pool.tvl, backToFarms: supportFarm },
}}
style={{
height: '70px',
Expand Down

0 comments on commit 461e4cb

Please sign in to comment.