Merge branch 'develop' of https://codeberg.org/mkljczk/pl-fe into develop
Some checks failed
Some checks failed
This commit is contained in:
@ -81,7 +81,7 @@ const FollowRequestsPage: React.FC = () => {
|
||||
<ScrollableList
|
||||
scrollKey='followRequests'
|
||||
hasMore={hasNextPage}
|
||||
isLoading={typeof isLoading === 'boolean' ? isLoading : true}
|
||||
isLoading={isLoading}
|
||||
onLoadMore={() => fetchNextPage({ cancelRefetch: false })}
|
||||
emptyMessageText={<FormattedMessage id='empty_column.follow_requests' defaultMessage="You don't have any follow requests yet. When you receive one, it will show up here." />}
|
||||
>
|
||||
|
||||
@ -22,7 +22,7 @@ const OutgoingFollowRequestsPage: React.FC = () => {
|
||||
<ScrollableList
|
||||
scrollKey='outgoingFollowRequests'
|
||||
hasMore={hasNextPage}
|
||||
isLoading={typeof isLoading === 'boolean' ? isLoading : true}
|
||||
isLoading={isLoading}
|
||||
onLoadMore={() => fetchNextPage({ cancelRefetch: false })}
|
||||
emptyMessageText={<FormattedMessage id='empty_column.outgoing_follow_requests' defaultMessage="You don't have any outgoing follow requests yet. When you try to follow a user, it will show up here." />}
|
||||
itemClassName='p-2.5'
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
import React from 'react';
|
||||
|
||||
import { ChatProvider } from 'pl-fe/contexts/chat-context';
|
||||
import ChatPage from 'pl-fe/features/chats/components/chat-page/chat-page';
|
||||
import ChatsPage from 'pl-fe/features/chats/components/chats-page/chats-page';
|
||||
|
||||
const ChatIndex: React.FC = () => (
|
||||
<ChatProvider>
|
||||
<ChatPage />
|
||||
<ChatsPage />
|
||||
</ChatProvider>
|
||||
);
|
||||
|
||||
|
||||
@ -35,7 +35,7 @@ const QuotesPage: React.FC = () => {
|
||||
statusIds={statusIds}
|
||||
scrollKey={`quotes:${statusId}`}
|
||||
hasMore={hasNextPage}
|
||||
isLoading={typeof isLoading === 'boolean' ? isLoading : true}
|
||||
isLoading={isLoading}
|
||||
onLoadMore={handleLoadMore}
|
||||
emptyMessageText={emptyMessage}
|
||||
/>
|
||||
|
||||
@ -22,7 +22,7 @@ const ScheduledStatusesPage = () => {
|
||||
<Column label={intl.formatMessage(messages.heading)}>
|
||||
<ScrollableList
|
||||
hasMore={hasNextPage}
|
||||
isLoading={typeof isLoading === 'boolean' ? isLoading : true}
|
||||
isLoading={isLoading}
|
||||
onLoadMore={() => fetchNextPage({ cancelRefetch: false })}
|
||||
emptyMessageText={emptyMessage}
|
||||
listClassName='divide-y divide-solid divide-gray-200 black:divide-gray-800 dark:divide-primary-800'
|
||||
|
||||
Reference in New Issue
Block a user