From 7c10cc08c5e66aa13413f862e1bf68e5482fa7a5 Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Tue, 17 Jan 2023 21:02:28 +0800 Subject: [PATCH 1/3] Mark emails as validating if no data returned --- .../web/lib/networking/queries/useGetNewsletterEmailsQuery.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/web/lib/networking/queries/useGetNewsletterEmailsQuery.tsx b/packages/web/lib/networking/queries/useGetNewsletterEmailsQuery.tsx index 2020c21ab..a8c57cdd4 100644 --- a/packages/web/lib/networking/queries/useGetNewsletterEmailsQuery.tsx +++ b/packages/web/lib/networking/queries/useGetNewsletterEmailsQuery.tsx @@ -64,7 +64,7 @@ export function useGetNewsletterEmailsQuery(): NewsletterEmailsQueryResponse { console.log('error', error) } return { - isValidating: false, + isValidating: true, emailAddresses: [], // eslint-disable-next-line @typescript-eslint/no-empty-function revalidate: () => {}, From 2f8cdaec05d390eff29964baeff2f58d2d89813f Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Tue, 17 Jan 2023 21:27:43 +0800 Subject: [PATCH 2/3] Set link colors --- packages/web/pages/settings/emails.tsx | 3 +++ packages/web/pages/settings/subscriptions.tsx | 3 +++ 2 files changed, 6 insertions(+) diff --git a/packages/web/pages/settings/emails.tsx b/packages/web/pages/settings/emails.tsx index 389cfc0a6..bb0e4ea36 100644 --- a/packages/web/pages/settings/emails.tsx +++ b/packages/web/pages/settings/emails.tsx @@ -134,6 +134,9 @@ export default function EmailsPage(): JSX.Element { css={{ my: '5px', fontSize: '11px', + a: { + color: '$omnivoreCtaYellow', + }, }} > {`created ${formattedShortDate(email.createdAt)}, `} diff --git a/packages/web/pages/settings/subscriptions.tsx b/packages/web/pages/settings/subscriptions.tsx index 25212657a..8c4538ecf 100644 --- a/packages/web/pages/settings/subscriptions.tsx +++ b/packages/web/pages/settings/subscriptions.tsx @@ -56,6 +56,9 @@ export default function SubscriptionsPage(): JSX.Element { css={{ my: '5px', fontSize: '11px', + a: { + color: '$omnivoreCtaYellow', + }, }} > {`Last received ${formattedShortDate( From 02a31890fe407ccf297e238fd9f54ee44b670514 Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Tue, 17 Jan 2023 22:29:22 +0800 Subject: [PATCH 3/3] Handle empty email and subscription lists --- packages/web/pages/settings/emails.tsx | 3 +++ packages/web/pages/settings/subscriptions.tsx | 3 +++ 2 files changed, 6 insertions(+) diff --git a/packages/web/pages/settings/emails.tsx b/packages/web/pages/settings/emails.tsx index bb0e4ea36..ab432fdb4 100644 --- a/packages/web/pages/settings/emails.tsx +++ b/packages/web/pages/settings/emails.tsx @@ -107,6 +107,9 @@ export default function EmailsPage(): JSX.Element { } const sortedEmailAddresses = useMemo(() => { + if (!emailAddresses) { + return [] + } return emailAddresses.sort((a, b) => a.createdAt.localeCompare(b.createdAt)) }, [emailAddresses]) diff --git a/packages/web/pages/settings/subscriptions.tsx b/packages/web/pages/settings/subscriptions.tsx index 8c4538ecf..ee0bab5f4 100644 --- a/packages/web/pages/settings/subscriptions.tsx +++ b/packages/web/pages/settings/subscriptions.tsx @@ -31,6 +31,9 @@ export default function SubscriptionsPage(): JSX.Element { } const sortedSubscriptions = useMemo(() => { + if (!subscriptions) { + return [] + } return subscriptions.sort((a, b) => b.updatedAt.localeCompare(a.updatedAt)) }, [subscriptions])