fix: aliasname bug

RabbyHub · Dec 2, 2024 · 753478d · 753478d
1 parent a6b1912
commit 753478d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git 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<Props> = ({
     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
@@ -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: {