diff options
author | Samuel Newman <mozzius@protonmail.com> | 2024-07-24 20:09:20 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-07-24 20:09:20 +0100 |
commit | cfb8a3160e0092990bafd05cb97006720400448a (patch) | |
tree | 0e7b6fe5bc4e3e3d9ee25e228de228d24b78de40 /src/lib | |
parent | 9bd8393685cb6f2640dd33ee5707f3cb710f1365 (diff) | |
download | voidsky-cfb8a3160e0092990bafd05cb97006720400448a.tar.zst |
Priority notifications (#4798)
* new settings screen * bring back the spinner * add experimental language * fix typo, change leading * integrate priority notifications API * update package * use refetch instead of invalidateQueries * fix read-after-write issue by polling for update * add spinner for initial load * rm onmutate, it's overcomplicated * set error state eagerly * Change language in description Co-authored-by: Hailey <me@haileyok.com> * prettier * add `Toggle.Platform` * extract out mutation hook + error state * rm useless cache mutation * disambiguate isError and isPending * rm unused isError --------- Co-authored-by: Samuel Newman <10959775+mozzius@users.noreply.github.com> Co-authored-by: Hailey <me@haileyok.com>
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/async/until.ts | 10 | ||||
-rw-r--r-- | src/lib/routes/types.ts | 15 |
2 files changed, 12 insertions, 13 deletions
diff --git a/src/lib/async/until.ts b/src/lib/async/until.ts index db53c9218..1b7a57633 100644 --- a/src/lib/async/until.ts +++ b/src/lib/async/until.ts @@ -1,10 +1,10 @@ import {timeout} from './timeout' -export async function until( +export async function until<T>( retries: number, delay: number, - cond: (v: any, err: any) => boolean, - fn: () => Promise<any>, + cond: (v: T, err: any) => boolean, + fn: () => Promise<T>, ): Promise<boolean> { while (retries > 0) { try { @@ -13,7 +13,9 @@ export async function until( return true } } catch (e: any) { - if (cond(undefined, e)) { + // TODO: change the type signature of cond to accept undefined + // however this breaks every existing usage of until -sfn + if (cond(undefined as unknown as T, e)) { return true } } diff --git a/src/lib/routes/types.ts b/src/lib/routes/types.ts index bda93fb40..fbb66c9e9 100644 --- a/src/lib/routes/types.ts +++ b/src/lib/routes/types.ts @@ -42,14 +42,13 @@ export type CommonNavigatorParams = { Hashtag: {tag: string; author?: string} MessagesConversation: {conversation: string; embed?: string} MessagesSettings: undefined + NotificationsSettings: undefined Feeds: undefined Start: {name: string; rkey: string} StarterPack: {name: string; rkey: string; new?: boolean} StarterPackShort: {code: string} StarterPackWizard: undefined - StarterPackEdit: { - rkey?: string - } + StarterPackEdit: {rkey?: string} } export type BottomTabNavigatorParams = CommonNavigatorParams & { @@ -69,7 +68,7 @@ export type SearchTabNavigatorParams = CommonNavigatorParams & { } export type NotificationsTabNavigatorParams = CommonNavigatorParams & { - Notifications: undefined + Notifications: {show?: 'all'} } export type MyProfileTabNavigatorParams = CommonNavigatorParams & { @@ -84,7 +83,7 @@ export type FlatNavigatorParams = CommonNavigatorParams & { Home: undefined Search: {q?: string} Feeds: undefined - Notifications: undefined + Notifications: {show?: 'all'} Hashtag: {tag: string; author?: string} Messages: {pushToConversation?: string; animation?: 'push' | 'pop'} } @@ -96,7 +95,7 @@ export type AllNavigatorParams = CommonNavigatorParams & { Search: {q?: string} Feeds: undefined NotificationsTab: undefined - Notifications: undefined + Notifications: {show?: 'all'} MyProfileTab: undefined Hashtag: {tag: string; author?: string} MessagesTab: undefined @@ -105,9 +104,7 @@ export type AllNavigatorParams = CommonNavigatorParams & { StarterPack: {name: string; rkey: string; new?: boolean} StarterPackShort: {code: string} StarterPackWizard: undefined - StarterPackEdit: { - rkey?: string - } + StarterPackEdit: {rkey?: string} } // NOTE |