diff --git a/src/ui/utils/portfolio/project.ts b/src/ui/utils/portfolio/project.ts
index f5001bdb044..d9289debabb 100644
--- 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
index 5654bb16ddd..f5a619a61b3 100644
--- 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
index d2db4039161..bc235322366 100644
--- 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 (
{
{selectedBridgeQuote && (
>;
openQuotesList: () => void;
sourceName: string;
sourceLogo: string;
@@ -57,7 +61,6 @@ export const BridgeShowMore = ({
setIsCustomSlippage: Dispatch>;
}) => {
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)}
>
{t('page.bridge.showMore.title')}
-
+
{data?.showLoss && !quoteLoading && (
diff --git a/src/ui/views/Bridge/hooks/token.tsx b/src/ui/views/Bridge/hooks/token.tsx
index 095d55a983c..0baebb4b9fc 100644
--- a/src/ui/views/Bridge/hooks/token.tsx
+++ b/src/ui/views/Bridge/hooks/token.tsx
@@ -253,7 +253,7 @@ export const useBridge = () => {
}
if (!quote?.manualClick) {
expiredTimer.current = setTimeout(() => {
- // setRefreshId((e) => e + 1);
+ setRefreshId((e) => e + 1);
}, 1000 * 30);
}
setOriSelectedBridgeQuote(quote);
@@ -261,7 +261,6 @@ export const useBridge = () => {
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,