From 753478dc052f91317d71a0017b16d71d0822c384 Mon Sep 17 00:00:00 2001 From: heisenberg Date: Mon, 2 Dec 2024 16:22:01 +0800 Subject: [PATCH] fix: aliasname bug --- .../src/screens/Address/AddressListScreenButton.tsx | 3 +-- .../src/screens/Address/ImportSuccessScreen2024.tsx | 11 +++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/apps/mobile/src/screens/Address/AddressListScreenButton.tsx b/apps/mobile/src/screens/Address/AddressListScreenButton.tsx index d26fabe23..39b294135 100644 --- a/apps/mobile/src/screens/Address/AddressListScreenButton.tsx +++ b/apps/mobile/src/screens/Address/AddressListScreenButton.tsx @@ -42,8 +42,7 @@ export const AddressListScreenButton: React.FC = ({ disableAutoFetch: true, }); const maxHeight = Dimensions.get('window').height - 104; - const contentHeight = - accounts.length * (94 + 12) + (IS_ANDROID ? 60 + 56 : 0); + const contentHeight = accounts.length * (94 + 12) + 60 + 56; const onPress = React.useCallback(() => { const id = createGlobalBottomSheetModal2024({ diff --git a/apps/mobile/src/screens/Address/ImportSuccessScreen2024.tsx b/apps/mobile/src/screens/Address/ImportSuccessScreen2024.tsx index 1287e2a6f..60971214d 100644 --- a/apps/mobile/src/screens/Address/ImportSuccessScreen2024.tsx +++ b/apps/mobile/src/screens/Address/ImportSuccessScreen2024.tsx @@ -95,13 +95,17 @@ export const ImportSuccessScreen2024 = () => { disableAutoFetch: true, }); - const handleDone = React.useCallback(() => { + const saveFirstAddressAlias = React.useCallback(() => { importAddresses.forEach(item => { contactService.setAlias({ address: item.address, alias: item.aliasName || ellipsisAddress(item.address), // for empty inputText }); }); + }, [importAddresses]); + + const handleDone = React.useCallback(() => { + saveFirstAddressAlias(); Keyboard.dismiss(); navigation.reset({ @@ -115,7 +119,7 @@ export const ImportSuccessScreen2024 = () => { }, ], }); - }, [importAddresses, navigation]); + }, [navigation, saveFirstAddressAlias]); const isFocus = useIsFocused(); @@ -189,6 +193,9 @@ export const ImportSuccessScreen2024 = () => { if (modalRef.current) { return; } + + saveFirstAddressAlias(); + modalRef.current = createGlobalBottomSheetModal2024({ name: MODAL_NAMES.IMPORT_MORE_ADDRESS, params: {