matty/ncd-fe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'soapbox/develop' into ts

Browse Source 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
This commit is contained in:
marcin mikołajczak
2022-06-08 23:45:06 +02:00
parent a66c174c2d 5f015eff3c
commit a8a1567917
52 changed files with 436 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/soapbox/features/ui/components/modals/report-modal/report-modal.tsx
View File

@@ -1,5 +1,4 @@
import { AxiosError } from 'axios';
import { Set as ImmutableSet } from 'immutable';
import React, { useCallback, useEffect, useMemo, useState } from 'react';
import { defineMessages, FormattedMessage, useIntl } from 'react-intl';

2
app/soapbox/features/ui/components/pending_status.tsx
View File

@@ -83,7 +83,7 @@ const PendingStatus: React.FC<IPendingStatus> = ({ idempotencyKey, className, mu
{status.poll && <PollPreview poll={status.poll} />}
{status.quote && <QuotedStatus statusId={status.quote} />}
{status.quote && <QuotedStatus statusId={status.quote as string} />}
</div>
{/* TODO */}

3
app/soapbox/features/ui/components/profile-dropdown.tsx
View File

@@ -4,8 +4,7 @@ import { defineMessages, useIntl } from 'react-intl';
import { useDispatch } from 'react-redux';
import { Link } from 'react-router-dom';
import { logOut, switchAccount } from 'soapbox/actions/auth';
import { fetchOwnAccounts } from 'soapbox/actions/auth';
import { fetchOwnAccounts, logOut, switchAccount } from 'soapbox/actions/auth';
import Account from 'soapbox/components/account';
import { Menu, MenuButton, MenuDivider, MenuItem, MenuLink, MenuList } from 'soapbox/components/ui';
import { useAppSelector, useFeatures } from 'soapbox/hooks';

3
app/soapbox/features/ui/components/timeline.tsx
View File

@@ -3,8 +3,7 @@ import { debounce } from 'lodash';
import React, { useCallback } from 'react';
import { defineMessages } from 'react-intl';
import { dequeueTimeline } from 'soapbox/actions/timelines';
import { scrollTopTimeline } from 'soapbox/actions/timelines';
import { dequeueTimeline, scrollTopTimeline } from 'soapbox/actions/timelines';
import ScrollTopButton from 'soapbox/components/scroll-top-button';
import StatusList, { IStatusList } from 'soapbox/components/status_list';
import { useAppSelector, useAppDispatch } from 'soapbox/hooks';