Merge branch 'main' into web-layout
This commit is contained in:
@@ -0,0 +1,10 @@
|
||||
diff --git a/node_modules/@lingui/core/dist/index.mjs b/node_modules/@lingui/core/dist/index.mjs
|
||||
index 9759736..881f67b 100644
|
||||
--- a/node_modules/@lingui/core/dist/index.mjs
|
||||
+++ b/node_modules/@lingui/core/dist/index.mjs
|
||||
@@ -1,4 +1,4 @@
|
||||
-import unraw from 'unraw';
|
||||
+import { unraw } from 'unraw';
|
||||
import { compileMessage } from '@lingui/message-utils/compileMessage';
|
||||
|
||||
const isString = (s) => typeof s === "string";
|
||||
@@ -26,7 +26,7 @@ test('migrate: fresh install', async () => {
|
||||
|
||||
expect(AsyncStorage.getItem).toHaveBeenCalledWith('root')
|
||||
expect(read).toHaveBeenCalledTimes(1)
|
||||
expect(logger.log).toHaveBeenCalledWith(
|
||||
expect(logger.info).toHaveBeenCalledWith(
|
||||
'persisted state: no migration needed',
|
||||
)
|
||||
})
|
||||
@@ -38,7 +38,7 @@ test('migrate: fresh install, existing new storage', async () => {
|
||||
|
||||
expect(AsyncStorage.getItem).toHaveBeenCalledWith('root')
|
||||
expect(read).toHaveBeenCalledTimes(1)
|
||||
expect(logger.log).toHaveBeenCalledWith(
|
||||
expect(logger.info).toHaveBeenCalledWith(
|
||||
'persisted state: no migration needed',
|
||||
)
|
||||
})
|
||||
@@ -68,7 +68,7 @@ test('migrate: has legacy data', async () => {
|
||||
await migrate()
|
||||
|
||||
expect(write).toHaveBeenCalledWith(transform(fixtures.LEGACY_DATA_DUMP))
|
||||
expect(logger.log).toHaveBeenCalledWith(
|
||||
expect(logger.info).toHaveBeenCalledWith(
|
||||
'persisted state: migrated legacy storage',
|
||||
)
|
||||
})
|
||||
|
||||
@@ -164,14 +164,14 @@ export async function migrate() {
|
||||
|
||||
if (validate.success) {
|
||||
await write(newData)
|
||||
logger.log('persisted state: migrated legacy storage')
|
||||
logger.info('persisted state: migrated legacy storage')
|
||||
} else {
|
||||
logger.error('persisted state: legacy data failed validation', {
|
||||
error: validate.error,
|
||||
})
|
||||
}
|
||||
} else {
|
||||
logger.log('persisted state: no migration needed')
|
||||
logger.info('persisted state: no migration needed')
|
||||
}
|
||||
} catch (e: any) {
|
||||
logger.error(e, {
|
||||
|
||||
@@ -272,7 +272,8 @@ export function usePinnedFeedsInfos(): {
|
||||
},
|
||||
})
|
||||
} catch (e) {
|
||||
logger.warn(`usePinnedFeedsInfos: failed to fetch ${uri}`, {
|
||||
// expected failure
|
||||
logger.info(`usePinnedFeedsInfos: failed to fetch ${uri}`, {
|
||||
error: e,
|
||||
})
|
||||
}
|
||||
|
||||
@@ -167,7 +167,7 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
|
||||
}
|
||||
broadcast.postMessage({event: unreadCountStr})
|
||||
} catch (e) {
|
||||
logger.error('Failed to check unread notifications', {error: e})
|
||||
logger.warn('Failed to check unread notifications', {error: e})
|
||||
}
|
||||
},
|
||||
|
||||
|
||||
Reference in New Issue
Block a user