7 files changed, 18 insertions, 83 deletions
diff --git a/src/state/models/media/image.ts b/src/state/models/media/image.ts
index 6a226484e..5c547c148 100644
--- a/src/state/models/media/image.ts
+++ b/src/state/models/media/image.ts
@@ -186,7 +186,7 @@ export class ImageModel implements Omit<RNImage, 'size'> {
         this.cropped = cropped
       })
     } catch (err) {
-      logger.error('Failed to crop photo', {error: err})
+      logger.error('Failed to crop photo', {message: err})
     }
   }
 
diff --git a/src/state/persisted/__tests__/migrate.test.ts b/src/state/persisted/__tests__/migrate.test.ts
index 2435ed24f..e4b55d5da 100644
--- a/src/state/persisted/__tests__/migrate.test.ts
+++ b/src/state/persisted/__tests__/migrate.test.ts
@@ -88,6 +88,6 @@ test('migrate: has legacy data, fails validation', async () => {
   expect(logger.error).toHaveBeenCalledWith(
     'persisted state: legacy data failed validation',
     // @ts-ignore
-    {error: validate.error},
+    {message: validate.error},
   )
 })
diff --git a/src/state/persisted/index.ts b/src/state/persisted/index.ts
index 67d8b78c6..2f34c2dbf 100644
--- a/src/state/persisted/index.ts
+++ b/src/state/persisted/index.ts
@@ -34,7 +34,7 @@ export async function init() {
     logger.log('persisted state: initialized')
   } catch (e) {
     logger.error('persisted state: failed to load root state from storage', {
-      error: e,
+      message: e,
     })
     // AsyncStorage failure, but we can still continue in memory
     return defaults
@@ -59,7 +59,7 @@ export async function write<K extends keyof Schema>(
     })
   } catch (e) {
     logger.error(`persisted state: failed writing root state to storage`, {
-      error: e,
+      message: e,
     })
   }
 }
@@ -89,7 +89,7 @@ async function onBroadcastMessage({data}: MessageEvent) {
       logger.error(
         `persisted state: failed handling update from broadcast channel`,
         {
-          error: e,
+          message: e,
         },
       )
     }
diff --git a/src/state/persisted/legacy.ts b/src/state/persisted/legacy.ts
index 097d6bc5c..6bb75ae86 100644
--- a/src/state/persisted/legacy.ts
+++ b/src/state/persisted/legacy.ts
@@ -127,34 +127,6 @@ export async function migrate() {
     const newData = await read()
     const alreadyMigrated = Boolean(newData)
 
-    /* TODO BEGIN DEBUG — remove this eventually */
-    try {
-      if (rawLegacyData) {
-        const legacy = JSON.parse(rawLegacyData) as Partial<LegacySchema>
-        logger.info(`persisted state: debug legacy data`, {
-          hasExistingLoggedInAccount: Boolean(legacy?.session?.data),
-          numberOfExistingAccounts: legacy?.session?.accounts?.length,
-          foundExistingCurrentAccount: Boolean(
-            legacy.session?.accounts?.find(
-              a => a.did === legacy.session?.data?.did,
-            ),
-          ),
-        })
-        logger.info(`persisted state: debug new data`, {
-          hasNewData: Boolean(newData),
-          hasExistingLoggedInAccount: Boolean(newData?.session?.currentAccount),
-          numberOfExistingAccounts: newData?.session?.accounts?.length,
-          existingAccountMatchesLegacy: Boolean(
-            newData?.session?.currentAccount?.did ===
-              legacy?.session?.data?.did,
-          ),
-        })
-      }
-    } catch (e: any) {
-      logger.error(e, {message: `persisted state: legacy debugging failed`})
-    }
-    /* TODO END DEBUG */
-
     if (!alreadyMigrated && rawLegacyData) {
       logger.info('persisted state: migrating legacy storage')
 
@@ -167,7 +139,7 @@ export async function migrate() {
         logger.info('persisted state: migrated legacy storage')
       } else {
         logger.error('persisted state: legacy data failed validation', {
-          error: validate.error,
+          message: validate.error,
         })
       }
     } else {
@@ -185,7 +157,7 @@ export async function clearLegacyStorage() {
     await AsyncStorage.removeItem(DEPRECATED_ROOT_STATE_STORAGE_KEY)
   } catch (e: any) {
     logger.error(`persisted legacy store: failed to clear`, {
-      error: e.toString(),
+      message: e.toString(),
     })
   }
 }
diff --git a/src/state/persisted/store.ts b/src/state/persisted/store.ts
index 04858fe5b..bb7fbed89 100644
--- a/src/state/persisted/store.ts
+++ b/src/state/persisted/store.ts
@@ -22,6 +22,6 @@ export async function clear() {
   try {
     await AsyncStorage.removeItem(BSKY_STORAGE)
   } catch (e: any) {
-    logger.error(`persisted store: failed to clear`, {error: e.toString()})
+    logger.error(`persisted store: failed to clear`, {message: e.toString()})
   }
 }
diff --git a/src/state/queries/actor-autocomplete.ts b/src/state/queries/actor-autocomplete.ts
index ba9f97004..f55424c9d 100644
--- a/src/state/queries/actor-autocomplete.ts
+++ b/src/state/queries/actor-autocomplete.ts
@@ -75,7 +75,7 @@ export function useActorAutocompleteFn() {
           })
         } catch (e) {
           logger.error('useActorSearch: searchActorsTypeahead failed', {
-            error: e,
+            message: e,
           })
         }
       }
diff --git a/src/state/session/index.tsx b/src/state/session/index.tsx
index 629aff6dc..ed2e6fcf1 100644
--- a/src/state/session/index.tsx
+++ b/src/state/session/index.tsx
@@ -138,9 +138,6 @@ function createPersistSessionHandler(
 
     logger.info(`session: persistSession`, {
       event,
-      did: refreshedAccount.did,
-      handle: refreshedAccount.handle,
-      service: refreshedAccount.service,
       deactivated: refreshedAccount.deactivated,
     })
 
@@ -217,10 +214,7 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
       verificationPhone,
       verificationCode,
     }: any) => {
-      logger.info(`session: creating account`, {
-        service,
-        handle,
-      })
+      logger.info(`session: creating account`)
       track('Try Create Account')
 
       const agent = new BskyAgent({service})
@@ -272,14 +266,7 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
       queryClient.clear()
       upsertAccount(account)
 
-      logger.debug(
-        `session: created account`,
-        {
-          service,
-          handle,
-        },
-        logger.DebugContext.session,
-      )
+      logger.debug(`session: created account`, {}, logger.DebugContext.session)
       track('Create Account')
     },
     [upsertAccount, queryClient, clearCurrentAccount],
@@ -287,14 +274,7 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
 
   const login = React.useCallback<ApiContext['login']>(
     async ({service, identifier, password}) => {
-      logger.debug(
-        `session: login`,
-        {
-          service,
-          identifier,
-        },
-        logger.DebugContext.session,
-      )
+      logger.debug(`session: login`, {}, logger.DebugContext.session)
 
       const agent = new BskyAgent({service})
 
@@ -329,14 +309,7 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
       queryClient.clear()
       upsertAccount(account)
 
-      logger.debug(
-        `session: logged in`,
-        {
-          service,
-          identifier,
-        },
-        logger.DebugContext.session,
-      )
+      logger.debug(`session: logged in`, {}, logger.DebugContext.session)
 
       track('Sign In', {resumedSession: false})
     },
@@ -360,14 +333,7 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
 
   const initSession = React.useCallback<ApiContext['initSession']>(
     async account => {
-      logger.debug(
-        `session: initSession`,
-        {
-          did: account.did,
-          handle: account.handle,
-        },
-        logger.DebugContext.session,
-      )
+      logger.debug(`session: initSession`, {}, logger.DebugContext.session)
 
       const agent = new BskyAgent({
         service: account.service,
@@ -435,7 +401,7 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
              * we handle that failure via `createPersistSessionHandler`
              */
             logger.info(`session: resumeSessionWithFreshAccount failed`, {
-              error: e,
+              message: e,
             })
 
             __globalAgent = PUBLIC_BSKY_AGENT
@@ -454,7 +420,7 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
            * we handle that failure via `createPersistSessionHandler`
            */
           logger.info(`session: resumeSessionWithFreshAccount failed`, {
-            error: e,
+            message: e,
           })
 
           __globalAgent = PUBLIC_BSKY_AGENT
@@ -497,7 +463,7 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
           await initSession(account)
         }
       } catch (e) {
-        logger.error(`session: resumeSession failed`, {error: e})
+        logger.error(`session: resumeSession failed`, {message: e})
       } finally {
         setState(s => ({
           ...s,
@@ -613,10 +579,7 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
       } else if (!session.currentAccount && state.currentAccount) {
         logger.debug(
           `session: persisted onUpdate, logging out`,
-          {
-            did: state.currentAccount?.did,
-            handle: state.currentAccount?.handle,
-          },
+          {},
           logger.DebugContext.session,
         )