Remove selectedWalletId and selectedTokenId

Oh selectedTokenId, many may not know your name

Author: peachbits

src/__tests__/reducers/__snapshots__/RootReducer.test.ts.snap

@@ -158,8 +158,6 @@ exports[`initialState 1`] = `
     "subcategories": [],
     "wallets": {
       "fioWallets": [],
-      "selectedTokenId": null,
-      "selectedWalletId": "",
     },
   },
 }

src/actions/WalletActions.tsx

@@ -76,9 +76,6 @@ export function selectWalletToken({
     const currencyCode = getCurrencyCode(wallet, tokenId)
     dispatch(updateMostRecentWalletsSelected(walletId, tokenId))
 
-    const currentWalletId = state.ui.wallets.selectedWalletId
-    const currentWalletTokenId = state.ui.wallets.selectedTokenId
-
     if (tokenId != null) {
       const { unactivatedTokenIds } = wallet
       if (
@@ -89,12 +86,7 @@ export function selectWalletToken({
         await dispatch(activateWalletTokens(navigation, wallet, [tokenId]))
         return false
       }
-      if (walletId !== currentWalletId || tokenId !== currentWalletTokenId) {
-        dispatch({
-          type: 'UI/WALLETS/SELECT_WALLET',
-          data: { walletId, tokenId }
-        })
-      }
+
       return true
     }
 
@@ -103,24 +95,14 @@ export function selectWalletToken({
     )
     if (isAccountActivationRequired) {
       // activation-required wallets need different path in case not activated yet
-      if (
-        alwaysActivate ||
-        walletId !== currentWalletId ||
-        tokenId !== currentWalletTokenId
-      ) {
+      if (alwaysActivate) {
         return await dispatch(
           selectActivationRequiredWallet(navigation, walletId, currencyCode)
         )
       }
       return true
     }
 
-    if (walletId !== currentWalletId || tokenId !== currentWalletTokenId) {
-      dispatch({
-        type: 'UI/WALLETS/SELECT_WALLET',
-        data: { walletId, tokenId }
-      })
-    }
     return true
   }
 }
@@ -139,10 +121,6 @@ function selectActivationRequiredWallet(
 
     if (publicAddress !== '') {
       // already activated
-      dispatch({
-        type: 'UI/WALLETS/SELECT_WALLET',
-        data: { walletId, tokenId: null }
-      })
       return true
     } else {
       // not activated yet

src/reducers/scenes/WalletsReducer.ts

@@ -4,48 +4,9 @@ import { combineReducers, type Reducer } from 'redux'
 import type { Action } from '../../types/reduxTypes'
 
 export interface WalletsState {
-  selectedWalletId: string
-  selectedTokenId: EdgeTokenId
   fioWallets: EdgeCurrencyWallet[]
 }
 
-const selectedWalletId = (state = '', action: Action): string => {
-  switch (action.type) {
-    case 'UI/WALLETS/SELECT_WALLET': {
-      return action.data.walletId
-    }
-
-    case 'ACCOUNT_INIT_COMPLETE': {
-      if (action.data == null) throw new TypeError('Invalid action')
-      if (action.data.walletId === '') return state
-      return action.data.walletId
-    }
-
-    default:
-      return state
-  }
-}
-
-const selectedTokenId = (
-  state: EdgeTokenId = null,
-  action: Action
-): EdgeTokenId => {
-  switch (action.type) {
-    case 'UI/WALLETS/SELECT_WALLET': {
-      return action.data.tokenId
-    }
-
-    case 'ACCOUNT_INIT_COMPLETE': {
-      if (action.data == null) throw new TypeError('Invalid action')
-      if (action.data.tokenId === '') return state
-      return action.data.tokenId
-    }
-
-    default:
-      return state
-  }
-}
-
 const fioWallets: Reducer<WalletsState['fioWallets'], Action> = (
   state = [],
   action
@@ -62,7 +23,5 @@ const fioWallets: Reducer<WalletsState['fioWallets'], Action> = (
 }
 
 export const wallets = combineReducers<WalletsState, Action>({
-  selectedWalletId,
-  selectedTokenId,
   fioWallets
 })

src/selectors/WalletSelectors.ts

@@ -10,12 +10,6 @@ import type { GuiExchangeRates } from '../actions/ExchangeRateActions'
 import type { RootState } from '../types/reduxTypes'
 import { convertNativeToExchange, zeroString } from '../util/utils'
 
-export function getSelectedCurrencyWallet(
-  state: RootState
-): EdgeCurrencyWallet {
-  return state.core.account.currencyWallets[state.ui.wallets.selectedWalletId]
-}
-
 export const getActiveWalletCurrencyInfos = (
   currencyWallets: Record<string, EdgeCurrencyWallet>
 ): EdgeCurrencyInfo[] => {

src/types/reduxActions.ts

@@ -4,8 +4,7 @@ import type {
   EdgeContext,
   EdgeCurrencyWallet,
   EdgeDenomination,
-  EdgeSwapPluginType,
-  EdgeTokenId
+  EdgeSwapPluginType
 } from 'edge-core-js'
 
 import type { ExchangeInfo } from '../actions/ExchangeInfoActions'
@@ -159,10 +158,6 @@ export type Action =
       data: { pinLoginEnabled: boolean }
     }
   | { type: 'UI/SETTINGS/UPDATE_SETTINGS'; data: { settings: SettingsState } }
-  | {
-      type: 'UI/WALLETS/SELECT_WALLET'
-      data: { tokenId: EdgeTokenId; walletId: string }
-    }
   | { type: 'UI/SET_COUNTRY_CODE'; data: { countryCode: string | undefined } }
   | {
       type: 'UI/SET_NOTIFICATION_HEIGHT'