fix: some tab issues on android (#5888)

OneKeyHQ · Sep 21, 2024 · dfc9e5c · dfc9e5c
1 parent 5def256
commit dfc9e5c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/packages/components/src/layouts/TabView/StickyTabComponent/index.native.tsx b/packages/components/src/layouts/TabView/StickyTabComponent/index.native.tsx
@@ -26,7 +26,7 @@ export const TabComponent = (
     tabContentContainerStyle,
     style,
     onRefresh: onRefreshCallBack,
-    initialHeaderHeight = 250,
+    initialHeaderHeight = 220,
   }: ITabProps,
   // fix missing forwardRef warnings.
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -172,14 +172,22 @@ export const TabComponent = (
   );
 
   const onIndexChange = useCallback(() => {}, []);
-  const onLayout = useCallback(({ nativeEvent }: LayoutChangeEvent) => {
-    setHeaderHeight(nativeEvent.layout.height);
-  }, []);
+  const onLayout = useCallback(
+    ({ nativeEvent }: LayoutChangeEvent) => {
+      if (nativeEvent.layout.height === headerHeight) {
+        return;
+      }
+      setHeaderHeight(nativeEvent.layout.height);
+    },
+    [headerHeight],
+  );
   return (
     // @ts-expect-error
     <NestedTabView
       key={key}
-      headerHeight={headerHeight}
+      headerHeight={
+        platformEnv.isNativeAndroid ? initialHeaderHeight : headerHeight
+      }
       defaultIndex={initialScrollIndex}
       style={nestedTabViewStyle}
       stickyTabBar

diff --git a/packages/kit/src/components/TokenListView/index.tsx b/packages/kit/src/components/TokenListView/index.tsx
@@ -137,8 +137,7 @@ function TokenListView(props: IProps) {
   if (
     (isTokenSelector && tokenSelectorSearchTokenState.isSearching) ||
     (!isTokenSelector && searchTokenState.isSearching) ||
-    (!tokenListState.initialized && tokenListState.isRefreshing) ||
-    (platformEnv.isNativeAndroid && isInRequest)
+    (!tokenListState.initialized && tokenListState.isRefreshing)
   ) {
     return (
       <NestedScrollView style={{ flex: 1 }}>