Drop preferences/type.ts, move all types to preferences/db

There was a duplication of types between preferences/types and
preferences/db, mostly due to a missed duplication way back when the
preferences service was still being booted up. This commit eliminates
the duplication, harmonizes the types, and re-exports appropriate
external-facing types.

No underlying functionality has changed.

background/main.ts

@@ -153,7 +153,6 @@ import { selectActivitesHashesForEnrichment } from "./redux-slices/selectors"
 import { getActivityDetails } from "./redux-slices/utils/activities-utils"
 import { getRelevantTransactionAddresses } from "./services/enrichment/utils"
 import { AccountSignerWithId } from "./signing"
-import { AnalyticsPreferences } from "./services/preferences/types"
 import {
   AnyAssetMetadata,
   assetAmountToDesiredDecimals,
@@ -197,7 +196,7 @@ import {
 } from "./services/internal-signer"
 import { getPricePoint, getTokenPrices } from "./lib/prices"
 import { makeFlashbotsProviderCreator } from "./services/chain/serial-fallback-provider"
-import { DismissableItem } from "./services/preferences"
+import { AnalyticsPreferences, DismissableItem } from "./services/preferences"
 import { newPricePoints } from "./redux-slices/prices"
 
 // This sanitizer runs on store and action data before serializing for remote

background/redux-slices/ui.ts

@@ -4,8 +4,7 @@ import { AddressOnNetwork } from "../accounts"
 import { ETHEREUM } from "../constants"
 import { AnalyticsEvent, OneTimeAnalyticsEvent } from "../lib/posthog"
 import { EVMNetwork } from "../networks"
-import { DismissableItem } from "../services/preferences"
-import { AnalyticsPreferences } from "../services/preferences/types"
+import { AnalyticsPreferences, DismissableItem } from "../services/preferences"
 import { AccountSignerWithId } from "../signing"
 import { AccountSignerSettings } from "../ui"
 import { AccountState, addAddressNetwork } from "./accounts"

background/services/preferences/db.ts

@@ -6,7 +6,6 @@ import { AddressOnNetwork } from "../../accounts"
 import DEFAULT_PREFERENCES, { DEFAULT_AUTOLOCK_INTERVAL } from "./defaults"
 import { AccountSignerSettings } from "../../ui"
 import { AccountSignerWithId } from "../../signing"
-import { AnalyticsPreferences } from "./types"
 import { NETWORK_BY_CHAIN_ID } from "../../constants"
 import { UNIXTime } from "../../types"
 
@@ -45,21 +44,25 @@ const getNewUrlsForTokenList = (
   return newURLs
 }
 
-// The idea is to use this interface to describe the data structure stored in indexedDb
-// In the future this might also have a runtime type check capability, but it's good enough for now.
-// NOTE: Check if can be merged with preferences/types.ts
+export type TokenListPreferences = {
+  autoUpdate: boolean
+  urls: string[]
+}
+
+export type AnalyticsPreferences = {
+  isEnabled: boolean
+  hasDefaultOnBeenTurnedOn: boolean
+}
+
 export type Preferences = {
   id?: number
   savedAt: number
-  tokenLists: { autoUpdate: boolean; urls: string[] }
+  tokenLists: TokenListPreferences
   currency: FiatCurrency
   defaultWallet: boolean
-  currentAddress?: string
   selectedAccount: AddressOnNetwork
-  analytics: {
-    isEnabled: boolean
-    hasDefaultOnBeenTurnedOn: boolean
-  }
+  accountSignersSettings: AccountSignerSettings[]
+  analytics: AnalyticsPreferences
   autoLockInterval: UNIXTime
 }
 
@@ -143,19 +146,21 @@ export class PreferenceDatabase extends Dexie {
         tx
           .table("preferences")
           .toCollection()
-          .modify((storedPreferences: Preferences) => {
-            if (storedPreferences.currentAddress) {
-              // eslint-disable-next-line no-param-reassign
-              storedPreferences.selectedAccount = {
-                network: DEFAULT_PREFERENCES.selectedAccount.network,
-                address: storedPreferences.currentAddress,
+          .modify(
+            (storedPreferences: Preferences & { currentAddress?: string }) => {
+              if (storedPreferences.currentAddress) {
+                // eslint-disable-next-line no-param-reassign
+                storedPreferences.selectedAccount = {
+                  network: DEFAULT_PREFERENCES.selectedAccount.network,
+                  address: storedPreferences.currentAddress,
+                }
+              } else {
+                // eslint-disable-next-line no-param-reassign
+                storedPreferences.selectedAccount =
+                  DEFAULT_PREFERENCES.selectedAccount
               }
-            } else {
-              // eslint-disable-next-line no-param-reassign
-              storedPreferences.selectedAccount =
-                DEFAULT_PREFERENCES.selectedAccount
-            }
-          }),
+            },
+          ),
       )
 
     // Add the new default token list
@@ -424,7 +429,10 @@ export class PreferenceDatabase extends Dexie {
     this.on("populate", (tx: Transaction) => {
       // This could be tx.preferences but the typing for populate
       // is not generic so it does not know about the preferences table
-      tx.table("preferences").add(DEFAULT_PREFERENCES)
+      tx.table<Preferences, string>("preferences").add({
+        savedAt: Date.now(),
+        ...DEFAULT_PREFERENCES,
+      })
     })
   }
 

background/services/preferences/defaults.ts

@@ -1,10 +1,9 @@
 import { ETHEREUM, MINUTE, USD } from "../../constants"
 import { storageGatewayURL } from "../../lib/storage-gateway"
-import { Preferences } from "./types"
 
 export const DEFAULT_AUTOLOCK_INTERVAL = 60 * MINUTE
 
-const defaultPreferences: Preferences = {
+const defaultPreferences = {
   tokenLists: {
     autoUpdate: false,
     urls: [

background/services/preferences/index.ts

@@ -4,10 +4,12 @@ import { ServiceLifecycleEvents, ServiceCreatorFunction } from "../types"
 
 import {
   AnalyticsPreferences,
-  Preferences,
+  Preferences as DbPreferences,
   TokenListPreferences,
-} from "./types"
-import { DismissableItem, getOrCreateDB, PreferenceDatabase } from "./db"
+  DismissableItem,
+  getOrCreateDB,
+  PreferenceDatabase,
+} from "./db"
 import BaseService from "../base"
 import { normalizeEVMAddress } from "../../lib/utils"
 import { ETHEREUM, OPTIMISM, ARBITRUM_ONE } from "../../constants"
@@ -16,7 +18,14 @@ import { HexString, UNIXTime } from "../../types"
 import { AccountSignerSettings } from "../../ui"
 import { AccountSignerWithId } from "../../signing"
 
-export { ManuallyDismissableItem, SingleShotItem, DismissableItem } from "./db"
+export {
+  AnalyticsPreferences,
+  ManuallyDismissableItem,
+  SingleShotItem,
+  DismissableItem,
+} from "./db"
+
+export type Preferences = Omit<DbPreferences, "id" | "savedAt">
 
 type AddressBookEntry = {
   network: EVMNetwork