bigbuffet/bigbuffet-rw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'fix-account-search' into 'develop'

Browse source 
Use account selector in Search input

See merge request soapbox-pub/soapbox!2634
This commit is contained in:
marcin mikołajczak 2023-07-30 14:07:53 +00:00
commit 40fde3fc2c
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/soapbox/actions/moderation.tsx
View file

@ -116,8 +116,7 @@ const deleteUserModal = (intl: IntlShape, accountId: string, afterConfirm = () =
const toggleStatusSensitivityModal = (intl: IntlShape, statusId: string, sensitive: boolean, afterConfirm = () => {}) => const toggleStatusSensitivityModal = (intl: IntlShape, statusId: string, sensitive: boolean, afterConfirm = () => {}) =>
(dispatch: AppDispatch, getState: () => RootState) => { (dispatch: AppDispatch, getState: () => RootState) => {
const state = getState(); const state = getState();
const accountId = state.statuses.get(statusId)!.account.id; const acct = state.statuses.get(statusId)!.account.acct;
const acct = selectAccount(state, accountId)!.acct;
dispatch(openModal('CONFIRM', { dispatch(openModal('CONFIRM', {
icon: require('@tabler/icons/alert-triangle.svg'), icon: require('@tabler/icons/alert-triangle.svg'),
@ -137,8 +136,7 @@ const toggleStatusSensitivityModal = (intl: IntlShape, statusId: string, sensiti
const deleteStatusModal = (intl: IntlShape, statusId: string, afterConfirm = () => {}) => const deleteStatusModal = (intl: IntlShape, statusId: string, afterConfirm = () => {}) =>
(dispatch: AppDispatch, getState: () => RootState) => { (dispatch: AppDispatch, getState: () => RootState) => {
const state = getState(); const state = getState();
const accountId = state.statuses.get(statusId)!.account.id; const acct = state.statuses.get(statusId)!.account.acct;
const acct = selectAccount(state, accountId)!.acct;
dispatch(openModal('CONFIRM', { dispatch(openModal('CONFIRM', {
icon: require('@tabler/icons/trash.svg'), icon: require('@tabler/icons/trash.svg'),

3
app/soapbox/features/compose/components/search.tsx
View file

@ -16,6 +16,7 @@ import AutosuggestAccountInput from 'soapbox/components/autosuggest-account-inpu
import { Input } from 'soapbox/components/ui'; import { Input } from 'soapbox/components/ui';
import SvgIcon from 'soapbox/components/ui/icon/svg-icon'; import SvgIcon from 'soapbox/components/ui/icon/svg-icon';
import { useAppDispatch, useAppSelector } from 'soapbox/hooks'; import { useAppDispatch, useAppSelector } from 'soapbox/hooks';
import { selectAccount } from 'soapbox/selectors';
import { AppDispatch, RootState } from 'soapbox/store'; import { AppDispatch, RootState } from 'soapbox/store';
const messages = defineMessages({ const messages = defineMessages({
@ -25,7 +26,7 @@ const messages = defineMessages({
function redirectToAccount(accountId: string, routerHistory: any) { function redirectToAccount(accountId: string, routerHistory: any) {
return (_dispatch: AppDispatch, getState: () => RootState) => { return (_dispatch: AppDispatch, getState: () => RootState) => {
const acct = getState().getIn(['accounts', accountId, 'acct']); const acct = selectAccount(getState(), accountId)!.acct;
if (acct && routerHistory) { if (acct && routerHistory) {
routerHistory.push(`/@${acct}`); routerHistory.push(`/@${acct}`);