refactor: consolidate ACCOUNT_INIT_COMPLETE into LOGIN action

Eliminate the ACCOUNT_INIT_COMPLETE action by loading all settings upfront
and dispatching them in the LOGIN action. This enables immediate navigation
after login since all required state is available in Redux right away.

- Load synced and local settings in parallel before LOGIN dispatch
- Expand LOGIN action payload to include syncedSettings and localSettings
- Remove ACCOUNT_INIT_COMPLETE action type and AccountInitPayload
- Remove pinLoginEnabled from Redux, load locally in SettingsScene
- Remove togglePinLoginEnabled thunk from SettingsActions
- Update WalletsReducer to remove ACCOUNT_INIT_COMPLETE handling
- Update SpendingLimitsReducer to read from LOGIN payload
- Update PasswordReminderReducer to read from LOGIN payload
- Remove getFirstActiveWalletInfo (walletId/currencyCode no longer set at login)

Author: samholmes

eslint.config.mjs

@@ -491,9 +491,7 @@ export default [
       'src/plugins/stake-plugins/util/builder.ts',
       'src/reducers/ExchangeInfoReducer.ts',
       'src/reducers/NetworkReducer.ts',
-      'src/reducers/PasswordReminderReducer.ts',
 
-      'src/reducers/SpendingLimitsReducer.ts',
       'src/selectors/getCreateWalletList.ts',
       'src/selectors/SettingsSelectors.ts',
       'src/state/createStateProvider.tsx',

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

@@ -134,7 +134,6 @@ exports[`initialState 1`] = `
         "nonPasswordLoginsLimit": 4,
         "passwordUseCount": 0,
       },
-      "pinLoginEnabled": false,
       "preferredSwapPluginId": undefined,
       "preferredSwapPluginType": undefined,
       "rampLastCryptoSelection": undefined,

src/__tests__/spendingLimits.test.ts

@@ -14,12 +14,14 @@ describe('spendingLimits', () => {
   describe('when logging in', () => {
     it('should update', () => {
       const actual = spendingLimits(initialState, {
-        type: 'ACCOUNT_INIT_COMPLETE',
+        type: 'LOGIN',
         data: {
-          spendingLimits: {
-            transaction: {
-              isEnabled: false,
-              amount: 150
+          localSettings: {
+            spendingLimits: {
+              transaction: {
+                isEnabled: false,
+                amount: 150
+              }
             }
           }
         } as any

src/actions/LoginActions.tsx

@@ -1,8 +1,4 @@
-import type {
-  EdgeAccount,
-  EdgeCreateCurrencyWallet,
-  EdgeTokenId
-} from 'edge-core-js/types'
+import type { EdgeAccount, EdgeCreateCurrencyWallet } from 'edge-core-js/types'
 import {
   hasSecurityAlerts,
   refreshTouchId,
@@ -26,10 +22,6 @@ import { Airship, showError } from '../components/services/AirshipInstance'
 import { ENV } from '../env'
 import { getExperimentConfig } from '../experimentConfig'
 import { lstrings } from '../locales/strings'
-import {
-  type AccountInitPayload,
-  initialState
-} from '../reducers/scenes/SettingsReducer'
 import type { WalletCreateItem } from '../selectors/getCreateWalletList'
 import { config } from '../theme/appConfig'
 import type { Dispatch, GetState, ThunkAction } from '../types/reduxTypes'
@@ -56,28 +48,6 @@ import {
 const PER_WALLET_TIMEOUT = 5000
 const MIN_CREATE_WALLET_TIMEOUT = 20000
 
-function getFirstActiveWalletInfo(account: EdgeAccount): {
-  walletId: string
-  tokenId: EdgeTokenId
-} {
-  // Find the first wallet:
-  const [walletId] = account.activeWalletIds
-  const walletKey = account.allKeys.find(key => key.id === walletId)
-
-  // Find the matching currency code:
-  if (walletKey != null) {
-    for (const pluginId of Object.keys(account.currencyConfig)) {
-      const { currencyInfo } = account.currencyConfig[pluginId]
-      if (currencyInfo.walletType === walletKey.type) {
-        return { walletId, tokenId: null }
-      }
-    }
-  }
-
-  // The user has no wallets:
-  return { walletId: '', tokenId: null }
-}
-
 export function initializeAccount(
   navigation: NavigationBase,
   account: EdgeAccount
@@ -86,17 +56,25 @@ export function initializeAccount(
     const { newAccount } = account
     const rootNavigation = getRootNavigation(navigation)
 
-    // Log in as quickly as possible, but we do need the sort order:
-    const syncedSettings = await readSyncedSettings(account)
-    const { walletsSort } = syncedSettings
-    dispatch({ type: 'LOGIN', data: { account, walletSort: walletsSort } })
-    const referralPromise = dispatch(loadAccountReferral(account))
+    // Load all settings upfront so we can navigate immediately after LOGIN
+    const [syncedSettings, localSettings] = await Promise.all([
+      readSyncedSettings(account),
+      readLocalAccountSettings(account)
+    ])
 
-    // Track whether we showed a non-survey modal or some other interrupting UX.
-    // We don't want to pester the user with too many interrupting flows.
-    let hideSurvey = false
+    // Dispatch LOGIN with all settings - this enables immediate navigation
+    dispatch({
+      type: 'LOGIN',
+      data: {
+        account,
+        syncedSettings,
+        localSettings
+      }
+    })
 
-    // Account-type specific navigation and setup
+    const referralPromise = dispatch(loadAccountReferral(account))
+
+    // Navigate immediately - all settings are now in Redux
     if (newAccount) {
       await navigateToNewAccountFlow(
         rootNavigation,
@@ -112,6 +90,10 @@ export function initializeAccount(
 
     performance.mark('loginEnd', { detail: { isNewAccount: newAccount } })
 
+    // Track whether we showed a non-survey modal or some other interrupting UX.
+    // We don't want to pester the user with too many interrupting flows.
+    let hideSurvey = false
+
     // Show a notice for deprecated electrum server settings
     const pluginIdsNeedingUserAction: string[] = []
     for (const pluginId in account.currencyConfig) {
@@ -162,9 +144,6 @@ export function initializeAccount(
       hideSurvey = true
     }
 
-    const state = getState()
-    const { context } = state.core
-
     // Sign up for push notifications:
     dispatch(registerNotificationsV2()).catch((error: unknown) => {
       console.error(error)
@@ -174,77 +153,36 @@ export function initializeAccount(
     const filteredWalletInfos = walletInfos.map(({ keys, id, ...info }) => info)
     console.log('Wallet Infos:', filteredWalletInfos)
 
-    // Merge and prepare settings files:
-    const walletInfo = newAccount
-      ? undefined
-      : getFirstActiveWalletInfo(account)
-    let accountInitObject: AccountInitPayload = {
-      ...initialState,
-      account,
-      tokenId: walletInfo?.tokenId ?? null,
-      pinLoginEnabled: false,
-      walletId: walletInfo?.walletId ?? '',
-      walletsSort: 'manual'
-    }
-
-    try {
-      accountInitObject = { ...accountInitObject, ...syncedSettings }
-
-      const loadedLocalSettings = await readLocalAccountSettings(account)
-      accountInitObject = { ...accountInitObject, ...loadedLocalSettings }
-
-      for (const userInfo of context.localUsers) {
-        if (
-          userInfo.loginId === account.rootLoginId &&
-          userInfo.pinLoginEnabled
-        ) {
-          accountInitObject.pinLoginEnabled = true
-        }
+    // Run one-time migration to clean up denomination settings in background
+    migrateDenominationSettings(account, syncedSettings).catch(
+      (error: unknown) => {
+        console.log('Failed to migrate denomination settings:', error)
       }
+    )
 
-      // Use synced denomination settings directly (user customizations only).
-      // Default denominations are derived on-demand from currencyInfo via selectors.
-      accountInitObject.denominationSettings =
-        syncedSettings?.denominationSettings ?? {}
+    await dispatch(refreshAccountReferral())
 
-      dispatch({
-        type: 'ACCOUNT_INIT_COMPLETE',
-        data: { ...accountInitObject }
-      })
+    refreshTouchId(account).catch(() => {
+      // We have always failed silently here
+    })
 
-      // Run one-time migration to clean up denomination settings in background
-      migrateDenominationSettings(account, syncedSettings).catch(
-        (error: unknown) => {
-          console.log('Failed to migrate denomination settings:', error)
+    if (
+      await showNotificationPermissionReminder({
+        appName: config.appName,
+        onLogEvent(event, values) {
+          dispatch(logEvent(event, values))
+        },
+        onNotificationPermit(info) {
+          dispatch(updateNotificationSettings(info.notificationOptIns)).catch(
+            (error: unknown) => {
+              trackError(error, 'LoginScene:onLogin:setDeviceSettings')
+              console.error(error)
+            }
+          )
         }
-      )
-
-      await dispatch(refreshAccountReferral())
-
-      refreshTouchId(account).catch(() => {
-        // We have always failed silently here
       })
-
-      if (
-        await showNotificationPermissionReminder({
-          appName: config.appName,
-          onLogEvent(event, values) {
-            dispatch(logEvent(event, values))
-          },
-          onNotificationPermit(info) {
-            dispatch(updateNotificationSettings(info.notificationOptIns)).catch(
-              (error: unknown) => {
-                trackError(error, 'LoginScene:onLogin:setDeviceSettings')
-                console.error(error)
-              }
-            )
-          }
-        })
-      ) {
-        hideSurvey = true
-      }
-    } catch (error: unknown) {
-      showError(error)
+    ) {
+      hideSurvey = true
     }
 
     // Post login stuff: Survey modal (existing accounts only)

src/actions/SettingsActions.tsx

@@ -224,40 +224,6 @@ export function setDenominationKeyRequest(
   }
 }
 
-export function togglePinLoginEnabled(
-  pinLoginEnabled: boolean
-): ThunkAction<Promise<unknown>> {
-  return async (dispatch, getState) => {
-    const state = getState()
-    const { context, account } = state.core
-
-    dispatch({
-      type: 'UI/SETTINGS/TOGGLE_PIN_LOGIN_ENABLED',
-      data: { pinLoginEnabled }
-    })
-    return await account
-      .changePin({ enableLogin: pinLoginEnabled })
-      .catch(async (error: unknown) => {
-        showError(error)
-
-        let pinLoginEnabled = false
-        for (const userInfo of context.localUsers) {
-          if (
-            userInfo.loginId === account.rootLoginId &&
-            userInfo.pinLoginEnabled
-          ) {
-            pinLoginEnabled = true
-          }
-        }
-
-        dispatch({
-          type: 'UI/SETTINGS/TOGGLE_PIN_LOGIN_ENABLED',
-          data: { pinLoginEnabled }
-        })
-      })
-  }
-}
-
 export async function showReEnableOtpModal(
   account: EdgeAccount
 ): Promise<void> {

src/components/scenes/SettingsScene.tsx

@@ -28,8 +28,7 @@ import { logoutRequest } from '../../actions/LoginActions'
 import {
   setAutoLogoutTimeInSecondsRequest,
   showReEnableOtpModal,
-  showUnlockSettingsModal,
-  togglePinLoginEnabled
+  showUnlockSettingsModal
 } from '../../actions/SettingsActions'
 import { ENV } from '../../env'
 import { useAsyncEffect } from '../../hooks/useAsyncEffect'
@@ -75,9 +74,6 @@ export const SettingsScene: React.FC<Props> = props => {
     state => state.ui.settings.developerModeOn
   )
   const isLocked = useSelector(state => state.ui.settings.changesLocked)
-  const pinLoginEnabled = useSelector(
-    state => state.ui.settings.pinLoginEnabled
-  )
   const spamFilterOn = useSelector(state => state.ui.settings.spamFilterOn)
 
   const account = useSelector(state => state.core.account)
@@ -121,6 +117,15 @@ export const SettingsScene: React.FC<Props> = props => {
   const context = useSelector(state => state.core.context)
   const logSettings = useWatch(context, 'logSettings')
 
+  // Load pin login state locally (not from Redux) and make it mutable
+  const [pinLoginEnabled, setPinLoginEnabled] = React.useState<boolean>(
+    () =>
+      context?.localUsers?.some(
+        userInfo =>
+          userInfo.loginId === account.rootLoginId && userInfo.pinLoginEnabled
+      ) ?? false
+  )
+
   const [localContactPermissionOn, setLocalContactsPermissionOn] =
     React.useState(false)
   const [isDarkTheme, setIsDarkTheme] = React.useState(
@@ -222,7 +227,15 @@ export const SettingsScene: React.FC<Props> = props => {
   })
 
   const handleTogglePinLoginEnabled = useHandler(async () => {
-    await dispatch(togglePinLoginEnabled(!pinLoginEnabled))
+    const newValue = !pinLoginEnabled
+    setPinLoginEnabled(newValue)
+    try {
+      await account.changePin({ enableLogin: newValue })
+    } catch (error: unknown) {
+      // Revert on error
+      setPinLoginEnabled(!newValue)
+      showError(error)
+    }
   })
 
   const handleToggleDarkTheme = useHandler(async () => {
@@ -554,22 +567,22 @@ export const SettingsScene: React.FC<Props> = props => {
               onPress={handleDefaultFiat}
             />
 
-            {isLightAccount ? null : (
+            {!isLightAccount ? (
               <SettingsSwitchRow
                 key="pinRelogin"
                 label={lstrings.settings_title_pin_login}
                 value={pinLoginEnabled}
                 onPress={handleTogglePinLoginEnabled}
               />
-            )}
-            {supportsTouchId && !isLightAccount && touchIdEnabled != null && (
+            ) : null}
+            {supportsTouchId && !isLightAccount && touchIdEnabled != null ? (
               <SettingsSwitchRow
                 key="useTouchID"
                 label={touchIdText}
                 value={touchIdEnabled}
                 onPress={handleUpdateTouchId}
               />
-            )}
+            ) : null}
 
             <SettingsSwitchRow
               label={lstrings.settings_button_contacts_access_permission}