Sync status

eslint.config.mjs

@@ -242,7 +242,6 @@ export default [
       'src/components/scenes/ChangePasswordScene.tsx',
       'src/components/scenes/ChangePinScene.tsx',
       'src/components/scenes/ChangeUsernameScene.tsx',
-      'src/components/scenes/CoinRankingDetailsScene.tsx',
 
       'src/components/scenes/ConfirmScene.tsx',
       'src/components/scenes/CreateWalletAccountSelectScene.tsx',
@@ -383,7 +382,7 @@ export default [
       'src/components/themed/Title.tsx',
       'src/components/themed/TransactionListComponents.tsx',
       'src/components/themed/TransactionListRow.tsx',
-      'src/components/themed/TransactionListTop.tsx',
+
       'src/components/themed/VectorIcon.tsx',
       'src/components/themed/WalletList.tsx',
 

src/__tests__/components/TransactionListTop.test.tsx

@@ -44,6 +44,7 @@ describe('TransactionListTop', () => {
     id: '123',
     name: 'wallet name',
     stakingStatus: { stakedAmounts: [] },
+    syncStatus: { totalRatio: 0.5 },
     type: 'wallet:bitcoin',
     watch() {}
   }
@@ -68,7 +69,6 @@ describe('TransactionListTop', () => {
           searching={false}
           tokenId={null}
           wallet={fakeWallet}
-          isLightAccount={false}
         />
       </FakeProviders>
     )
@@ -87,7 +87,6 @@ describe('TransactionListTop', () => {
           searching={false}
           tokenId={null}
           wallet={fakeWallet}
-          isLightAccount={false}
         />
       </FakeProviders>
     )

src/actions/scene/StakingActions.tsx

@@ -1,4 +1,3 @@
-import { add } from 'biggystring'
 import type { EdgeAccount, EdgeCurrencyWallet, EdgeTokenId } from 'edge-core-js'
 
 import { SPECIAL_CURRENCY_INFO } from '../../constants/WalletAndCurrencyConstants'
@@ -11,7 +10,6 @@ import type {
   StakePositionMap
 } from '../../reducers/StakingReducer'
 import type { ThunkAction } from '../../types/reduxTypes'
-import { getPositionAllocations } from '../../util/stakeUtils'
 import { datelog } from '../../util/utils'
 
 export const updateStakingState = (
@@ -37,7 +35,6 @@ export const updateStakingState = (
     const stakePlugins = await getStakePlugins(pluginId)
     const stakePolicyMap: StakePolicyMap = {}
 
-    let lockedNativeAmount = '0'
     const stakePositionMap: StakePositionMap = {}
     for (const stakePlugin of stakePlugins) {
       const stakePolicies = stakePlugin.getPolicies({
@@ -47,7 +44,6 @@ export const updateStakingState = (
       })
       for (const stakePolicy of stakePolicies) {
         stakePolicyMap[stakePolicy.stakePolicyId] = stakePolicy
-        let total: string | undefined
         try {
           const stakePosition = await stakePlugin.fetchStakePosition({
             stakePolicyId: stakePolicy.stakePolicyId,
@@ -56,28 +52,18 @@ export const updateStakingState = (
           })
 
           stakePositionMap[stakePolicy.stakePolicyId] = stakePosition
-          const { staked, earned } = getPositionAllocations(stakePosition)
-          total = [...staked, ...earned]
-            .filter(p => p.tokenId === tokenId && p.pluginId === pluginId)
-            .reduce((prev, curr) => add(prev, curr.nativeAmount), '0')
         } catch (err) {
           console.error(err)
           const { displayName } = stakePolicy.stakeProviderInfo
           datelog(`${displayName}: ${lstrings.stake_unable_to_query_locked}`)
           continue
         }
-
-        // Don't show liquid staking positions as locked amount
-        if (stakePolicy.isLiquidStaking !== true) {
-          lockedNativeAmount = add(lockedNativeAmount, total)
-        }
       }
     }
 
     dispatch({
       type: 'STAKING/SETUP',
       walletId,
-      lockedNativeAmount,
       stakePolicies: stakePolicyMap,
       stakePositionMap
     })

src/components/scenes/CoinRankingDetailsScene.tsx

@@ -28,7 +28,6 @@ import {
   filterStakePolicies,
   type StakePolicy
 } from '../../plugins/stake-plugins/types'
-import { defaultWalletStakingState } from '../../reducers/StakingReducer'
 import {
   getCoingeckoFiat,
   getDefaultFiat
@@ -140,7 +139,7 @@ const CoinRankingDetailsSceneComponent: React.FC<Props> = props => {
   const account = useSelector(state => state.core.account)
   const exchangeRates = useSelector(state => state.exchangeRates)
   const walletStakingStateMap = useSelector(
-    state => state.staking.walletStakingMap ?? defaultWalletStakingState
+    state => state.staking.walletStakingMap ?? {}
   )
   const countryCode = useSelector(state => state.ui.countryCode)
 
@@ -257,9 +256,11 @@ const CoinRankingDetailsSceneComponent: React.FC<Props> = props => {
         if (walletState != null && !walletState.isLoading) continue
         const tokenId = getTokenId(wallet.currencyConfig, currencyCode)
         if (tokenId !== undefined) {
-          dispatch(updateStakingState(tokenId, wallet)).catch(err => {
-            showError(err)
-          })
+          dispatch(updateStakingState(tokenId, wallet)).catch(
+            (error: unknown) => {
+              showError(error)
+            }
+          )
         }
       }
     }

src/components/scenes/WalletDetailsScene.tsx

@@ -161,8 +161,6 @@ const WalletDetailsComponent: React.FC<Props> = (props: Props) => {
     getExchangeRate(state.exchangeRates, pluginId, tokenId, defaultIsoFiat)
   )
   const spamFilterOn = useSelector(state => state.ui.settings.spamFilterOn)
-  const activeUsername = useSelector(state => state.core.account.username)
-  const isLightAccount = activeUsername == null
 
   // Watchers:
   const enabledTokenIds = useWatch(wallet, 'enabledTokenIds')
@@ -396,7 +394,6 @@ const WalletDetailsComponent: React.FC<Props> = (props: Props) => {
             searching={isSearching}
             tokenId={tokenId}
             wallet={wallet}
-            isLightAccount={isLightAccount}
           />
           <DividerLineUi4 extendRight />
           <InfoCardCarousel