Solana staking view only

suite-common/wallet-utils/src/solanaStakingUtils.ts

@@ -82,6 +82,12 @@ export const getSolAccountTotalStakingBalance = (account: Account) => {
     return formatNetworkAmount(totalStakingBalance, account.symbol);
 };
 
+export const getSolanaCryptoBalanceWithStaking = (account: Account) => {
+    const stakingBalance = getSolAccountTotalStakingBalance(account);
+
+    return new BigNumber(account.formattedBalance).plus(stakingBalance ?? 0).toString();
+};
+
 export const calculateSolanaStakingReward = (accountBalance?: string, apy?: string) => {
     if (!accountBalance || !apy) return '0';
 

suite-native/intl/src/en.ts

@@ -1244,12 +1244,15 @@ export const en = {
         },
         staked: 'Staked',
         rewards: 'Rewards',
+        rewardsPerEpoch: 'Rewards per Epoch',
         apy: 'Annual percentage yield',
         stakingCanBeManaged: 'Staking can be currently managed only in',
         trezorDesktop: 'Trezor Suite for desktop.',
         stakePendingCard: {
             totalStakePending: 'Total stake pending',
             addingToStakingPool: 'Adding to staking pool',
+            activatingStake: 'Activating stake',
+            totalStakeActivating: 'Total stake activating',
             transactionPending: 'Transaction pending',
             unknownStatus: 'Unknown status',
         },

suite-native/module-staking-management/src/components/StakePendingCard.tsx

@@ -3,6 +3,7 @@ import { TouchableOpacity } from 'react-native';
 import { useSelector } from 'react-redux';
 
 import { BASE_CRYPTO_MAX_DISPLAYED_DECIMALS } from '@suite-common/formatters';
+import { NetworkSymbol } from '@suite-common/wallet-config';
 import { AccountsRootState, selectAccountNetworkSymbol } from '@suite-common/wallet-core';
 import { Box, Card, Text } from '@suite-native/atoms';
 import { CryptoAmountFormatter, CryptoToFiatAmountFormatter } from '@suite-native/formatters';
@@ -15,20 +16,34 @@ import {
 import { NativeStakingRootState } from '@suite-native/staking/src/types';
 import { prepareNativeStyle, useNativeStyles } from '@trezor/styles';
 
+type StakePendingCardProps = {
+    accountKey: string;
+    handleToggleBottomSheet: (value: boolean) => void;
+};
 const stakingItemStyle = prepareNativeStyle(utils => ({
     flexDirection: 'row',
     alignItems: 'center',
     gap: utils.spacings.sp4,
 }));
 
 const valuesContainerStyle = prepareNativeStyle(utils => ({
-    maxWidth: '40%',
+    maxWidth: '45%',
     flexShrink: 0,
     alignItems: 'flex-end',
     paddingLeft: utils.spacings.sp8,
 }));
 
-const getCardAlertProps = (isStakeConfirming: boolean, isStakePending: boolean) => {
+const isSolana = (symbol: NetworkSymbol) => ['sol', 'dsol'].includes(symbol);
+
+const getCardAlertProps = (
+    symbol: NetworkSymbol | null,
+    isStakeConfirming: boolean,
+    isStakePending: boolean,
+) => {
+    if (!symbol) {
+        return { alertTitle: undefined, alertVariant: undefined } as const;
+    }
+
     if (isStakeConfirming && !isStakePending) {
         return {
             alertTitle: <Translation id="staking.stakePendingCard.transactionPending" />,
@@ -37,7 +52,11 @@ const getCardAlertProps = (isStakeConfirming: boolean, isStakePending: boolean)
     }
     if (!isStakeConfirming && isStakePending) {
         return {
-            alertTitle: <Translation id="staking.stakePendingCard.addingToStakingPool" />,
+            alertTitle: isSolana(symbol) ? (
+                <Translation id="staking.stakePendingCard.activatingStake" />
+            ) : (
+                <Translation id="staking.stakePendingCard.addingToStakingPool" />
+            ),
             alertVariant: 'loading',
         } as const;
     }
@@ -48,10 +67,12 @@ const getCardAlertProps = (isStakeConfirming: boolean, isStakePending: boolean)
     } as const;
 };
 
-type StakePendingCardProps = {
-    accountKey: string;
-    handleToggleBottomSheet: (value: boolean) => void;
-};
+const getTitle = (symbol: NetworkSymbol) =>
+    isSolana(symbol) ? (
+        <Translation id="staking.stakePendingCard.totalStakeActivating" />
+    ) : (
+        <Translation id="staking.stakePendingCard.totalStakePending" />
+    );
 
 export const StakePendingCard = ({
     accountKey,
@@ -75,20 +96,20 @@ export const StakePendingCard = ({
     );
 
     const cardAlertProps = useMemo(
-        () => getCardAlertProps(isStakeConfirming, isStakePending),
-        [isStakeConfirming, isStakePending],
+        () => getCardAlertProps(symbol, isStakeConfirming, isStakePending),
+        [symbol, isStakeConfirming, isStakePending],
     );
 
     if (!symbol || !cardAlertProps.alertVariant) return null;
 
+    const title = getTitle(symbol);
+
     return (
         <TouchableOpacity onPress={() => handleToggleBottomSheet(true)}>
             <Card {...cardAlertProps}>
                 <Box style={applyStyle(stakingItemStyle)}>
                     <Box flex={1} flexDirection="row" alignItems="center">
-                        <Text>
-                            <Translation id="staking.stakePendingCard.totalStakePending" />
-                        </Text>
+                        <Text>{title}</Text>
                     </Box>
                     <Box style={applyStyle(valuesContainerStyle)}>
                         <CryptoAmountFormatter

suite-native/module-staking-management/src/components/StakingBalancesOverviewCard.tsx

@@ -67,6 +67,12 @@ export const StakingBalancesOverviewCard = ({
 
     if (!symbol) return null;
 
+    const rewardsTitle = ['sol', 'dsol'].includes(symbol) ? (
+        <Translation id="staking.rewardsPerEpoch" />
+    ) : (
+        <Translation id="staking.rewards" />
+    );
+
     return (
         <TouchableOpacity onPress={() => handleToggleBottomSheet(true)}>
             <Card style={applyStyle(stakingCardStyle)}>
@@ -99,7 +105,7 @@ export const StakingBalancesOverviewCard = ({
                         <Box style={applyStyle(stakingItemStyle)}>
                             <Icon name="plusCircle" color="textSubdued" size="medium" />
                             <Text color="textSubdued" variant="label">
-                                <Translation id="staking.rewards" />
+                                {rewardsTitle}
                             </Text>
                         </Box>
                         <CryptoAmountFormatter

suite-native/staking/src/selectors.ts

@@ -1,10 +1,16 @@
 import type { NetworkSymbol } from '@suite-common/wallet-config';
-import { selectAccountByKey } from '@suite-common/wallet-core';
+import {
+    selectAccountByKey,
+    selectPoolStatsApyData,
+    selectSolAccountHasStaked,
+} from '@suite-common/wallet-core';
 import { Account, AccountKey } from '@suite-common/wallet-types';
-import { getEthereumCryptoBalanceWithStaking } from '@suite-common/wallet-utils';
+import {
+    getEthereumCryptoBalanceWithStaking,
+    getSolanaCryptoBalanceWithStaking,
+} from '@suite-common/wallet-utils';
 
 import {
-    selectEthereumAPYByAccountKey,
     selectEthereumAccountHasStaking,
     selectEthereumIsStakeConfirmingByAccountKey,
     selectEthereumIsStakePendingByAccountKey,
@@ -13,6 +19,13 @@ import {
     selectEthereumTotalStakePendingByAccountKey,
     selectVisibleDeviceEthereumAccountsWithStakingByNetworkSymbol,
 } from './ethereumStakingSelectors';
+import {
+    selectExpectedRewardsForEpoch,
+    selectSolanaIsStakePendingByAccountKey,
+    selectSolanaStakedBalanceByAccountKey,
+    selectSolanaTotalStakePendingByAccountKey,
+    selectVisibleDeviceSolanaAccountsWithStakingByNetworkSymbol,
+} from './solanaStakingSelectors';
 import { NativeStakingRootState } from './types';
 import { doesCoinSupportStaking } from './utils';
 
@@ -32,6 +45,9 @@ export const selectDeviceAccountsWithStaking = (
         case 'thol':
         case 'tsep':
             return selectVisibleDeviceEthereumAccountsWithStakingByNetworkSymbol(state, 'eth');
+        case 'dsol':
+        case 'sol':
+            return selectVisibleDeviceSolanaAccountsWithStakingByNetworkSymbol(state, 'sol');
         default:
             // This throws error if any symbol is not handled.
             symbol satisfies never;
@@ -57,6 +73,9 @@ export const getAccountCryptoBalanceWithStaking = (account: Account | null) => {
         case 'thol':
         case 'tsep':
             return getEthereumCryptoBalanceWithStaking(account);
+        case 'dsol':
+        case 'sol':
+            return getSolanaCryptoBalanceWithStaking(account);
         default:
             // This is to make sure that all cases are handled.
             account.symbol satisfies never;
@@ -87,6 +106,9 @@ export const selectAccountHasStaking = (state: NativeStakingRootState, accountKe
         case 'thol':
         case 'tsep':
             return selectEthereumAccountHasStaking(state, accountKey);
+        case 'dsol':
+        case 'sol':
+            return selectSolAccountHasStaked(state, accountKey);
         default:
             // This throws error if any symbol is not handled.
             symbol satisfies never;
@@ -110,6 +132,9 @@ export const selectIsStakePendingByAccountKey = (
         case 'thol':
         case 'tsep':
             return selectEthereumIsStakePendingByAccountKey(state, accountKey);
+        case 'dsol':
+        case 'sol':
+            return selectSolanaIsStakePendingByAccountKey(state, accountKey);
         default:
             // This throws error if any symbol is not handled.
             symbol satisfies never;
@@ -133,6 +158,9 @@ export const selectIsStakeConfirmingByAccountKey = (
         case 'thol':
         case 'tsep':
             return selectEthereumIsStakeConfirmingByAccountKey(state, accountKey);
+        case 'dsol':
+        case 'sol':
+            return false; // there are no pending txns for solana staking;
         default:
             // This throws error if any symbol is not handled.
             symbol satisfies never;
@@ -148,17 +176,7 @@ export const selectAPYByAccountKey = (state: NativeStakingRootState, accountKey:
         return null;
     }
 
-    switch (symbol) {
-        case 'eth':
-        case 'thol':
-        case 'tsep':
-            return selectEthereumAPYByAccountKey(state, accountKey);
-        default:
-            // This throws error if any symbol is not handled.
-            symbol satisfies never;
-
-            return null;
-    }
+    return selectPoolStatsApyData(state, symbol);
 };
 
 export const selectStakedBalanceByAccountKey = (
@@ -176,6 +194,9 @@ export const selectStakedBalanceByAccountKey = (
         case 'thol':
         case 'tsep':
             return selectEthereumStakedBalanceByAccountKey(state, accountKey);
+        case 'dsol':
+        case 'sol':
+            return selectSolanaStakedBalanceByAccountKey(state, accountKey);
         default:
             // This throws error if any symbol is not handled.
             symbol satisfies never;
@@ -199,6 +220,10 @@ export const selectRewardsBalanceByAccountKey = (
         case 'thol':
         case 'tsep':
             return selectEthereumRewardsBalanceByAccountKey(state, accountKey);
+        case 'dsol':
+        case 'sol':
+            // on solana we show rewards per one epoch
+            return selectExpectedRewardsForEpoch(state, accountKey);
         default:
             // This throws error if any symbol is not handled.
             symbol satisfies never;
@@ -222,6 +247,9 @@ export const selectTotalStakePendingByAccountKey = (
         case 'thol':
         case 'tsep':
             return selectEthereumTotalStakePendingByAccountKey(state, accountKey);
+        case 'dsol':
+        case 'sol':
+            return selectSolanaTotalStakePendingByAccountKey(state, accountKey);
         default:
             // This throws error if any symbol is not handled.
             symbol satisfies never;