Merge branch 'feat/receive-ui' into tmp/20241216

RabbyHub · Dec 17, 2024 · 12bb94d · 12bb94d
2 parents f760748 + 1ac1de8
commit 12bb94d
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 21 deletions.
diff --git a/apps/mobile/src/components2024/SelectSortedChain/SelectSortedChain.tsx b/apps/mobile/src/components2024/SelectSortedChain/SelectSortedChain.tsx
@@ -22,6 +22,7 @@ import { RcIconAddCircle } from '@/assets/icons/address';
 import { RootNames } from '@/constant/layout';
 import { navigate } from '@/utils/navigation';
 import { createGetStyles2024 } from '@/utils/styles';
+import { BottomSheetHandlableView } from '@/components/customized/BottomSheetHandle';
 
 const RcIconNotFind = makeThemeIconFromCC(RcIconNotFindCC, 'neutral-foot');
 const RcIconSearch = makeThemeIconFromCC(RcIconSearchCC, 'neutral-foot');
@@ -144,26 +145,28 @@ export default function SelectSortedChain({
 
   return (
     <AutoLockView style={styles.container}>
-      {titleText && <Text style={styles.titleText}>{titleText}</Text>}
-      {isShowTestnet && !hideMainnetTab ? (
-        <NetSwitchTabs
-          value={selectedTab}
-          onTabChange={onTabChange}
-          style={styles.netSwitchTabs}
+      <BottomSheetHandlableView>
+        {titleText && <Text style={styles.titleText}>{titleText}</Text>}
+        {isShowTestnet && !hideMainnetTab ? (
+          <NetSwitchTabs
+            value={selectedTab}
+            onTabChange={onTabChange}
+            style={styles.netSwitchTabs}
+          />
+        ) : null}
+        <Input
+          leftIcon={<RcIconSearch color={colors2024['neutral-foot']} />}
+          containerStyle={[styles.containerOfInput, styles.innerBlock]}
+          inputContainerStyle={styles.inputContainerStyle}
+          style={styles.inputText}
+          placeholderTextColor={colors2024['neutral-info']}
+          placeholder="Search chain"
+          value={search}
+          onChangeText={text => {
+            setSearch(text);
+          }}
         />
-      ) : null}
-      <Input
-        leftIcon={<RcIconSearch color={colors2024['neutral-foot']} />}
-        containerStyle={[styles.containerOfInput, styles.innerBlock]}
-        inputContainerStyle={styles.inputContainerStyle}
-        style={styles.inputText}
-        placeholderTextColor={colors2024['neutral-info']}
-        placeholder="Search chain"
-        value={search}
-        onChangeText={text => {
-          setSearch(text);
-        }}
-      />
+      </BottomSheetHandlableView>
 
       {matteredList.length === 0 && unmatteredList.length === 0 ? (
         <View style={[styles.chainListWrapper, styles.emptyDataWrapper]}>
@@ -261,6 +264,8 @@ const getStyle = createGetStyles2024(({ colors2024 }) => ({
     marginLeft: 7,
     fontSize: 17,
     fontWeight: '400',
+    paddingTop: 0,
+    paddingBottom: 0,
     fontFamily: 'SF Pro Rounded',
   },
 

diff --git a/apps/mobile/src/screens/Address/ReceiveAddressListScreen.tsx b/apps/mobile/src/screens/Address/ReceiveAddressListScreen.tsx
@@ -34,7 +34,7 @@ export function ReceiveAddressListScreen(): JSX.Element {
     const id = createGlobalBottomSheetModal2024({
       name: MODAL_NAMES.SELECT_SORTED_CHAIN,
       bottomSheetModalProps: {
-        enableContentPanningGesture: true,
+        enableContentPanningGesture: false,
         enablePanDownToClose: true,
       },
       titleText: t('page.receiveAddressList.selectChainTitle'),

diff --git a/apps/mobile/src/screens/Home/components/HomeTopArea.tsx b/apps/mobile/src/screens/Home/components/HomeTopArea.tsx
@@ -225,7 +225,7 @@ export const HomeTopArea = () => {
           name: MODAL_NAMES.SELECT_SORTED_CHAIN,
           titleText: t('page.receiveAddressList.selectChainTitle'),
           bottomSheetModalProps: {
-            enableContentPanningGesture: true,
+            enableContentPanningGesture: false,
             enablePanDownToClose: true,
           },
           onChange: (v: CHAINS_ENUM) => {