fix: fix the issue where data does not update after entering the stak…

…ing history details page. (#6368)
OneKeyHQ · Dec 18, 2024 · bda3c03 · bda3c03
1 parent 650f508
commit bda3c03
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 13 deletions.
diff --git a/packages/kit-bg/src/vaults/impls/ltc/settings.ts b/packages/kit-bg/src/vaults/impls/ltc/settings.ts
@@ -52,9 +52,7 @@ const accountDeriveInfo: IAccountDeriveInfoMapLtc = {
     coinType: COINTYPE_LTC,
     coinName: COINNAME_LTC,
     label: 'Legacy',
-    desc: `${appLocale.intl.formatMessage({
-      id: ETranslations.litecoin_legacy_desc,
-    })} BIP44, P2PKH, Base58`,
+    desc: ETranslations.litecoin_legacy_desc,
     addressEncoding: EAddressEncodings.P2PKH,
   },
 };

diff --git a/packages/kit/src/views/AssetDetails/pages/HistoryDetails/HistoryDetails.tsx b/packages/kit/src/views/AssetDetails/pages/HistoryDetails/HistoryDetails.tsx
@@ -402,7 +402,8 @@ function HistoryDetails() {
       overrideIsFocused: (isPageFocused) =>
         isPageFocused &&
         (!historyInit.current ||
-          (historyTxParam?.decodedTx.status === EDecodedTxStatus.Pending &&
+          ((historyTxParam?.decodedTx.status ?? EDecodedTxStatus.Pending) ===
+            EDecodedTxStatus.Pending &&
             !historyConfirmed.current)),
     },
   );

diff --git a/packages/kit/src/views/Market/components/MarketMore.tsx b/packages/kit/src/views/Market/components/MarketMore.tsx
@@ -44,21 +44,22 @@ function BasicMarketMore({
             },
           ] as IActionListItemProps[],
         },
-        isSupportBuy && show
+        show
           ? {
               items: [
                 {
                   icon: 'MinusLargeSolid',
                   label: intl.formatMessage({ id: ETranslations.global_sell }),
                   onPress: tradeActions.onSell,
+                  disabled: !isSupportBuy,
                 },
               ] as IActionListItemProps[],
             }
           : undefined,
       ].filter(Boolean),
     [MoveToTop, intl, isSupportBuy, show, showMoreAction, tradeActions.onSell],
   );
-  return sections.length ? (
+  return (
     <ActionList
       title=""
       renderTrigger={
@@ -67,13 +68,12 @@ function BasicMarketMore({
           icon="DotVerSolid"
           variant="tertiary"
           iconSize="$5"
+          disabled={sections.length === 0}
           {...props}
         />
       }
       sections={sections}
     />
-  ) : (
-    <Stack w="$5" />
   );
 }
 

diff --git a/packages/kit/src/views/Market/components/TokenPriceChart.tsx b/packages/kit/src/views/Market/components/TokenPriceChart.tsx
@@ -137,10 +137,14 @@ const useHeight = () => {
 
   const tabHeight = useTabBarHeight();
   const fixedHeight = useMemo(() => {
-    if (platformEnv.isNative) {
+    if (platformEnv.isNativeIOS) {
       return 268;
     }
 
+    if (platformEnv.isNativeAndroid) {
+      return 258;
+    }
+
     return 300;
   }, []);
   return useMemo(

diff --git a/packages/kit/src/views/Staking/components/ProtocolDetails/AlertSection.tsx b/packages/kit/src/views/Staking/components/ProtocolDetails/AlertSection.tsx
@@ -8,6 +8,7 @@ export function AlertSection({ alerts = [] }: { alerts?: string[] }) {
       bg="$bgSubdued"
       borderColor="$borderSubdued"
       borderWidth={StyleSheet.hairlineWidth}
+      borderRadius="$3"
       py="$3.5"
       px="$4"
     >

diff --git a/packages/kit/src/views/Staking/components/ProtocolDetails/StakedValueSection.tsx b/packages/kit/src/views/Staking/components/ProtocolDetails/StakedValueSection.tsx
@@ -6,7 +6,6 @@ import {
   Button,
   Divider,
   NumberSizeableText,
-  Progress,
   SizableText,
   XStack,
   YStack,
@@ -16,6 +15,8 @@ import { useSettingsPersistAtom } from '@onekeyhq/kit-bg/src/states/jotai/atoms'
 import { ETranslations } from '@onekeyhq/shared/src/locale';
 import type { IStakeProtocolDetails } from '@onekeyhq/shared/types/staking';
 
+import { AlertSection } from './AlertSection';
+
 type IStakedValueInfoProps = {
   value: number;
   stakedNumber: number;
@@ -85,10 +86,12 @@ export const StakedValueSection = ({
   details,
   stakeButtonProps,
   withdrawButtonProps,
+  alerts = [],
 }: {
   details?: IStakeProtocolDetails;
   stakeButtonProps?: ComponentProps<typeof Button>;
   withdrawButtonProps?: ComponentProps<typeof Button>;
+  alerts?: string[];
 }) => {
   if (!details) {
     return null;
@@ -106,7 +109,7 @@ export const StakedValueSection = ({
         stakeButtonProps={stakeButtonProps}
         withdrawButtonProps={withdrawButtonProps}
       />
-
+      <AlertSection alerts={alerts} />
       <Divider />
     </>
   );

diff --git a/packages/kit/src/views/Staking/pages/ProtocolDetails/index.tsx b/packages/kit/src/views/Staking/pages/ProtocolDetails/index.tsx
@@ -28,7 +28,6 @@ import {
   isLoadingState,
 } from '../../components/PageFrame';
 import { ProtocolDetails } from '../../components/ProtocolDetails';
-import { AlertSection } from '../../components/ProtocolDetails/AlertSection';
 import { NoAddressWarning } from '../../components/ProtocolDetails/NoAddressWarning';
 import { PortfolioSection } from '../../components/ProtocolDetails/PortfolioSection';
 import { StakedValueSection } from '../../components/ProtocolDetails/StakedValueSection';
@@ -295,8 +294,8 @@ const ProtocolDetailsPage = () => {
                   details={result}
                   stakeButtonProps={stakeButtonProps}
                   withdrawButtonProps={withdrawButtonProps}
+                  alerts={result?.provider.alerts}
                 />
-                <AlertSection alerts={result?.provider.alerts} />
                 <PortfolioSection
                   details={result}
                   onClaim={onClaim}