Merge remote-tracking branch 'origin/fix/ui-20240801' into tmp/20240731

RabbyHub · Aug 1, 2024 · 41776b2 · 41776b2
2 parents 52e74e4 + 0b0496a
commit 41776b2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/ui/views/Swap/Component/RabbyFeePopup.tsx b/src/ui/views/Swap/Component/RabbyFeePopup.tsx
@@ -91,14 +91,14 @@ export const RabbyFeePopup = ({
         <span>{t('page.swap.rabbyFee.wallet')}</span>
         <span>{t('page.swap.rabbyFee.rate')}</span>
       </div>
-      <div className="border-[0.5px] border-rabby-neutral-line rounded-[6px]">
+      <div className="border-[1px] border-rabby-neutral-line rounded-[6px]">
         {fee[type].map((item, idx, list) => (
           <div
             key={item.name}
             className={clsx(
               'flex justify-between items-center',
               'px-16 py-12',
-              'border-b-[0.5px] border-solid border-rabby-neutral-line',
+              'border-b-[1px] border-solid border-rabby-neutral-line',
               idx === list.length - 1 ? 'border-b-0' : ''
             )}
           >

diff --git a/src/ui/views/Swap/Component/ReserveGasPopup.tsx b/src/ui/views/Swap/Component/ReserveGasPopup.tsx
@@ -94,7 +94,7 @@ const ReserveGasContent = React.forwardRef<
 
   const checkIsInsufficient = useCallback(
     (price: number) => {
-      if (rawHexBalance !== undefined && rawHexBalance !== null) {
+      if (rawHexBalance === undefined || rawHexBalance === null) {
         return false;
       }
       return new BigNumber(rawHexBalance || 0, 16).lt(