Merge remote-tracking branch 'origin/fix/bridge-show-more' into tmp/2…

…0241113
RabbyHub · Nov 13, 2024 · aca3cd3 · aca3cd3
2 parents 034e89e + feaf406
commit aca3cd3
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 7 deletions.
diff --git a/src/ui/utils/portfolio/project.ts b/src/ui/utils/portfolio/project.ts
@@ -320,6 +320,7 @@ export class DisplayedToken implements AbstractPortfolioToken {
   time_at: number;
   price_24h_change?: number | null;
   low_credit_score?: boolean;
+  raw_amount_hex_str?: string;
   _amountStr?: string;
   _priceStr?: string;
   _amountChange?: number;
@@ -359,6 +360,7 @@ export class DisplayedToken implements AbstractPortfolioToken {
     this.time_at = token.time_at;
     this.price_24h_change = token.price_24h_change;
     this.low_credit_score = token.low_credit_score;
+    this.raw_amount_hex_str = token.raw_amount_hex_str;
 
     // 默认是它
     this._usdValueChangeStr = '-';

diff --git a/src/ui/utils/token.ts b/src/ui/utils/token.ts
@@ -161,6 +161,7 @@ export const abstractTokenToTokenItem = (
     chain: token.chain,
     amount: token.amount,
     raw_amount: token.raw_amount,
+    raw_amount_hex_str: token.raw_amount_hex_str,
     decimals: token.decimals,
     display_symbol: token.display_symbol,
     is_core: token.is_core,

diff --git a/src/ui/views/Bridge/Component/BridgeContent.tsx b/src/ui/views/Bridge/Component/BridgeContent.tsx
@@ -354,6 +354,8 @@ export const BridgeContent = () => {
     quoteLoading ||
     !quoteList?.length;
 
+  const [showMoreOpen, setShowMoreOpen] = useState(false);
+
   return (
     <div
       className={clsx(
@@ -393,6 +395,8 @@ export const BridgeContent = () => {
       <div className="mx-20">
         {selectedBridgeQuote && (
           <BridgeShowMore
+            open={showMoreOpen}
+            setOpen={setShowMoreOpen}
             sourceName={selectedBridgeQuote?.aggregator.name || ''}
             sourceLogo={selectedBridgeQuote?.aggregator.logo_url || ''}
             slippage={slippageState}

diff --git a/src/ui/views/Bridge/Component/BridgeShowMore.tsx b/src/ui/views/Bridge/Component/BridgeShowMore.tsx
@@ -37,7 +37,11 @@ export const BridgeShowMore = ({
   isCustomSlippage,
   setAutoSlippage,
   setIsCustomSlippage,
+  open,
+  setOpen,
 }: {
+  open: boolean;
+  setOpen: Dispatch<SetStateAction<boolean>>;
   openQuotesList: () => void;
   sourceName: string;
   sourceLogo: string;
@@ -57,7 +61,6 @@ export const BridgeShowMore = ({
   setIsCustomSlippage: Dispatch<SetStateAction<boolean>>;
 }) => {
   const { t } = useTranslation();
-  const [show, setShow] = useState(false);
 
   const data = useMemo(
     () => tokenPriceImpact(fromToken, toToken, amount, toAmount),
@@ -66,7 +69,7 @@ export const BridgeShowMore = ({
 
   useEffect(() => {
     if ((!quoteLoading && data?.showLoss) || slippageError) {
-      setShow(true);
+      setOpen(true);
     }
   }, [quoteLoading, data?.showLoss]);
 
@@ -80,20 +83,20 @@ export const BridgeShowMore = ({
             'cursor-pointer',
             'text-r-neutral-foot text-12'
           )}
-          onClick={() => setShow((e) => !e)}
+          onClick={() => setOpen((e) => !e)}
         >
           <span>{t('page.bridge.showMore.title')}</span>
           <IconArrowDownCC
             viewBox="0 0 14 14"
             width={14}
             height={14}
-            className={clsx('transition-transform', show && 'rotate-180')}
+            className={clsx('transition-transform', open && 'rotate-180')}
           />
         </div>
         <div className={clsx(dottedClassName)} />
       </div>
 
-      <div className={clsx('overflow-hidden', !show && 'h-0')}>
+      <div className={clsx('overflow-hidden', !open && 'h-0')}>
         {data?.showLoss && !quoteLoading && (
           <div className="leading-4 mb-12 text-12 text-r-neutral-foot">
             <div className="flex justify-between">

diff --git a/src/ui/views/Bridge/hooks/token.tsx b/src/ui/views/Bridge/hooks/token.tsx
@@ -253,15 +253,14 @@ export const useBridge = () => {
     }
     if (!quote?.manualClick) {
       expiredTimer.current = setTimeout(() => {
-        // setRefreshId((e) => e + 1);
+        setRefreshId((e) => e + 1);
       }, 1000 * 30);
     }
     setOriSelectedBridgeQuote(quote);
   }, []);
 
   useEffect(() => {
     setQuotesList([]);
-    setSelectedBridgeQuote(undefined);
     setRecommendFromToken(undefined);
   }, [fromToken?.id, toToken?.id, fromChain, toChain, amount, inSufficient]);
 
@@ -484,6 +483,7 @@ export const useBridge = () => {
         }
       }
     }
+    setSelectedBridgeQuote(undefined);
   }, [
     inSufficient,
     aggregatorsList,