fix(suite-native): show correct device label for each device

- #14483 broke device label in case of multiple devices. Device label of selected device was reused for all of them.
trezor · Oct 15, 2024 · c56f065 · c56f065
1 parent edffb35
commit c56f065
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/suite-native/device-manager/src/components/DeviceItem/DeviceItemContent.tsx b/suite-native/device-manager/src/components/DeviceItem/DeviceItemContent.tsx
@@ -8,7 +8,7 @@ import {
     DeviceRootState,
     PORTFOLIO_TRACKER_DEVICE_ID,
     selectHasOnlyEmptyPortfolioTracker,
-    selectDeviceLabelOrName,
+    selectDeviceLabelOrNameById,
 } from '@suite-common/wallet-core';
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
 import { TypographyStyle } from '@trezor/theme';
@@ -67,7 +67,7 @@ export const DeviceItemContent = React.memo(
             return {
                 id: d.id,
                 name: d.name,
-                label: selectDeviceLabelOrName(state),
+                label: selectDeviceLabelOrNameById(state, d.id),
                 walletNumber: d.walletNumber,
                 useEmptyPassphrase: d.useEmptyPassphrase,
             };

diff --git a/suite-native/module-settings/src/components/ViewOnly/WalletRow.tsx b/suite-native/module-settings/src/components/ViewOnly/WalletRow.tsx
@@ -4,8 +4,9 @@ import { Button, HStack, Loader, Text } from '@suite-native/atoms';
 import { Translation } from '@suite-native/intl';
 import {
     ConnectDeviceSettings,
+    DeviceRootState,
     deviceActions,
-    selectDeviceLabelOrName,
+    selectDeviceLabelOrNameById,
     selectHasDeviceDiscovery,
 } from '@suite-common/wallet-core';
 import { analytics, EventType } from '@suite-native/analytics';
@@ -33,7 +34,9 @@ export const WalletRow = ({ device }: WalletRowProps) => {
     const { showToast } = useToast();
     const { applyStyle } = useNativeStyles();
     const hasDiscovery = useSelector(selectHasDeviceDiscovery);
-    const deviceLabel = useSelector(selectDeviceLabelOrName);
+    const deviceLabel = useSelector((state: DeviceRootState) =>
+        selectDeviceLabelOrNameById(state, device?.id),
+    );
 
     const walletNameLabel = device.useEmptyPassphrase ? (
         <Translation id="moduleSettings.viewOnly.wallet.standard" />