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

Merge remote-tracking branch 'origin/main' into ditto-auth

Browse Source
This commit is contained in:
Alex Gleason
2024-02-16 15:57:45 -06:00
parent a0a37b7296 0f6a4a0744
commit 603e2cc2ce
41 changed files with 111 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/features/ui/components/instance-info-panel.tsx
View File

@ -25,7 +25,7 @@ const InstanceInfoPanel: React.FC<IInstanceInfoPanel> = ({ host }) => {
const settings = useSettings();
const remoteInstance: any = useAppSelector(state => getRemoteInstance(state, host));
const pinned: boolean = (settings.getIn(['remote_timeline', 'pinnedHosts']) as any).includes(host);
const pinned = settings.remote_timeline.pinnedHosts.includes(host);
const handlePinHost = () => {
if (!pinned) {

3
src/features/ui/components/promo-panel.tsx
View File

@ -7,10 +7,9 @@ import { useInstance, useSettings, useSoapboxConfig } from 'soapbox/hooks';
const PromoPanel: React.FC = () => {
const instance = useInstance();
const { promoPanel } = useSoapboxConfig();
const settings = useSettings();
const { locale } = useSettings();
const promoItems = promoPanel.get('items');
const locale = settings.get('locale');
if (!promoItems || promoItems.isEmpty()) return null;

2
src/features/ui/components/theme-toggle.tsx
View File

@ -8,7 +8,7 @@ import ThemeSelector from './theme-selector';
/** Stateful theme selector. */
const ThemeToggle: React.FC = () => {
const dispatch = useAppDispatch();
const themeMode = useSettings().get('themeMode');
const { themeMode } = useSettings();
const handleChange = (themeMode: string) => {
dispatch(changeSetting(['themeMode'], themeMode));