diff --git a/apps/mobile/src/components2024/AddressQuickManager/AddressQuickManager.tsx b/apps/mobile/src/components2024/AddressQuickManager/AddressQuickManager.tsx index 958eb31a9..cff42325b 100644 --- a/apps/mobile/src/components2024/AddressQuickManager/AddressQuickManager.tsx +++ b/apps/mobile/src/components2024/AddressQuickManager/AddressQuickManager.tsx @@ -1,6 +1,6 @@ import { useAccounts } from '@/hooks/account'; import React from 'react'; -import { Dimensions, FlatList, TouchableOpacity, View } from 'react-native'; +import { TouchableOpacity, View } from 'react-native'; import { useTheme2024 } from '@/hooks/theme'; import { createGetStyles2024 } from '@/utils/styles'; import { AddressItemInner2024 } from '@/screens/Address/components/AddressItemInner2024'; @@ -114,7 +114,6 @@ export const AddressQuickManager: React.FC = ({ type, onCancel }) => { const getStyle = createGetStyles2024(({ colors2024 }) => ({ list: { padding: 16, - maxHeight: Dimensions.get('window').height, marginBottom: 56, }, addressItem: { diff --git a/apps/mobile/src/screens/Address/AddressListScreenButton.tsx b/apps/mobile/src/screens/Address/AddressListScreenButton.tsx index 1a98536cc..d26fabe23 100644 --- a/apps/mobile/src/screens/Address/AddressListScreenButton.tsx +++ b/apps/mobile/src/screens/Address/AddressListScreenButton.tsx @@ -3,6 +3,8 @@ import { removeGlobalBottomSheetModal2024, } from '@/components2024/GlobalBottomSheetModal'; import { MODAL_NAMES } from '@/components2024/GlobalBottomSheetModal/types'; +import { IS_ANDROID } from '@/core/native/utils'; +import { useAccounts } from '@/hooks/account'; import { useTheme2024 } from '@/hooks/theme'; import { createGetStyles2024 } from '@/utils/styles'; import React from 'react'; @@ -36,19 +38,25 @@ export const AddressListScreenButton: React.FC = ({ type = 'address', }) => { const { styles } = useTheme2024({ getStyle }); + const { accounts } = useAccounts({ + disableAutoFetch: true, + }); + const maxHeight = Dimensions.get('window').height - 104; + const contentHeight = + accounts.length * (94 + 12) + (IS_ANDROID ? 60 + 56 : 0); + const onPress = React.useCallback(() => { const id = createGlobalBottomSheetModal2024({ name: MODAL_NAMES.ADDRESS_QUICK_MANAGER, bottomSheetModalProps: { - enableDynamicSizing: true, - maxDynamicContentSize: Dimensions.get('window').height - 104, + snapPoints: [Math.min(contentHeight, maxHeight)], }, type, onCancel: () => { removeGlobalBottomSheetModal2024(id); }, }); - }, [type]); + }, [contentHeight, maxHeight, type]); return (