Move fioWallets under fio in UiState

peachbits · peachbits · commit 3b09883055e2 · 2025-12-09T14:40:03.000-08:00
diff --git a/src/__tests__/reducers/__snapshots__/RootReducer.test.ts.snap b/src/__tests__/reducers/__snapshots__/RootReducer.test.ts.snap
@@ -85,6 +85,7 @@ exports[`initialState 1`] = `
     },
     "fio": {
       "connectedWalletsByFioAddress": {},
+      "fioWallets": [],
     },
     "fioAddress": {
       "fioAddresses": [],
@@ -156,9 +157,6 @@ exports[`initialState 1`] = `
       "walletsSort": "manual",
     },
     "subcategories": [],
-    "wallets": {
-      "fioWallets": [],
-    },
   },
 }
 `;
diff --git a/src/actions/FioActions.tsx b/src/actions/FioActions.tsx
@@ -27,7 +27,7 @@ export const refreshConnectedWallets = async (
   getState: GetState
 ) => {
   const wallets: EdgeCurrencyWallet[] = []
-  const fioWallets: EdgeCurrencyWallet[] = getState().ui.wallets.fioWallets
+  const fioWallets: EdgeCurrencyWallet[] = getState().ui.fio.fioWallets
   const currencyWallets = getState().core.account.currencyWallets
   for (const walletId of Object.keys(currencyWallets)) {
     wallets.push(currencyWallets[walletId])
@@ -69,7 +69,7 @@ export function checkFioObtData(
     let loopCount = 0
     while (true) {
       account = state.core.account
-      fioWallets = state.ui.wallets.fioWallets
+      fioWallets = state.ui.fio.fioWallets
       if (account?.currencyConfig != null && fioWallets.length > 0) break
       if (loopCount++ > MAX_OBT_DATA_CHECKS) return
       await snooze(400)
diff --git a/src/actions/FioAddressActions.ts b/src/actions/FioAddressActions.ts
@@ -31,7 +31,7 @@ export function refreshAllFioAddresses(): ThunkAction<Promise<void>> {
     })
     const state = getState()
     const { currencyWallets } = state.core.account
-    const fioWallets: EdgeCurrencyWallet[] = state.ui.wallets.fioWallets
+    const fioWallets: EdgeCurrencyWallet[] = state.ui.fio.fioWallets
 
     const { fioAddresses, fioDomains, fioWalletsById } = await refreshFioNames(
       fioWallets
diff --git a/src/components/FioAddress/FioActionSubmit.tsx b/src/components/FioAddress/FioActionSubmit.tsx
@@ -354,7 +354,7 @@ export function FioActionSubmit(props: OwnProps): React.ReactElement {
     state =>
       selectDisplayDenom(state, props.fioWallet.currencyConfig, null).multiplier
   )
-  const fioWallets = useSelector(state => state.ui.wallets.fioWallets)
+  const fioWallets = useSelector(state => state.ui.fio.fioWallets)
 
   return (
     <FioActionSubmitComponent
diff --git a/src/components/scenes/Fio/FioAddressDetailsScene.tsx b/src/components/scenes/Fio/FioAddressDetailsScene.tsx
@@ -201,7 +201,7 @@ const getStyles = cacheStyles((theme: Theme) => ({
 
 export const FioAddressDetailsScene = connect<StateProps, unknown, OwnProps>(
   state => ({
-    fioWallets: state.ui.wallets.fioWallets
+    fioWallets: state.ui.fio.fioWallets
   }),
   dispatch => ({})
 )(withTheme(FioAddressDetails))
diff --git a/src/components/scenes/Fio/FioAddressListScene.tsx b/src/components/scenes/Fio/FioAddressListScene.tsx
@@ -264,7 +264,7 @@ export const FioAddressListScene = connect<StateProps, DispatchProps, OwnProps>(
   state => ({
     fioAddresses: state.ui.fioAddress.fioAddresses,
     fioDomains: state.ui.fioAddress.fioDomains,
-    fioWallets: state.ui.wallets.fioWallets,
+    fioWallets: state.ui.fio.fioWallets,
     loading: state.ui.fioAddress.fioAddressesLoading,
     isConnected: state.network.isConnected
   }),
diff --git a/src/components/scenes/Fio/FioAddressRegisterScene.tsx b/src/components/scenes/Fio/FioAddressRegisterScene.tsx
@@ -667,7 +667,7 @@ export const FioAddressRegisterScene = connect<
   OwnProps
 >(
   state => ({
-    fioWallets: state.ui.wallets.fioWallets,
+    fioWallets: state.ui.fio.fioWallets,
     fioPlugin: state.core.account.currencyConfig.fio ?? typeHack,
     isConnected: state.network.isConnected
   }),
diff --git a/src/components/scenes/Fio/FioAddressRegisterSelectWalletScene.tsx b/src/components/scenes/Fio/FioAddressRegisterSelectWalletScene.tsx
@@ -384,7 +384,7 @@ const FioAddressRegisterSelectWalletConnected = connect<
     const { wallet } = ownProps
     return {
       account: state.core.account,
-      fioWallets: state.ui.wallets.fioWallets,
+      fioWallets: state.ui.fio.fioWallets,
       fioPlugin: state.core.account.currencyConfig.fio,
       fioDisplayDenomination: selectDisplayDenom(
         state,
diff --git a/src/components/scenes/Fio/FioDomainRegisterScene.tsx b/src/components/scenes/Fio/FioDomainRegisterScene.tsx
@@ -394,7 +394,7 @@ export const FioDomainRegisterScene = connect<
   OwnProps
 >(
   state => ({
-    fioWallets: state.ui.wallets.fioWallets,
+    fioWallets: state.ui.fio.fioWallets,
     fioPlugin: state.core.account.currencyConfig.fio ?? typeHack,
     isConnected: state.network.isConnected
   }),
diff --git a/src/components/scenes/Fio/FioDomainRegisterSelectWalletScene.tsx b/src/components/scenes/Fio/FioDomainRegisterSelectWalletScene.tsx
@@ -365,7 +365,7 @@ const FioDomainRegisterSelectWalletConnected = connect<
 >(
   (state, ownProps) => ({
     account: state.core.account,
-    fioWallets: state.ui.wallets.fioWallets,
+    fioWallets: state.ui.fio.fioWallets,
     fioPlugin: state.core.account.currencyConfig.fio,
     fioDisplayDenomination: selectDisplayDenom(
       state,
diff --git a/src/components/scenes/Fio/FioRequestConfirmationScene.tsx b/src/components/scenes/Fio/FioRequestConfirmationScene.tsx
@@ -524,7 +524,7 @@ export const FioRequestConfirmationScene = withWallet((ownProps: OwnProps) => {
       defaultIsoFiat
     )
   )
-  const fioWallets = useSelector(state => state.ui.wallets.fioWallets)
+  const fioWallets = useSelector(state => state.ui.fio.fioWallets)
   const isConnected = useSelector(state => state.network.isConnected)
 
   const exchangeDenomination = getExchangeDenom(wallet.currencyConfig, tokenId)
diff --git a/src/components/scenes/Fio/FioRequestListScene.tsx b/src/components/scenes/Fio/FioRequestListScene.tsx
@@ -769,7 +769,7 @@ const getStyles = cacheStyles((theme: Theme) => ({
 export const FioRequestListScene = connect<StateProps, DispatchProps, OwnProps>(
   state => ({
     account: state.core.account,
-    fioWallets: state.ui.wallets.fioWallets,
+    fioWallets: state.ui.fio.fioWallets,
     fioAddresses: state.ui.fioAddress.fioAddresses,
     currencyWallets: state.core.account.currencyWallets,
     isConnected: state.network.isConnected
diff --git a/src/components/themed/SendFromFioRows.tsx b/src/components/themed/SendFromFioRows.tsx
@@ -316,7 +316,7 @@ export const SendFromFioRows = connect<StateProps, DispatchProps, OwnProps>(
   state => {
     return {
       fioAddresses: state.ui.fioAddress.fioAddresses,
-      fioWallets: state.ui.wallets.fioWallets
+      fioWallets: state.ui.fio.fioWallets
     }
   },
   dispatch => ({
diff --git a/src/reducers/FioReducer.ts b/src/reducers/FioReducer.ts
@@ -1,3 +1,4 @@
+import type { EdgeCurrencyWallet } from 'edge-core-js'
 import type { Reducer } from 'redux'
 
 import type { Action } from '../types/reduxActions'
@@ -9,10 +10,12 @@ export type CcWalletMap = Record<string, string>
 
 export interface FioState {
   connectedWalletsByFioAddress: Record<string, CcWalletMap>
+  fioWallets: EdgeCurrencyWallet[]
 }
 
 const initialState: FioState = {
-  connectedWalletsByFioAddress: {}
+  connectedWalletsByFioAddress: {},
+  fioWallets: []
 }
 
 export const fio: Reducer<FioState, Action> = (
@@ -31,6 +34,13 @@ export const fio: Reducer<FioState, Action> = (
         connectedWalletsByFioAddress
       }
     }
+    case 'UPDATE_FIO_WALLETS': {
+      const { fioWallets } = action.data
+      return {
+        ...state,
+        fioWallets
+      }
+    }
     default:
       return state
   }
diff --git a/src/reducers/scenes/WalletsReducer.ts b/src/reducers/scenes/WalletsReducer.ts
diff --git a/src/reducers/uiReducer.ts b/src/reducers/uiReducer.ts
@@ -13,7 +13,6 @@ import {
   type FioAddressSceneState
 } from './scenes/FioAddressSceneReducer'
 import { settings, type SettingsState } from './scenes/SettingsReducer'
-import { wallets, type WalletsState } from './scenes/WalletsReducer'
 
 export interface UiState {
   readonly exchangeInfo: ExchangeInfo
@@ -23,7 +22,6 @@ export interface UiState {
   readonly settings: SettingsState
   readonly notificationHeight: number
   readonly subcategories: string[]
-  readonly wallets: WalletsState
   readonly countryCode: string
 }
 
@@ -52,9 +50,7 @@ const uiInner = combineReducers<UiState, Action>({
       default:
         return state
     }
-  },
-
-  wallets
+  }
 })
 
 export const ui: Reducer<UiState, Action> = (state, action: Action) => {

Original file line number	Diff line number	Diff line change
`@@ -354,7 +354,7 @@ export function FioActionSubmit(props: OwnProps): React.ReactElement {`
`354`	`354`	`state =>`
`355`	`355`	`selectDisplayDenom(state, props.fioWallet.currencyConfig, null).multiplier`
`356`	`356`	`)`
`357`		`- const fioWallets = useSelector(state => state.ui.wallets.fioWallets)`
	`357`	`+ const fioWallets = useSelector(state => state.ui.fio.fioWallets)`
`358`	`358`
`359`	`359`	`return (`
`360`	`360`	`<FioActionSubmitComponent`