feat: improve multiple sol wallets support

forbole · Apr 15, 2024 · 6dd93ed · 6dd93ed
1 parent 57dd4be
commit 6dd93ed
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 0 deletions.
diff --git a/src/screens/staking/components/staking_section/unstaking_modal.tsx b/src/screens/staking/components/staking_section/unstaking_modal.tsx
@@ -139,6 +139,7 @@ const UnstakingModal = () => {
       ? getStakeAccountsForNetwork(
           stakingRef.current.state,
           selectedAccount.networkId,
+          account?.address,
         )
       : []
   ).filter((acc) => ["activating", "active"].includes(acc.status));

diff --git a/src/screens/staking/components/staking_section/withdraw_unstaked_modal.tsx b/src/screens/staking/components/staking_section/withdraw_unstaked_modal.tsx
@@ -57,6 +57,7 @@ const WithdrawUnstakedModal = () => {
       ? getStakeAccountsForNetwork(
           stakingRef.current.state,
           selectedAccount.networkId,
+          address,
         )
       : []
   ).filter((acc) => acc.status === "inactive");

diff --git a/src/screens/staking/lib/staking_sdk/context/selectors.ts b/src/screens/staking/lib/staking_sdk/context/selectors.ts
@@ -62,11 +62,13 @@ export const getAccountsForNetwork = (
 export const getStakeAccountsForNetwork = (
   state: StakingState,
   network: StakingNetworkId,
+  parentAddress?: string,
 ) => {
   const accounts = getAccountsForNetwork(state, network);
   const uniqueAccounts = new Set<string>();
 
   return accounts
+    .filter(parentAddress ? (acc) => acc.address === parentAddress : () => true)
     .map((account) => account.info?.stakeAccounts)
     .flat()
     .filter((a): a is StakeAccount => !!a)