fix(suite-native): do not include solana staking in balance

trezor · Jan 24, 2025 · 6abe311 · 6abe311
1 parent 8aa03be
commit 6abe311
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 24 deletions.
diff --git a/suite-native/accounts/src/components/AccountsList/AccountsListItem.tsx b/suite-native/accounts/src/components/AccountsList/AccountsListItem.tsx
@@ -76,7 +76,7 @@ export const AccountsListItem = ({
     );
 
     const fiatBalance = useSelector((state: NativeAccountsRootState) =>
-        selectAccountFiatBalance(state, account.key),
+        selectAccountFiatBalance(state, account.key, accountHasStaking),
     );
 
     const handleOnPress = useCallback(() => {

diff --git a/suite-native/device-manager/src/components/WalletItem.tsx b/suite-native/device-manager/src/components/WalletItem.tsx
@@ -2,7 +2,7 @@ import { useSelector } from 'react-redux';
 
 import { TrezorDevice } from '@suite-common/suite-types';
 import { selectSelectedDevice, selectDeviceByState } from '@suite-common/wallet-core';
-import { selectDeviceTotalFiatBalanceNative } from '@suite-native/device';
+import { selectDeviceTotalFiatBalanceByDeviceState } from '@suite-native/device';
 
 import { WalletItemBase } from './WalletItemBase';
 
@@ -17,7 +17,9 @@ export const WalletItem = ({ onPress, deviceState, isSelectable = true }: Wallet
     const selectedDevice = useSelector(selectSelectedDevice);
     const fiatBalance = useSelector((state: any) =>
         device?.state?.staticSessionId
-            ? String(selectDeviceTotalFiatBalanceNative(state, device?.state?.staticSessionId))
+            ? String(
+                  selectDeviceTotalFiatBalanceByDeviceState(state, device?.state?.staticSessionId),
+              )
             : undefined,
     );
 

diff --git a/suite-native/device/package.json b/suite-native/device/package.json
@@ -32,6 +32,7 @@
         "@trezor/connect": "workspace:*",
         "@trezor/device-utils": "workspace:*",
         "@trezor/styles": "workspace:*",
+        "@trezor/utils": "workspace:*",
         "lottie-react-native": "^7.1.0",
         "react": "18.2.0",
         "react-native": "0.76.1",

diff --git a/suite-native/device/src/selectors.ts b/suite-native/device/src/selectors.ts
@@ -23,8 +23,12 @@ import {
     selectAccountsByDeviceState,
 } from '@suite-common/wallet-core';
 import { isDeviceAcquired } from '@suite-common/suite-utils';
-import { getTotalFiatBalance } from '@suite-common/wallet-utils';
+import { getAccountFiatBalance } from '@suite-common/wallet-utils';
 import { selectFiatCurrencyCode, SettingsSliceRootState } from '@suite-native/settings';
+import { BigNumber } from '@trezor/utils';
+import { Account, RatesByKey } from '@suite-common/wallet-types';
+import { FiatCurrencyCode } from '@suite-common/suite-config';
+import { doesCoinSupportStaking } from '@suite-native/staking';
 
 import { isFirmwareVersionSupported } from './utils';
 
@@ -71,30 +75,41 @@ export const selectDeviceError = (
     return device?.error;
 };
 
+// FIXME: this function can be removed and substituted with @suite-common/wallet-utils/getTotalFiatBalance when Solana supports staking on mobile.
+const getTotalFiatBalanceNative = ({
+    deviceAccounts,
+    localCurrency,
+    rates,
+}: {
+    deviceAccounts: Account[];
+    localCurrency: FiatCurrencyCode;
+    rates?: RatesByKey;
+}) => {
+    let instanceBalance = new BigNumber(0);
+    deviceAccounts.forEach(a => {
+        const accountFiatBalance =
+            getAccountFiatBalance({
+                account: a,
+                localCurrency,
+                rates,
+                shouldIncludeStaking: doesCoinSupportStaking(a.symbol),
+            }) ?? '0';
+        instanceBalance = instanceBalance.plus(accountFiatBalance);
+    });
+
+    return instanceBalance.toFixed(2);
+};
+
 export const selectSelectedDeviceTotalFiatBalance = createMemoizedSelector(
     [selectDeviceAccounts, selectCurrentFiatRates, selectFiatCurrencyCode],
-    (deviceAccounts, rates, localCurrency) => {
-        const fiatBalance = getTotalFiatBalance({
-            deviceAccounts,
-            localCurrency,
-            rates,
-        });
-
-        return fiatBalance.toFixed(2);
-    },
+    (deviceAccounts, rates, localCurrency) =>
+        getTotalFiatBalanceNative({ deviceAccounts, localCurrency, rates }),
 );
 
-export const selectDeviceTotalFiatBalanceNative = createMemoizedSelector(
+export const selectDeviceTotalFiatBalanceByDeviceState = createMemoizedSelector(
     [selectAccountsByDeviceState, selectCurrentFiatRates, selectFiatCurrencyCode],
-    (accounts, rates, localCurrency) => {
-        const fiatBalance = getTotalFiatBalance({
-            deviceAccounts: accounts,
-            localCurrency,
-            rates,
-        });
-
-        return fiatBalance.toFixed(2);
-    },
+    (deviceAccounts, rates, localCurrency) =>
+        getTotalFiatBalanceNative({ deviceAccounts, localCurrency, rates }),
 );
 
 // Unique symbols for all accounts that are on view only devices (excluding portfolio tracker)

diff --git a/suite-native/device/tsconfig.json b/suite-native/device/tsconfig.json
@@ -27,7 +27,8 @@
         { "path": "../settings" },
         { "path": "../../packages/connect" },
         { "path": "../../packages/device-utils" },
-        { "path": "../../packages/styles" }
+        { "path": "../../packages/styles" },
+        { "path": "../../packages/utils" }
     ],
     "include": [".", "**/*.json"]
 }
diff --git a/yarn.lock b/yarn.lock
@@ -10292,6 +10292,7 @@ __metadata:
     "@trezor/connect": "workspace:*"
     "@trezor/device-utils": "workspace:*"
     "@trezor/styles": "workspace:*"
+    "@trezor/utils": "workspace:*"
     lottie-react-native: "npm:^7.1.0"
     react: "npm:18.2.0"
     react-native: "npm:0.76.1"