feat: change portfolio selectors arity (#1635)

gomesalexandre · cjthompson · 0xdef1cafe · web-flow · commit 0e63e45d9dc8 · 2022-05-04T22:14:44.000+02:00
* feat: change portfolio selectors arity

Co-authored-by: Chris Thompson &lt;1958266+cjthompson@users.noreply.github.com&gt;
Co-authored-by: 0xdef1cafe &lt;88504456+0xdef1cafe@users.noreply.github.com&gt;
diff --git a/src/components/AccountAssets/AccountAssets.tsx b/src/components/AccountAssets/AccountAssets.tsx
@@ -17,7 +17,7 @@ type AccountAssetsProps = {
 
 export const AccountAssets = ({ assetId, accountId }: AccountAssetsProps) => {
   const assetIds = useAppSelector(state =>
-    selectPortfolioAssetIdsByAccountIdExcludeFeeAsset(state, accountId),
+    selectPortfolioAssetIdsByAccountIdExcludeFeeAsset(state, { accountId }),
   )
   const asset = useAppSelector(state => selectAssetById(state, assetId))
 
diff --git a/src/components/AccountRow/AccountRow.tsx b/src/components/AccountRow/AccountRow.tsx
@@ -28,9 +28,9 @@ export const AccountRow = ({ allocationValue, assetId, ...rest }: AccountRowArgs
   const asset = useAppSelector(state => selectAssetById(state, assetId))
   const marketData = useAppSelector(state => selectMarketDataById(state, assetId))
   const cryptoValue = useAppSelector(state =>
-    selectPortfolioCryptoHumanBalanceByAssetId(state, assetId),
+    selectPortfolioCryptoHumanBalanceByAssetId(state, { assetId }),
   )
-  const fiatValue = useAppSelector(state => selectPortfolioFiatBalanceByAssetId(state, assetId))
+  const fiatValue = useAppSelector(state => selectPortfolioFiatBalanceByAssetId(state, { assetId }))
 
   if (!asset) return null // users may have assets we don't support
 
diff --git a/src/components/AssetAccounts/AssetAccounts.tsx b/src/components/AssetAccounts/AssetAccounts.tsx
@@ -17,7 +17,7 @@ type AssetAccountsProps = {
 export const AssetAccounts = ({ assetId, accountId }: AssetAccountsProps) => {
   const translate = useTranslate()
   const accountIds = useAppSelector(state =>
-    selectAccountIdsByAssetIdAboveBalanceThreshold(state, assetId),
+    selectAccountIdsByAssetIdAboveBalanceThreshold(state, { assetId }),
   )
   if ((accountIds && accountIds.length === 0) || accountId) return null
   return (
diff --git a/src/components/AssetHeader/AssetHeader.tsx b/src/components/AssetHeader/AssetHeader.tsx
@@ -21,7 +21,7 @@ type AssetHeaderProps = {
 export const AssetHeader: React.FC<AssetHeaderProps> = ({ assetId, accountId }) => {
   const asset = useAppSelector(state => selectAssetById(state, assetId))
   const chainId = asset.chainId
-  const accountIds = useAppSelector(state => selectAccountIdsByAssetId(state, assetId))
+  const accountIds = useAppSelector(state => selectAccountIdsByAssetId(state, { assetId }))
   const singleAccount = accountIds && accountIds.length === 1 ? accountIds[0] : undefined
   const { name, symbol, icon } = asset || {}
 
diff --git a/src/components/SelectAssets/SelectAccount.tsx b/src/components/SelectAssets/SelectAccount.tsx
@@ -25,7 +25,7 @@ export const SelectAccount = ({ onClick }: SelectAccountProps) => {
   const translate = useTranslate()
   const history = useHistory()
   const accountIds = useAppSelector(state =>
-    selectAccountIdsByAssetId(state, location.state.assetId),
+    selectAccountIdsByAssetId(state, { assetId: location.state.assetId }),
   )
   const asset = useAppSelector(state => selectAssetById(state, location.state.assetId))
   return (
diff --git a/src/components/Trade/TradeInput.tsx b/src/components/Trade/TradeInput.tsx
@@ -63,7 +63,7 @@ export const TradeInput = ({ history }: RouterProps) => {
   } = useWallet()
 
   const sellAssetBalance = useAppSelector(state =>
-    selectPortfolioCryptoHumanBalanceByAssetId(state, sellAsset?.currency?.assetId),
+    selectPortfolioCryptoHumanBalanceByAssetId(state, { assetId: sellAsset?.currency?.assetId }),
   )
   const hasValidTradeBalance = bnOrZero(sellAssetBalance).gte(bnOrZero(sellAsset?.amount))
   const hasValidBalance = bnOrZero(sellAssetBalance).gt(0)
@@ -74,7 +74,9 @@ export const TradeInput = ({ history }: RouterProps) => {
       : selectAssetById(state, 'eip155:1/slip44:60'),
   )
   const feeAssetBalance = useAppSelector(state =>
-    feeAsset ? selectPortfolioCryptoHumanBalanceByAssetId(state, feeAsset?.assetId) : null,
+    feeAsset
+      ? selectPortfolioCryptoHumanBalanceByAssetId(state, { assetId: feeAsset?.assetId })
+      : null,
   )
 
   // when trading from ETH, the value of TX in ETH is deducted
diff --git a/src/components/Trade/hooks/useSwapper/useSwapper.ts b/src/components/Trade/hooks/useSwapper/useSwapper.ts
@@ -117,7 +117,7 @@ export const useSwapper = () => {
   }, [])
 
   const sellAssetBalance = useAppSelector(state =>
-    selectPortfolioCryptoBalanceByAssetId(state, sellAsset?.currency?.assetId),
+    selectPortfolioCryptoBalanceByAssetId(state, { assetId: sellAsset?.currency?.assetId }),
   )
 
   const getSendMaxAmount = async ({
diff --git a/src/components/TransactionHistory/AssetTransactionHistory.tsx b/src/components/TransactionHistory/AssetTransactionHistory.tsx
@@ -33,7 +33,7 @@ export const AssetTransactionHistory: React.FC<AssetTransactionHistoryProps> = (
 
   const asset = useAppSelector(state => selectAssetById(state, assetId))
   const chainId = asset.chainId
-  const accountIds = useAppSelector(state => selectAccountIdsByAssetId(state, assetId))
+  const accountIds = useAppSelector(state => selectAccountIdsByAssetId(state, { assetId }))
   const filter = useMemo(
     // if we are passed an accountId, we're on an asset account page, use that specifically.
     // otherwise, we're on an asset page, use all accountIds related to this asset
diff --git a/src/context/TransactionsProvider/TransactionsProvider.tsx b/src/context/TransactionsProvider/TransactionsProvider.tsx
@@ -123,7 +123,9 @@ export const TransactionsProvider = ({ children }: TransactionsProviderProps): J
                     msg => {
                       const caip10 = `${msg.caip2}:${msg.address}`
                       const state = store.getState()
-                      const accountId = selectAccountIdByAddress(state, caip10)
+                      const accountId = selectAccountIdByAddress(state, {
+                        accountSpecifier: caip10,
+                      })
                       dispatch(
                         txHistory.actions.onMessage({
                           message: { ...msg, accountType },
diff --git a/src/features/defi/providers/foxy/components/FoxyManager/Deposit/components/Deposit.tsx b/src/features/defi/providers/foxy/components/FoxyManager/Deposit/components/Deposit.tsx
@@ -43,7 +43,7 @@ export const Deposit = ({ api, apy, getDepositGasEstimate }: FoxyDepositProps) =
   if (!marketData) appDispatch(marketApi.endpoints.findByCaip19.initiate(assetId))
 
   // user info
-  const balance = useAppSelector(state => selectPortfolioCryptoBalanceByAssetId(state, assetId))
+  const balance = useAppSelector(state => selectPortfolioCryptoBalanceByAssetId(state, { assetId }))
 
   // notify
   const toast = useToast()
diff --git a/src/features/defi/providers/foxy/components/FoxyManager/Withdraw/components/Withdraw.tsx b/src/features/defi/providers/foxy/components/FoxyManager/Withdraw/components/Withdraw.tsx
@@ -44,18 +44,18 @@ export const Withdraw = ({ api, getWithdrawGasEstimate }: FoxyWithdrawProps) =>
   const network = NetworkTypes.MAINNET
   const assetNamespace = AssetNamespace.ERC20
   // Asset info
-  const assetCAIP19 = caip19.toCAIP19({
+  const assetId = caip19.toCAIP19({
     chain,
     network,
     assetNamespace,
     assetReference: rewardId,
   })
-  const asset = useAppSelector(state => selectAssetById(state, assetCAIP19))
-  const marketData = useAppSelector(state => selectMarketDataById(state, assetCAIP19))
-  if (!marketData) appDispatch(marketApi.endpoints.findByCaip19.initiate(assetCAIP19))
+  const asset = useAppSelector(state => selectAssetById(state, assetId))
+  const marketData = useAppSelector(state => selectMarketDataById(state, assetId))
+  if (!marketData) appDispatch(marketApi.endpoints.findByCaip19.initiate(assetId))
 
   // user info
-  const balance = useAppSelector(state => selectPortfolioCryptoBalanceByAssetId(state, assetCAIP19))
+  const balance = useAppSelector(state => selectPortfolioCryptoBalanceByAssetId(state, { assetId }))
 
   const withdrawalFee = useMemo(() => {
     return state?.withdraw.withdrawType === WithdrawType.INSTANT
diff --git a/src/features/defi/providers/yearn/components/YearnManager/Deposit/components/Deposit.tsx b/src/features/defi/providers/yearn/components/YearnManager/Deposit/components/Deposit.tsx
@@ -36,13 +36,13 @@ export const Deposit = ({ api, apy, getDepositGasEstimate }: YearnDepositProps)
 
   const network = NetworkTypes.MAINNET
   const assetNamespace = AssetNamespace.ERC20
-  const assetCAIP19 = caip19.toCAIP19({ chain, network, assetNamespace, assetReference: tokenId })
-  const asset = useAppSelector(state => selectAssetById(state, assetCAIP19))
-  const marketData = useAppSelector(state => selectMarketDataById(state, assetCAIP19))
-  if (!marketData) appDispatch(marketApi.endpoints.findByCaip19.initiate(assetCAIP19))
+  const assetId = caip19.toCAIP19({ chain, network, assetNamespace, assetReference: tokenId })
+  const asset = useAppSelector(state => selectAssetById(state, assetId))
+  const marketData = useAppSelector(state => selectMarketDataById(state, assetId))
+  if (!marketData) appDispatch(marketApi.endpoints.findByCaip19.initiate(assetId))
 
   // user info
-  const balance = useAppSelector(state => selectPortfolioCryptoBalanceByAssetId(state, assetCAIP19))
+  const balance = useAppSelector(state => selectPortfolioCryptoBalanceByAssetId(state, { assetId }))
 
   // notify
   const toast = useToast()
diff --git a/src/features/defi/providers/yearn/components/YearnManager/Withdraw/components/Withdraw.tsx b/src/features/defi/providers/yearn/components/YearnManager/Withdraw/components/Withdraw.tsx
@@ -33,23 +33,23 @@ export const Withdraw = ({ api }: YearnWithdrawProps) => {
   const network = NetworkTypes.MAINNET
   const assetNamespace = AssetNamespace.ERC20
   // Asset info
-  const underlyingAssetCAIP19 = caip19.toCAIP19({
+  const underlyingAssetId = caip19.toCAIP19({
     chain,
     network,
     assetNamespace,
     assetReference: tokenId,
   })
-  const assetCAIP19 = caip19.toCAIP19({
+  const assetId = caip19.toCAIP19({
     chain,
     network,
     assetNamespace,
     assetReference: vaultAddress,
   })
-  const asset = useAppSelector(state => selectAssetById(state, assetCAIP19))
-  const marketData = useAppSelector(state => selectMarketDataById(state, underlyingAssetCAIP19))
+  const asset = useAppSelector(state => selectAssetById(state, assetId))
+  const marketData = useAppSelector(state => selectMarketDataById(state, underlyingAssetId))
 
   // user info
-  const balance = useAppSelector(state => selectPortfolioCryptoBalanceByAssetId(state, assetCAIP19))
+  const balance = useAppSelector(state => selectPortfolioCryptoBalanceByAssetId(state, { assetId }))
 
   if (!state || !dispatch) return null
 
diff --git a/src/hooks/useBalanceChartData/useBalanceChartData.ts b/src/hooks/useBalanceChartData/useBalanceChartData.ts
@@ -364,7 +364,7 @@ export const useBalanceChartData: UseBalanceChartData = args => {
   }, [dispatch, cosmosCaip10])
 
   const delegationTotal = useAppSelector(state =>
-    selectTotalStakingDelegationCryptoByAccountSpecifier(state, cosmosCaip10),
+    selectTotalStakingDelegationCryptoByAccountSpecifier(state, { accountSpecifier: cosmosCaip10 }),
   )
 
   const portfolioAssets = useSelector(selectPortfolioAssets)
diff --git a/src/pages/Accounts/AccountRowWithTokens.tsx b/src/pages/Accounts/AccountRowWithTokens.tsx
@@ -12,7 +12,7 @@ type AccountRowWithTokensProps = {
 
 export const AccountRowWithTokens = ({ accountId }: AccountRowWithTokensProps) => {
   const assetIds = useAppSelector(state =>
-    selectPortfolioAssetIdsByAccountIdExcludeFeeAsset(state, accountId),
+    selectPortfolioAssetIdsByAccountIdExcludeFeeAsset(state, { accountId }),
   )
   return (
     <Card variant='outline'>
diff --git a/src/pages/Defi/hooks/useCosmosStakingBalances.test.tsx b/src/pages/Defi/hooks/useCosmosStakingBalances.test.tsx
@@ -4,6 +4,7 @@ import { mockMarketData } from 'test/mocks/marketData'
 import { emptyMockStakingData, mockStakingData, mockValidatorData } from 'test/mocks/stakingData'
 import { TestProviders } from 'test/TestProviders'
 import { ReduxState } from 'state/reducer'
+import { accountSpecifiers } from 'state/slices/accountSpecifiersSlice/accountSpecifiersSlice'
 import { assets as assetsSlice } from 'state/slices/assetsSlice/assetsSlice'
 import { marketData as marketDataSlice } from 'state/slices/marketDataSlice/marketDataSlice'
 import { stakingData as stakingDataSlice } from 'state/slices/stakingDataSlice/stakingDataSlice'
@@ -37,6 +38,12 @@ function setup() {
     }),
   )
 
+  store.dispatch(
+    accountSpecifiers.actions.setAccountSpecifiers([
+      { 'cosmos:cosmoshub-4': 'cosmos1wc4rv7dv8lafv38s50pfp5qsgv7eknetyml669' },
+    ]),
+  )
+
   const wrapper: React.FC = ({ children }) => <TestProviders>{children}</TestProviders>
   const { result } = renderHook(
     () =>
diff --git a/src/pages/Defi/hooks/useCosmosStakingBalances.tsx b/src/pages/Defi/hooks/useCosmosStakingBalances.tsx
@@ -3,8 +3,8 @@ import { chainAdapters, ChainTypes } from '@shapeshiftoss/types'
 import { useEffect, useMemo } from 'react'
 import { BigNumber, bnOrZero } from 'lib/bignumber/bignumber'
 import {
-  selectAccountSpecifier,
   selectAssetById,
+  selectFirstAccountSpecifierByChainId,
   selectMarketDataById,
 } from 'state/slices/selectors'
 import {
@@ -56,20 +56,21 @@ export function useCosmosStakingBalances({
   const asset = useAppSelector(state => selectAssetById(state, assetId))
   const dispatch = useAppDispatch()
 
-  const accountSpecifiers = useAppSelector(state => selectAccountSpecifier(state, asset?.chainId))
-  const accountSpecifier = accountSpecifiers?.[0]
+  const accountSpecifier = useAppSelector(state =>
+    selectFirstAccountSpecifierByChainId(state, asset?.chainId),
+  )
 
   const activeStakingOpportunities = useAppSelector(state =>
-    selectActiveStakingOpportunityDataByAssetId(
-      state,
+    selectActiveStakingOpportunityDataByAssetId(state, {
       accountSpecifier,
-      SHAPESHIFT_VALIDATOR_ADDRESS,
-      asset.assetId,
-    ),
+      assetId: asset.assetId,
+    }),
   )
 
   const shapeshiftValidator = useAppSelector(state =>
-    selectValidatorByAddress(state, accountSpecifier, SHAPESHIFT_VALIDATOR_ADDRESS),
+    selectValidatorByAddress(state, {
+      validatorAddress: SHAPESHIFT_VALIDATOR_ADDRESS,
+    }),
   )
   const stakingOpportunities = useMemo(() => {
     return [
@@ -80,7 +81,7 @@ export function useCosmosStakingBalances({
   }, [shapeshiftValidator])
 
   const nonLoadedValidators = useAppSelector(state =>
-    selectNonloadedValidators(state, accountSpecifier),
+    selectNonloadedValidators(state, { accountSpecifier }),
   )
 
   const chainId = asset.chainId
diff --git a/src/plugins/cosmos/components/modals/Staking/Staking.tsx b/src/plugins/cosmos/components/modals/Staking/Staking.tsx
@@ -13,7 +13,7 @@ import { useRef } from 'react'
 import { useTranslate } from 'react-polyglot'
 import { matchPath, MemoryRouter, Route, Switch, useLocation } from 'react-router-dom'
 import { RouteSteps } from 'components/RouteSteps/RouteSteps'
-import { selectAccountSpecifier, selectAssetById } from 'state/slices/selectors'
+import { selectAssetById, selectFirstAccountSpecifierByChainId } from 'state/slices/selectors'
 import { useAppSelector } from 'state/store'
 
 import { StakeFormManager } from './forms/StakeFormManager'
@@ -74,10 +74,9 @@ const StakingModalContent = ({ assetId, validatorAddress }: StakingModalProps) =
   const initialRef = useRef<HTMLInputElement>(null)
 
   const asset = useAppSelector(state => selectAssetById(state, assetId))
-  const accountSpecifiersForChainId = useAppSelector(state =>
-    selectAccountSpecifier(state, asset?.chainId),
+  const accountSpecifier = useAppSelector(state =>
+    selectFirstAccountSpecifierByChainId(state, asset?.chainId),
   )
-  const accountSpecifier = accountSpecifiersForChainId?.[0]
 
   if (!asset || !accountSpecifier) return null
 
@@ -112,15 +111,13 @@ const StakingModalContent = ({ assetId, validatorAddress }: StakingModalProps) =
               <Route exact key={StakingPath.Confirm} path={StakingPath.Confirm}>
                 <StakeConfirm
                   assetId={assetId}
-                  accountSpecifier={accountSpecifier}
                   validatorAddress={validatorAddress}
                   onCancel={handleCancel}
                 />
               </Route>
               <Route exact key={StakingPath.Broadcast} path={StakingPath.Broadcast}>
                 <StakeBroadcast
                   assetId={assetId}
-                  accountSpecifier={accountSpecifier}
                   validatorAddress={validatorAddress}
                   onClose={handleClose}
                   onCancel={handleCancel}
@@ -129,15 +126,13 @@ const StakingModalContent = ({ assetId, validatorAddress }: StakingModalProps) =
               <Route exact key={UnstakingPath.Confirm} path={UnstakingPath.Confirm}>
                 <UnstakeConfirm
                   assetId={assetId}
-                  accountSpecifier={accountSpecifier}
                   validatorAddress={validatorAddress}
                   onCancel={handleCancel}
                 />
               </Route>
               <Route exact key={UnstakingPath.Broadcast} path={UnstakingPath.Broadcast}>
                 <UnstakeBroadcast
                   assetId={assetId}
-                  accountSpecifier={accountSpecifier}
                   validatorAddress={validatorAddress}
                   onClose={handleClose}
                 />
diff --git a/src/plugins/cosmos/components/modals/Staking/views/ClaimConfirm.tsx b/src/plugins/cosmos/components/modals/Staking/views/ClaimConfirm.tsx
@@ -55,7 +55,7 @@ export const ClaimConfirm = ({
     name: ConfirmFormFields.FeeType,
   })
   const asset = useAppSelector(state => selectAssetById(state, assetId))
-  const balance = useAppSelector(state => selectPortfolioCryptoBalanceByAssetId(state, assetId))
+  const balance = useAppSelector(state => selectPortfolioCryptoBalanceByAssetId(state, { assetId }))
   const cryptoBalanceHuman = bnOrZero(balance).div(`1e+${asset?.precision}`)
 
   const methods = useFormContext<StakingValues>()
@@ -85,7 +85,7 @@ export const ClaimConfirm = ({
   } = useWallet()
 
   const rewardsCryptoAmount = useAppSelector(state =>
-    selectRewardsAmountByAssetId(state, accountSpecifier, validatorAddress, assetId),
+    selectRewardsAmountByAssetId(state, { accountSpecifier, validatorAddress, assetId }),
   )
 
   const rewardsCryptoAmountPrecision = useMemo(
diff --git a/src/plugins/cosmos/components/modals/Staking/views/Overview.tsx b/src/plugins/cosmos/components/modals/Staking/views/Overview.tsx
@@ -51,23 +51,30 @@ export const Overview: React.FC<StakedProps> = ({
   }, [accountSpecifier, isLoaded, dispatch])
 
   const validatorInfo = useAppSelector(state =>
-    selectValidatorByAddress(state, accountSpecifier, validatorAddress),
+    selectValidatorByAddress(state, { validatorAddress }),
   )
 
   const totalBondings = useAppSelector(state =>
-    selectTotalBondingsBalanceByAssetId(state, accountSpecifier, validatorAddress, asset.assetId),
+    selectTotalBondingsBalanceByAssetId(state, {
+      accountSpecifier,
+      validatorAddress,
+      assetId: asset.assetId,
+    }),
   )
   const undelegationEntries = useAppSelector(state =>
-    selectAllUnbondingsEntriesByAssetIdAndValidator(
-      state,
+    selectAllUnbondingsEntriesByAssetIdAndValidator(state, {
       accountSpecifier,
       validatorAddress,
-      asset.assetId,
-    ),
+      assetId: asset.assetId,
+    }),
   )
 
   const rewardsAmount = useAppSelector(state =>
-    selectRewardsAmountByAssetId(state, accountSpecifier, validatorAddress, asset.assetId),
+    selectRewardsAmountByAssetId(state, {
+      accountSpecifier,
+      validatorAddress,
+      assetId: asset.assetId,
+    }),
   )
 
   // If it's loading, it will display the skeleton,
diff --git a/src/plugins/cosmos/components/modals/Staking/views/Stake.tsx b/src/plugins/cosmos/components/modals/Staking/views/Stake.tsx
@@ -56,7 +56,7 @@ export const Stake = ({ assetId, apr }: StakeProps) => {
   const asset = useAppSelector(state => selectAssetById(state, assetId))
 
   const marketData = useAppSelector(state => selectMarketDataById(state, assetId))
-  const balance = useAppSelector(state => selectPortfolioCryptoBalanceByAssetId(state, assetId))
+  const balance = useAppSelector(state => selectPortfolioCryptoBalanceByAssetId(state, { assetId }))
   const cryptoBalanceHuman = bnOrZero(balance).div(`1e+${asset?.precision}`)
 
   const fiatAmountAvailable = cryptoBalanceHuman.times(bnOrZero(marketData.price)).toString()
diff --git a/src/plugins/cosmos/components/modals/Staking/views/StakeBroadcast.tsx b/src/plugins/cosmos/components/modals/Staking/views/StakeBroadcast.tsx
diff --git a/src/plugins/cosmos/components/modals/Staking/views/StakeConfirm.tsx b/src/plugins/cosmos/components/modals/Staking/views/StakeConfirm.tsx
diff --git a/src/plugins/cosmos/components/modals/Staking/views/Unstake.tsx b/src/plugins/cosmos/components/modals/Staking/views/Unstake.tsx
diff --git a/src/plugins/cosmos/components/modals/Staking/views/UnstakeBroadcast.tsx b/src/plugins/cosmos/components/modals/Staking/views/UnstakeBroadcast.tsx
diff --git a/src/plugins/cosmos/components/modals/Staking/views/UnstakeConfirm.tsx b/src/plugins/cosmos/components/modals/Staking/views/UnstakeConfirm.tsx
diff --git a/src/state/slices/accountSpecifiersSlice/selectors.ts b/src/state/slices/accountSpecifiersSlice/selectors.ts
diff --git a/src/state/slices/portfolioSlice/portfolioSlice.test.ts b/src/state/slices/portfolioSlice/portfolioSlice.test.ts
diff --git a/src/state/slices/portfolioSlice/selectors.ts b/src/state/slices/portfolioSlice/selectors.ts
diff --git a/src/state/slices/stakingDataSlice/selectors.ts b/src/state/slices/stakingDataSlice/selectors.ts
diff --git a/src/state/slices/stakingDataSlice/stakingDataSlice.test.ts b/src/state/slices/stakingDataSlice/stakingDataSlice.test.ts

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ type AccountAssetsProps = {`
`17`	`17`
`18`	`18`	`export const AccountAssets = ({ assetId, accountId }: AccountAssetsProps) => {`
`19`	`19`	`const assetIds = useAppSelector(state =>`
`20`		`- selectPortfolioAssetIdsByAccountIdExcludeFeeAsset(state, accountId),`
	`20`	`+ selectPortfolioAssetIdsByAccountIdExcludeFeeAsset(state, { accountId }),`
`21`	`21`	`)`
`22`	`22`	`const asset = useAppSelector(state => selectAssetById(state, assetId))`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ type AssetAccountsProps = {`
`17`	`17`	`export const AssetAccounts = ({ assetId, accountId }: AssetAccountsProps) => {`
`18`	`18`	`const translate = useTranslate()`
`19`	`19`	`const accountIds = useAppSelector(state =>`
`20`		`- selectAccountIdsByAssetIdAboveBalanceThreshold(state, assetId),`
	`20`	`+ selectAccountIdsByAssetIdAboveBalanceThreshold(state, { assetId }),`
`21`	`21`	`)`
`22`	`22`	`if ((accountIds && accountIds.length === 0) \|\| accountId) return null`
`23`	`23`	`return (`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ export const SelectAccount = ({ onClick }: SelectAccountProps) => {`
`25`	`25`	`const translate = useTranslate()`
`26`	`26`	`const history = useHistory()`
`27`	`27`	`const accountIds = useAppSelector(state =>`
`28`		`- selectAccountIdsByAssetId(state, location.state.assetId),`
	`28`	`+ selectAccountIdsByAssetId(state, { assetId: location.state.assetId }),`
`29`	`29`	`)`
`30`	`30`	`const asset = useAppSelector(state => selectAssetById(state, location.state.assetId))`
`31`	`31`	`return (`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ export const TradeInput = ({ history }: RouterProps) => {`
`63`	`63`	`} = useWallet()`
`64`	`64`
`65`	`65`	`const sellAssetBalance = useAppSelector(state =>`
`66`		`- selectPortfolioCryptoHumanBalanceByAssetId(state, sellAsset?.currency?.assetId),`
	`66`	`+ selectPortfolioCryptoHumanBalanceByAssetId(state, { assetId: sellAsset?.currency?.assetId }),`
`67`	`67`	`)`
`68`	`68`	`const hasValidTradeBalance = bnOrZero(sellAssetBalance).gte(bnOrZero(sellAsset?.amount))`
`69`	`69`	`const hasValidBalance = bnOrZero(sellAssetBalance).gt(0)`
`@@ -74,7 +74,9 @@ export const TradeInput = ({ history }: RouterProps) => {`
`74`	`74`	`: selectAssetById(state, 'eip155:1/slip44:60'),`
`75`	`75`	`)`
`76`	`76`	`const feeAssetBalance = useAppSelector(state =>`
`77`		`- feeAsset ? selectPortfolioCryptoHumanBalanceByAssetId(state, feeAsset?.assetId) : null,`
	`77`	`+ feeAsset`
	`78`	`+ ? selectPortfolioCryptoHumanBalanceByAssetId(state, { assetId: feeAsset?.assetId })`
	`79`	`+ : null,`
`78`	`80`	`)`
`79`	`81`
`80`	`82`	`// when trading from ETH, the value of TX in ETH is deducted`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ export const useSwapper = () => {`
`117`	`117`	`}, [])`
`118`	`118`
`119`	`119`	`const sellAssetBalance = useAppSelector(state =>`
`120`		`- selectPortfolioCryptoBalanceByAssetId(state, sellAsset?.currency?.assetId),`
	`120`	`+ selectPortfolioCryptoBalanceByAssetId(state, { assetId: sellAsset?.currency?.assetId }),`
`121`	`121`	`)`
`122`	`122`
`123`	`123`	`const getSendMaxAmount = async ({`