diff --git a/packages/api/test/resolvers/subscriptions.test.ts b/packages/api/test/resolvers/subscriptions.test.ts
index 4eb8cba6a..75a21ef77 100644
--- a/packages/api/test/resolvers/subscriptions.test.ts
+++ b/packages/api/test/resolvers/subscriptions.test.ts
@@ -201,10 +201,10 @@ describe('Subscriptions API', () => {
}
}
`
- const user2 = await createTestUser('fakeUser2')
+ const user3 = await createTestUser('fakeUser3')
try {
await createTestSubscription(
- user2,
+ user3,
'sub_other',
undefined,
SubscriptionStatus.Unsubscribed,
@@ -222,7 +222,7 @@ describe('Subscriptions API', () => {
}))
)
} finally {
- deleteTestUser(user2.id)
+ deleteTestUser(user3.id)
}
})
diff --git a/packages/web/components/patterns/LibraryCards/LibraryGridCard.tsx b/packages/web/components/patterns/LibraryCards/LibraryGridCard.tsx
index c67705c52..0ba2db164 100644
--- a/packages/web/components/patterns/LibraryCards/LibraryGridCard.tsx
+++ b/packages/web/components/patterns/LibraryCards/LibraryGridCard.tsx
@@ -142,7 +142,7 @@ const GridImage = (props: GridImageProps): JSX.Element => {
{props.isLoading && (
@@ -150,7 +150,7 @@ const GridImage = (props: GridImageProps): JSX.Element => {
{(props.readingProgress ?? 0) > 0 && !props.isLoading && (
@@ -159,14 +159,14 @@ const GridImage = (props: GridImageProps): JSX.Element => {
) : (
{
return (
-
+
{
{props.item.title}
@@ -265,7 +265,7 @@ const LibraryGridCardContent = (props: LinkedItemCardProps): JSX.Element => {
css={{
...AuthorInfoStyle,
mt: '5px',
- mb: '20px',
+ mb: '15px',
}}
>
{props.item.author}
@@ -276,13 +276,13 @@ const LibraryGridCardContent = (props: LinkedItemCardProps): JSX.Element => {
{sortedLabels(props.item.labels).map(({ name, color }, index) => (
diff --git a/packages/web/components/templates/KeyboardShortcutListModal.tsx b/packages/web/components/templates/KeyboardShortcutListModal.tsx
index 3285446d8..79e90b765 100644
--- a/packages/web/components/templates/KeyboardShortcutListModal.tsx
+++ b/packages/web/components/templates/KeyboardShortcutListModal.tsx
@@ -76,12 +76,6 @@ const readerCommands = () => {
shortcutKeyDescription: 'f',
callback: () => {},
},
- {
- shortcutKeys: ['escape'],
- actionDescription: 'End multi select',
- shortcutKeyDescription: 'Escape',
- callback: () => {},
- },
{
actionDescription: 'Return to library',
shortcutKeys: ['u'],
diff --git a/packages/web/components/templates/homeFeed/EmptyLibrary.tsx b/packages/web/components/templates/homeFeed/EmptyLibrary.tsx
index 92e04e1da..7e342ef24 100644
--- a/packages/web/components/templates/homeFeed/EmptyLibrary.tsx
+++ b/packages/web/components/templates/homeFeed/EmptyLibrary.tsx
@@ -101,7 +101,8 @@ export const ErrorBox = (props: HelpMessageProps) => {
fontFamily: '$inter',
fontWeight: '500',
color: '$thTextContrast',
- padding: '10px',
+ py: '10px',
+ px: '15px',
'@smDown': {
width: '100%',
},
diff --git a/packages/web/components/templates/homeFeed/HomeFeedContainer.tsx b/packages/web/components/templates/homeFeed/HomeFeedContainer.tsx
index 338e3e833..65c1bb689 100644
--- a/packages/web/components/templates/homeFeed/HomeFeedContainer.tsx
+++ b/packages/web/components/templates/homeFeed/HomeFeedContainer.tsx
@@ -938,7 +938,7 @@ function HomeFeedGrid(props: HomeFeedContentProps): JSX.Element {
const { viewerData } = useGetViewerQuery()
const [layout, setLayout] = usePersistedState({
key: 'libraryLayout',
- initialValue: 'GRID_LAYOUT',
+ initialValue: 'LIST_LAYOUT',
})
const updateLayout = useCallback(
diff --git a/packages/web/components/templates/homeFeed/LibraryFilterMenu.tsx b/packages/web/components/templates/homeFeed/LibraryFilterMenu.tsx
index bf40e005d..9fafbc785 100644
--- a/packages/web/components/templates/homeFeed/LibraryFilterMenu.tsx
+++ b/packages/web/components/templates/homeFeed/LibraryFilterMenu.tsx
@@ -2,7 +2,7 @@ import { ReactNode, useMemo } from 'react'
import { StyledText } from '../../elements/StyledText'
import { Box, HStack, SpanBox, VStack } from '../../elements/LayoutPrimitives'
import { Button } from '../../elements/Button'
-import { CaretRight, Circle } from 'phosphor-react'
+import { Circle } from 'phosphor-react'
import { useGetSubscriptionsQuery } from '../../../lib/networking/queries/useGetSubscriptionsQuery'
import { useGetLabelsQuery } from '../../../lib/networking/queries/useGetLabelsQuery'
import { Label } from '../../../lib/networking/fragments/labelFragment'
@@ -13,9 +13,7 @@ import { usePersistedState } from '../../../lib/hooks/usePersistedState'
import { useGetSavedSearchQuery} from '../../../lib/networking/queries/useGetSavedSearchQuery'
import { SavedSearch } from "../../../lib/networking/fragments/savedSearchFragment"
import { ToggleCaretDownIcon } from '../../elements/icons/ToggleCaretDownIcon'
-import { ToggleCaretLeftIcon } from '../../elements/icons/ToggleCaretLeftIcon'
import Link from 'next/link'
-import { ArrowRightIcon } from '../../elements/icons/ArrowRightIcon'
import { ToggleCaretRightIcon } from '../../elements/icons/ToggleCaretRightIcon'
export const LIBRARY_LEFT_MENU_WIDTH = '233px'
diff --git a/packages/web/lib/keyboardShortcuts/navigationShortcuts.ts b/packages/web/lib/keyboardShortcuts/navigationShortcuts.ts
index a8f1af0c8..d49b72f61 100644
--- a/packages/web/lib/keyboardShortcuts/navigationShortcuts.ts
+++ b/packages/web/lib/keyboardShortcuts/navigationShortcuts.ts
@@ -15,7 +15,9 @@ export function navigationCommands(
shortcutKeys: ['b'],
actionDescription: 'Go back',
shortcutKeyDescription: 'b',
- callback: () => router?.back(),
+ callback: () => {
+ router?.back()
+ },
},
]
}
diff --git a/packages/web/lib/networking/queries/useGetSubscriptionsQuery.tsx b/packages/web/lib/networking/queries/useGetSubscriptionsQuery.tsx
index f5cc5051a..89bfccf99 100644
--- a/packages/web/lib/networking/queries/useGetSubscriptionsQuery.tsx
+++ b/packages/web/lib/networking/queries/useGetSubscriptionsQuery.tsx
@@ -1,6 +1,6 @@
import { gql } from 'graphql-request'
import useSWR from 'swr'
-import { publicGqlFetcher } from '../networkHelpers'
+import { makeGqlFetcher } from '../networkHelpers'
export type SubscriptionStatus = 'ACTIVE' | 'DELETED' | 'UNSUBSCRIBED'
@@ -39,11 +39,12 @@ type SubscriptionsData = {
}
export function useGetSubscriptionsQuery(
+ type: SubscriptionType | undefined = undefined,
sortBy = 'UPDATED_TIME'
): SubscriptionsQueryResponse {
const query = gql`
- query GetSubscriptions {
- subscriptions(sort: { by: ${sortBy} }) {
+ query GetSubscriptions($type: SubscriptionType, $sort: SortParams) {
+ subscriptions(type: $type, sort: $sort) {
... on SubscriptionsSuccess {
subscriptions {
id
@@ -67,7 +68,16 @@ export function useGetSubscriptionsQuery(
}
`
- const { data, mutate, isValidating } = useSWR(query, publicGqlFetcher)
+ const variables = {
+ type,
+ sort: {
+ by: sortBy,
+ },
+ }
+ const { data, mutate, isValidating } = useSWR(
+ [query, variables],
+ makeGqlFetcher(variables)
+ )
try {
if (data) {
diff --git a/packages/web/pages/[username]/[slug]/index.tsx b/packages/web/pages/[username]/[slug]/index.tsx
index 0bad57608..533bea5db 100644
--- a/packages/web/pages/[username]/[slug]/index.tsx
+++ b/packages/web/pages/[username]/[slug]/index.tsx
@@ -79,8 +79,6 @@ export default function Home(): JSX.Element {
})
}, [articleData?.article.article])
- useKeyboardShortcuts(navigationCommands(router))
-
const actionHandler = useCallback(
async (action: string, arg?: unknown) => {
switch (action) {
diff --git a/packages/web/pages/settings/feeds/index.tsx b/packages/web/pages/settings/feeds/index.tsx
index c94a19b0e..cbe310e8c 100644
--- a/packages/web/pages/settings/feeds/index.tsx
+++ b/packages/web/pages/settings/feeds/index.tsx
@@ -90,7 +90,7 @@ export default function Rss(): JSX.Element {
return (
{
diff --git a/packages/web/pages/settings/subscriptions.tsx b/packages/web/pages/settings/subscriptions.tsx
index 2fc66fb1d..76b85b477 100644
--- a/packages/web/pages/settings/subscriptions.tsx
+++ b/packages/web/pages/settings/subscriptions.tsx
@@ -96,7 +96,7 @@ export default function SubscriptionsPage(): JSX.Element {
})
) : (
)}