diff --git a/mobile-app/app/screens/AppNavigator/screens/Portfolio/screens/AddressBookScreen.tsx b/mobile-app/app/screens/AppNavigator/screens/Portfolio/screens/AddressBookScreen.tsx
index 26541b96de..500b911fa8 100644
--- a/mobile-app/app/screens/AppNavigator/screens/Portfolio/screens/AddressBookScreen.tsx
+++ b/mobile-app/app/screens/AppNavigator/screens/Portfolio/screens/AddressBookScreen.tsx
@@ -73,7 +73,7 @@ export function AddressBookScreen({ route, navigation }: Props): JSX.Element {
const dispatch = useAppDispatch();
const logger = useLogger();
// condition to hide icon if not from send page
- const enableAddressSelect =
+ const isAddressSelectDisabled =
selectedAddress !== undefined && onAddressSelect !== undefined;
const userPreferencesFromStore = useSelector(
(state: RootState) => state.userPreferences,
@@ -233,13 +233,13 @@ export function AddressBookScreen({ route, navigation }: Props): JSX.Element {
})
.sort((curr, next) => {
if (
- enableAddressSelect &&
+ isAddressSelectDisabled &&
curr.addressDomainType === addressDomainType
) {
return -1;
}
if (
- enableAddressSelect &&
+ isAddressSelectDisabled &&
next.addressDomainType === addressDomainType
) {
return 1;
@@ -308,7 +308,7 @@ export function AddressBookScreen({ route, navigation }: Props): JSX.Element {
}): JSX.Element => {
const { item, index, testIDSuffix } = props;
const isDisabledToSelect =
- enableAddressSelect &&
+ isAddressSelectDisabled &&
activeButtonGroup === ButtonGroupTabKey.Whitelisted &&
(item as WhitelistedAddress).addressDomainType === addressDomainType &&
addressDomainType === DomainType.EVM; // disable address selection if its from the same EVM domain
@@ -365,7 +365,7 @@ export function AddressBookScreen({ route, navigation }: Props): JSX.Element {
await onFavouriteAddress(item as WhitelistedAddress)
}
testID={`address_row_star_${index}_${testIDSuffix}`}
- disabled={enableAddressSelect}
+ disabled={isAddressSelectDisabled}
>
{item.isFavourite ? (
{/* for EVM address */}
- {enableAddressSelect && (
+ {!isAddressSelectDisabled && (
{
onChangeAddress(item.address);
}}
- enableAddressSelect={enableAddressSelect}
+ isAddressSelectEnabled={false}
/>
{/* EVM address card */}
{isEvmFeatureEnabled && (
@@ -532,7 +532,7 @@ export function AddressBookScreen({ route, navigation }: Props): JSX.Element {
onClick={async () => {
onChangeAddress(item.evmAddress);
}}
- enableAddressSelect={enableAddressSelect}
+ isAddressSelectEnabled={false}
/>
)}
@@ -842,14 +842,14 @@ function YourAddressLink({
address,
isEvmAddress,
testIDSuffix,
- enableAddressSelect,
+ isAddressSelectEnabled,
}: {
disabled?: boolean;
onClick: () => Promise;
address: string;
isEvmAddress?: boolean;
testIDSuffix: string;
- enableAddressSelect: boolean;
+ isAddressSelectEnabled: boolean;
}) {
return (
{isEvmAddress && }
- {enableAddressSelect && (
+ {isAddressSelectEnabled && (