Merge branch 'instance-domain' into 'main'

Use instance domain for local timeline

See merge request soapbox-pub/soapbox!3057

src/components/sidebar-menu.tsx

@@ -248,8 +248,8 @@ const SidebarMenu: React.FC = (): JSX.Element | null => {
 
                     <SidebarLink
                       to='/timeline/local'
-                      icon={features.federating ? require('@tabler/icons/outline/users-group.svg') : require('@tabler/icons/outline/world.svg')}
+                      icon={features.federating ? require('@tabler/icons/outline/at.svg') : require('@tabler/icons/outline/world.svg')}
-                      text={features.federating ? instance.title : <FormattedMessage id='tabs_bar.all' defaultMessage='All' />}
+                      text={features.federating ? instance.domain : <FormattedMessage id='tabs_bar.all' defaultMessage='All' />}
                       onClick={onClose}
                     />
 

src/components/sidebar-navigation.tsx

@@ -178,8 +178,8 @@ const SidebarNavigation = () => {
             {(account || !restrictUnauth.timelines.local) && (
               <SidebarNavigationLink
                 to='/timeline/local'
-                icon={features.federating ? require('@tabler/icons/outline/users-group.svg') : require('@tabler/icons/outline/world.svg')}
+                icon={features.federating ? require('@tabler/icons/outline/at.svg') : require('@tabler/icons/outline/world.svg')}
-                text={features.federating ? instance.title : <FormattedMessage id='tabs_bar.global' defaultMessage='Global' />}
+                text={features.federating ? instance.domain : <FormattedMessage id='tabs_bar.global' defaultMessage='Global' />}
               />
             )}
 

src/features/community-timeline/index.tsx

@@ -1,23 +1,19 @@
 import React, { useEffect } from 'react';
-import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
+import { FormattedMessage } from 'react-intl';
 
 import { expandCommunityTimeline } from 'soapbox/actions/timelines';
 import { useCommunityStream } from 'soapbox/api/hooks';
 import PullToRefresh from 'soapbox/components/pull-to-refresh';
 import { Column } from 'soapbox/components/ui';
-import { useAppSelector, useAppDispatch, useSettings, useTheme } from 'soapbox/hooks';
+import { useAppSelector, useAppDispatch, useSettings, useTheme, useInstance } from 'soapbox/hooks';
 import { useIsMobile } from 'soapbox/hooks/useIsMobile';
 
 import Timeline from '../ui/components/timeline';
 
-const messages = defineMessages({
-  title: { id: 'column.community', defaultMessage: 'Local timeline' },
-});
-
 const CommunityTimeline = () => {
-  const intl = useIntl();
   const dispatch = useAppDispatch();
   const theme = useTheme();
+  const instance = useInstance();
 
   const settings = useSettings();
   const onlyMedia = settings.community.other.onlyMedia;
@@ -41,7 +37,7 @@ const CommunityTimeline = () => {
   }, [onlyMedia]);
 
   return (
-    <Column className='-mt-3 sm:mt-0' label={intl.formatMessage(messages.title)} transparent={!isMobile}>
+    <Column className='-mt-3 sm:mt-0' label={instance.domain} transparent={!isMobile}>
       <PullToRefresh onRefresh={handleRefresh}>
         <Timeline
           className='black:p-4 black:sm:p-5'

src/locales/en.json

@@ -357,7 +357,6 @@
   "column.blocks": "Blocks",
   "column.bookmarks": "Bookmarks",
   "column.chats": "Chats",
-  "column.community": "Local timeline",
   "column.crypto_donate": "Donate Cryptocurrency",
   "column.developers": "Developers",
   "column.developers.service_worker": "Service Worker",