From b8410018d821a72d581799e45f33d3bcbb284108 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Vytick=20Vytrhl=C3=ADk?= <vytick@gmail.com>
Date: Fri, 7 Feb 2025 23:17:56 +0100
Subject: [PATCH] fixup! feat(suite-native): use crypto icon with network

---
 .../AccountsList/AccountsListItem.tsx         |  2 +-
 .../components/AccountDetailScreenHeader.tsx  | 33 ++++++++++++-------
 .../src/components/CoinPriceCard.tsx          |  2 +-
 .../src/components/TransactionListHeader.tsx  |  2 +-
 .../TransactionDetailAddressesSection.tsx     |  1 -
 5 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/suite-native/accounts/src/components/AccountsList/AccountsListItem.tsx b/suite-native/accounts/src/components/AccountsList/AccountsListItem.tsx
index b1af487c4a7..7449257d763 100644
--- a/suite-native/accounts/src/components/AccountsList/AccountsListItem.tsx
+++ b/suite-native/accounts/src/components/AccountsList/AccountsListItem.tsx
@@ -88,7 +88,7 @@ export const AccountsListItem = ({
     const icon = useMemo(
         () =>
             isNativeCoinOnly ? (
-                <CryptoIconWithNetwork symbol={account.symbol} preferNetworkSymbol={false} />
+                <CryptoIconWithNetwork symbol={account.symbol} />
             ) : (
                 <RoundedIcon symbol={account.symbol} />
             ),
diff --git a/suite-native/module-accounts-management/src/components/AccountDetailScreenHeader.tsx b/suite-native/module-accounts-management/src/components/AccountDetailScreenHeader.tsx
index d0e5717a7eb..ac7b8bc942d 100644
--- a/suite-native/module-accounts-management/src/components/AccountDetailScreenHeader.tsx
+++ b/suite-native/module-accounts-management/src/components/AccountDetailScreenHeader.tsx
@@ -25,6 +25,24 @@ type AccountDetailNavigationProps = StackToStackCompositeNavigationProps<
     RootStackParamList
 >;
 
+const AccountDetailScreenHeaderContent = ({
+    accountLabel,
+    accountKey,
+}: AccountDetailScreenHeaderProps) => {
+    const symbol = useSelector((state: AccountsRootState) =>
+        selectAccountNetworkSymbol(state, accountKey),
+    )!;
+
+    return (
+        <HStack alignItems="center">
+            <CryptoIconWithNetwork symbol={symbol} size="small"  />
+            <Text variant="highlight" adjustsFontSizeToFit numberOfLines={1}>
+                {accountLabel}
+            </Text>
+        </HStack>
+    );
+};
+
 export const AccountDetailScreenHeader = ({
     accountLabel,
     accountKey,
@@ -33,9 +51,6 @@ export const AccountDetailScreenHeader = ({
     const route = useRoute<RouteProp<RootStackParamList, RootStackRoutes.AccountDetail>>();
     const { closeActionType } = route.params;
 
-    const symbol = useSelector((state: AccountsRootState) =>
-        selectAccountNetworkSymbol(state, accountKey),
-    )!;
     const handleSettingsNavigation = () => {
         navigation.navigate(RootStackRoutes.AccountSettings, {
             accountKey,
@@ -45,14 +60,10 @@ export const AccountDetailScreenHeader = ({
     return (
         <ScreenHeader
             content={
-                <HStack alignItems="center">
-                    <CryptoIconWithNetwork
-                        symbol={symbol}
-                        size="small"
-                        preferNetworkSymbol={false}
-                    />
-                    <Text>{accountLabel}</Text>
-                </HStack>
+                <AccountDetailScreenHeaderContent
+                    accountLabel={accountLabel}
+                    accountKey={accountKey}
+                />
             }
             rightIcon={
                 <IconButton
diff --git a/suite-native/module-accounts-management/src/components/CoinPriceCard.tsx b/suite-native/module-accounts-management/src/components/CoinPriceCard.tsx
index e53033574ea..8acbc1559e5 100644
--- a/suite-native/module-accounts-management/src/components/CoinPriceCard.tsx
+++ b/suite-native/module-accounts-management/src/components/CoinPriceCard.tsx
@@ -71,7 +71,7 @@ export const CoinPriceCard = ({ accountKey }: CoinPriceCardProps) => {
         <Card style={applyStyle(cardStyle)}>
             <Box flexDirection="row" alignItems="center" flex={1}>
                 <Box marginRight="sp16">
-                    <CryptoIconWithNetwork symbol={symbol} preferNetworkSymbol={false} />
+                    <CryptoIconWithNetwork symbol={symbol} />
                 </Box>
                 <Box style={applyStyle(cardContentStyle)}>
                     <Text variant="label" color="textSubdued">
diff --git a/suite-native/module-accounts-management/src/components/TransactionListHeader.tsx b/suite-native/module-accounts-management/src/components/TransactionListHeader.tsx
index 3ce6fb67616..d9aa2a2f468 100644
--- a/suite-native/module-accounts-management/src/components/TransactionListHeader.tsx
+++ b/suite-native/module-accounts-management/src/components/TransactionListHeader.tsx
@@ -25,8 +25,8 @@ import {
 
 import { AccountDetailCryptoValue } from './AccountDetailCryptoValue';
 import { AccountDetailGraph } from './AccountDetailGraph';
-import { selectIsNetworkSendFlowEnabled } from '../selectors';
 import { CoinPriceCard } from './CoinPriceCard';
+import { selectIsNetworkSendFlowEnabled } from '../selectors';
 
 type TransactionListHeaderProps = {
     accountKey: AccountKey;
diff --git a/suite-native/transactions/src/components/TransactionDetail/TransactionDetailAddressesSection.tsx b/suite-native/transactions/src/components/TransactionDetail/TransactionDetailAddressesSection.tsx
index 60c6e3f0cf3..94fce828f62 100644
--- a/suite-native/transactions/src/components/TransactionDetail/TransactionDetailAddressesSection.tsx
+++ b/suite-native/transactions/src/components/TransactionDetail/TransactionDetailAddressesSection.tsx
@@ -113,7 +113,6 @@ export const TransactionDetailAddressesSection = ({
                             symbol={symbol}
                             contractAddress={contractAddress}
                             size="small"
-                            preferNetworkSymbol={false}
                         />
                     )}
                 </Box>