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

Merge remote-tracking branch 'origin/develop' into reports-tailwind

Browse Source
This commit is contained in:
Alex Gleason
2022-11-28 09:23:13 -06:00
parent 946545f869 860a985a0d
commit 0e16bc13c5
64 changed files with 391 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/soapbox/features/admin/components/registration-mode-picker.tsx
View File

@@ -9,7 +9,7 @@ import {
RadioGroup,
RadioItem,
} from 'soapbox/features/forms';
import { useAppSelector, useAppDispatch } from 'soapbox/hooks';
import { useAppDispatch, useInstance } from 'soapbox/hooks';
import type { Instance } from 'soapbox/types/entities';
@@ -42,8 +42,9 @@ const modeFromInstance = (instance: Instance): RegistrationMode => {
const RegistrationModePicker: React.FC = () => {
const intl = useIntl();
const dispatch = useAppDispatch();
const instance = useInstance();
const mode = useAppSelector(state => modeFromInstance(state.instance));
const mode = modeFromInstance(instance);
const onChange: React.ChangeEventHandler<HTMLInputElement> = e => {
const config = generateConfig(e.target.value as RegistrationMode);

4
app/soapbox/features/admin/tabs/dashboard.tsx
View File

@@ -4,7 +4,7 @@ import { Link } from 'react-router-dom';
import { getSubscribersCsv, getUnsubscribersCsv, getCombinedCsv } from 'soapbox/actions/email-list';
import { Text } from 'soapbox/components/ui';
import { useAppSelector, useAppDispatch, useOwnAccount, useFeatures } from 'soapbox/hooks';
import { useAppDispatch, useOwnAccount, useFeatures, useInstance } from 'soapbox/hooks';
import sourceCode from 'soapbox/utils/code';
import { parseVersion } from 'soapbox/utils/features';
import { isNumber } from 'soapbox/utils/numbers';
@@ -27,7 +27,7 @@ const download = (response: AxiosResponse, filename: string) => {
const Dashboard: React.FC = () => {
const dispatch = useAppDispatch();
const instance = useAppSelector(state => state.instance);
const instance = useInstance();
const features = useFeatures();
const account = useOwnAccount();