tweak discover styles & update swftc customer service link (#3693)

* feat: tweak discover styles * feat: update swftc supported url
OneKeyHQ · Oct 23, 2023 · 4cbe1d2 · 4cbe1d2
1 parent 7dd32e8
commit 4cbe1d2
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 11 deletions.
diff --git a/packages/kit/assets/discover/header_bg_light.png b/packages/kit/assets/discover/header_bg_light.png
diff --git a/packages/kit/src/views/Discover/Home/DappRenderLayout/index.tsx b/packages/kit/src/views/Discover/Home/DappRenderLayout/index.tsx
@@ -10,7 +10,7 @@ import {
 
 import { chunk, debounce } from 'lodash';
 
-import { Box, Stack, useIsVerticalLayout } from '@onekeyhq/components';
+import { Box, Stack, VStack, useIsVerticalLayout } from '@onekeyhq/components';
 
 import type { LayoutChangeEvent } from 'react-native';
 
@@ -71,7 +71,6 @@ export const DappItemPlainLayout: FC = ({ children }) => {
       minW={`${Min}px`}
       maxW={`${Max}px`}
       width={width ? `${width}px` : undefined}
-      mb={width ? '4' : undefined}
     >
       {children}
     </Box>
@@ -131,13 +130,13 @@ const DappItemPlainContainerDynamicLayout: FC<
     }
     const data = chunk(Children.toArray(children), state.num);
     return (
-      <Box>
+      <Stack direction="column" space="4">
         {data.map((o, index) => (
           <Stack key={index} direction="row" space={space} w="full">
             {o}
           </Stack>
         ))}
-      </Box>
+      </Stack>
     );
   }, [state, space, children]);
   return (

diff --git a/packages/kit/src/views/Discover/Home/Desktop/header.tsx b/packages/kit/src/views/Discover/Home/Desktop/header.tsx
@@ -11,8 +11,10 @@ import {
   Input,
   Pressable,
   Typography,
+  useTheme,
 } from '@onekeyhq/components';
 import PNG from '@onekeyhq/kit/assets/discover/header_bg.png';
+import PNGLight from '@onekeyhq/kit/assets/discover/header_bg_light.png';
 
 import { gotoSite, openMatchDApp } from '../../Explorer/Controller/gotoSite';
 import SearchView from '../../Explorer/Search/SearchView';
@@ -143,6 +145,7 @@ const SearchInput: FC = () => {
 
 export const Header = () => {
   const intl = useIntl();
+  const { isLight } = useTheme();
   return (
     <Box pb="8" px="4">
       <Box
@@ -152,9 +155,13 @@ export const Header = () => {
         overflow="hidden"
         position="relative"
       >
-        <Image source={PNG} w="full" h="full" />
+        <Image source={isLight ? PNGLight : PNG} w="full" h="full" />
         <Center position="absolute" w="full" h="full">
-          <Typography.PageHeading color="#fff" fontSize={36} lineHeight={50}>
+          <Typography.PageHeading
+            color="text-default"
+            fontSize={36}
+            lineHeight={50}
+          >
             {intl.formatMessage({ id: 'title__discover_dapps' })}
           </Typography.PageHeading>
           <Box w="4/5" mt="6">

diff --git a/packages/kit/src/views/Discover/Home/Desktop/index.tsx b/packages/kit/src/views/Discover/Home/Desktop/index.tsx
@@ -1,4 +1,4 @@
-import { useCallback, useRef } from 'react';
+import { useCallback, useMemo, useRef } from 'react';
 
 import type { ForwardRefHandle } from '@onekeyhq/app/src/views/NestedTabView/NestedTabView';
 import { Box } from '@onekeyhq/components';
@@ -17,6 +17,7 @@ export const Desktop = () => {
   const onScroll = useCallback(() => {
     discoverUIEventBus.emit('scroll');
   }, []);
+  const containerStyle = useMemo(() => ({ flex: 1 }), []);
   return (
     <Box
       flex="1"
@@ -33,6 +34,7 @@ export const Desktop = () => {
           headerView={<Header />}
           ref={ref}
           onScroll={onScroll}
+          containerStyle={containerStyle}
         >
           {tabConfig.map((tab) => (
             <Tabs.Tab key={tab.name} name={tab.name} label={tab.label}>

diff --git a/packages/kit/src/views/Discover/Home/TabFeatured/index.tsx b/packages/kit/src/views/Discover/Home/TabFeatured/index.tsx
@@ -6,6 +6,7 @@ import {
   Box,
   Icon,
   Pressable,
+  Stack,
   Typography,
   useIsVerticalLayout,
 } from '@onekeyhq/components';
@@ -111,7 +112,7 @@ const HorizontalContent: FC<ContentProps> = ({ data }) => {
     return null;
   }
   return (
-    <Box pb="4">
+    <Box>
       <Box px="4">
         <ContentHeader title={data.label} id={data.id} />
       </Box>
@@ -214,15 +215,15 @@ const SectionFeaturedContent = () => {
   return (
     <Box w="full" pb="2">
       <BannerContent />
-      <Box>
+      <Stack direction="column" space="2">
         {groupDapps.map((item, index) =>
           index % 2 === 0 ? (
             <VerticalContent key={item.label} data={item} />
           ) : (
             <HorizontalContent key={item.label} data={item} />
           ),
         )}
-      </Box>
+      </Stack>
       <TagContent />
     </Box>
   );

diff --git a/packages/kit/src/views/Swap/config.ts b/packages/kit/src/views/Swap/config.ts
@@ -6,7 +6,7 @@ import type { Token } from '../../store/typings';
 import type { Provider } from './typings';
 
 export const swftcCustomerSupportUrl =
-  'https://www.bangwo8.com/osp2016/im/pc/index.php?vendorID=782460&uid=&customSource=onekey';
+  'https://tawk.to/chat/6520bf666fcfe87d54b751ef/1hc3unaha';
 
 export const zeroXenabledNetworkIds: string[] = [
   OnekeyNetwork.eth,