Merge remote-tracking branch 'origin/feat/update-swap-bridge' into tm…

…p/20240725
RabbyHub · Jul 26, 2024 · 04a34e7 · 04a34e7
2 parents 7068c57 + ea73684
commit 04a34e7
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 11 deletions.
diff --git a/src/ui/views/Bridge/Component/BridgeContent.tsx b/src/ui/views/Bridge/Component/BridgeContent.tsx
@@ -37,7 +37,7 @@ import stats from '@/stats';
 import { BestQuoteLoading } from '../../Swap/Component/loading';
 import { MaxButton } from '../../SendToken/components/MaxButton';
 
-const tipsClassName = clsx('text-r-neutral-body text-12 mb-4 pt-10');
+const tipsClassName = clsx('text-r-neutral-body text-12 mb-8 pt-14');
 
 const StyledInput = styled(Input)`
   height: 46px;

diff --git a/src/ui/views/Bridge/Component/BridgeHistory.tsx b/src/ui/views/Bridge/Component/BridgeHistory.tsx
@@ -110,7 +110,7 @@ const Transaction = forwardRef<HTMLDivElement, TransactionProps>(
     return (
       <div
         className={clsx(
-          'bg-r-neutral-card-2 rounded-[6px] p-12 relative text-12 text-r-neutral-body'
+          'bg-r-neutral-card-1 rounded-[6px] p-12 relative text-12 text-r-neutral-body'
         )}
         ref={ref}
       >
@@ -270,6 +270,7 @@ export const BridgeTxHistory = ({
       }}
       destroyOnClose
       isSupportDarkMode
+      isNew
     >
       <HistoryList />
     </Popup>

diff --git a/src/ui/views/Swap/Component/Header.tsx b/src/ui/views/Swap/Component/Header.tsx
@@ -35,7 +35,7 @@ export const Header = () => {
   return (
     <>
       <PageHeader
-        className="mx-[20px] pt-[20px] mb-[16px]"
+        className="mx-[20px] pt-[20px] mb-[14px]"
         forceShowBack
         rightSlot={
           <div className="flex items-center gap-20 absolute bottom-0 right-0">

diff --git a/src/ui/views/Swap/Component/History.tsx b/src/ui/views/Swap/Component/History.tsx
@@ -124,7 +124,7 @@ const Transaction = forwardRef<HTMLDivElement, TransactionProps>(
     return (
       <div
         className={clsx(
-          'bg-r-neutral-card-2 rounded-[6px] p-12 relative text-12 text-r-neutral-body'
+          'bg-r-neutral-card-1 rounded-[6px] p-12 relative text-12 text-r-neutral-body'
         )}
         ref={ref}
       >
@@ -294,6 +294,7 @@ export const SwapTxHistory = ({
       }}
       destroyOnClose
       isSupportDarkMode
+      isNew
     >
       <HistoryList />
     </Popup>

diff --git a/src/ui/views/Swap/Component/Main.tsx b/src/ui/views/Swap/Component/Main.tsx
@@ -30,7 +30,7 @@ import { BestQuoteLoading } from './loading';
 import { MaxButton } from '../../SendToken/components/MaxButton';
 import { ReserveGasPopup } from './ReserveGasPopup';
 
-const tipsClassName = clsx('text-r-neutral-body text-12 mb-4 pt-10');
+const tipsClassName = clsx('text-r-neutral-body text-12 mb-8 pt-14');
 
 const StyledInput = styled(Input)`
   height: 46px;
@@ -342,7 +342,7 @@ export const Main = () => {
     >
       <div
         className={clsx(
-          'bg-r-neutral-card-1 rounded-[6px] p-12 pt-0 pb-16 mx-20'
+          'bg-r-neutral-card-1 rounded-[6px] p-12 pt-0 pb-14 mx-20'
         )}
       >
         <div className={clsx(tipsClassName)}>{t('page.swap.chain')}</div>
@@ -472,8 +472,8 @@ export const Main = () => {
           !!activeProvider?.quote?.toTokenAmount &&
           payToken &&
           receiveToken && (
-            <div className="section text-13 leading-4 text-r-neutral-body mt-16 px-12">
-              <div className="subText flex flex-col gap-16">
+            <div className="section text-13 leading-4 text-r-neutral-body mt-14 px-12">
+              <div className="subText flex flex-col gap-14">
                 {isWrapToken ? (
                   <>
                     <div className="flex justify-between items-center">

diff --git a/src/ui/views/Swap/Component/ReceiveDetail.tsx b/src/ui/views/Swap/Component/ReceiveDetail.tsx
@@ -229,7 +229,7 @@ export const ReceiveDetails = (
         ) : null}
       </QuoteReceiveWrapper>
       {showLoss && (
-        <div className="px-12  leading-4 mt-16 text-13 text-r-neutral-body">
+        <div className="px-12  leading-4 mt-14 text-13 text-r-neutral-body">
           <div className="flex justify-between">
             <span>{t('page.swap.price-impact')}</span>
             <span

diff --git a/src/ui/views/Swap/Component/ReceiveWrapper.tsx b/src/ui/views/Swap/Component/ReceiveWrapper.tsx
@@ -2,7 +2,7 @@ import styled from 'styled-components';
 
 export const QuoteReceiveWrapper = styled.div`
   position: relative;
-  margin-top: 24px;
+  margin-top: 26px;
   border: 0.5px solid var(--r-blue-default, #7084ff);
   border-radius: 4px;
   cursor: pointer;

diff --git a/src/ui/views/Swap/Component/ReserveGasPopup.tsx b/src/ui/views/Swap/Component/ReserveGasPopup.tsx
@@ -73,7 +73,8 @@ const ReserveGasContent = (props: ReserveGasContentProps) => {
         new BigNumber(limit)
           .times(price)
           .div(10 ** decimals)
-          .toString()
+          .toString(),
+        6
       ),
     [limit, decimals]
   );