refactor: Consolidate icon imports across components and streamline import statements for improved readability

src/app/pages/auth/FiledError.tsx

@@ -1,6 +1,7 @@
 import React from 'react';
-import { Box, Icon, Icons, color, Text } from 'folds';
+import { Box, color, Text } from 'folds';
 
+import { Icon, Icons } from '../../components/icons';
 export function FieldError({ message }: { message: string }) {
   return (
     <Box style={{ color: color.Critical.Main }} alignItems="Center" gap="100">

src/app/pages/auth/ServerPicker.tsx

@@ -7,19 +7,8 @@ import React, {
   useRef,
   useState,
 } from 'react';
-import {
-  Header,
-  Icon,
-  IconButton,
-  Icons,
-  Input,
-  Menu,
-  MenuItem,
-  PopOut,
-  RectCords,
-  Text,
-  config,
-} from 'folds';
+import { Header, IconButton, Input, Menu, MenuItem, PopOut, RectCords, Text, config } from 'folds';
+import { Icon, Icons } from '../../components/icons';
 import FocusTrap from 'focus-trap-react';
 
 import { useDebounce } from '../../hooks/useDebounce';

src/app/pages/auth/login/PasswordLoginForm.tsx

@@ -1,22 +1,6 @@
 import React, { FormEventHandler, MouseEventHandler, useCallback, useState } from 'react';
-import {
-  Box,
-  Button,
-  Header,
-  Icon,
-  IconButton,
-  Icons,
-  Input,
-  Menu,
-  Overlay,
-  OverlayBackdrop,
-  OverlayCenter,
-  PopOut,
-  RectCords,
-  Spinner,
-  Text,
-  config,
-} from 'folds';
+import { Box, Button, Header, IconButton, Input, Menu, Overlay, OverlayBackdrop, OverlayCenter, PopOut, RectCords, Spinner, Text, config } from 'folds';
+import { Icon, Icons } from '../../../components/icons';
 import FocusTrap from 'focus-trap-react';
 import { Link } from 'react-router-dom';
 import { MatrixError } from 'matrix-js-sdk';

src/app/pages/auth/login/TokenLogin.tsx

@@ -1,15 +1,5 @@
-import {
-  Box,
-  Icon,
-  Icons,
-  Overlay,
-  OverlayBackdrop,
-  OverlayCenter,
-  Spinner,
-  Text,
-  color,
-  config,
-} from 'folds';
+import { Box, Overlay, OverlayBackdrop, OverlayCenter, Spinner, Text, color, config } from 'folds';
+import { Icon, Icons } from '../../../components/icons';
 import React, { useCallback, useEffect } from 'react';
 import { MatrixError } from 'matrix-js-sdk';
 import { useAutoDiscoveryInfo } from '../../../hooks/useAutoDiscoveryInfo';

src/app/pages/client/ClientRoot.tsx

@@ -1,18 +1,5 @@
-import {
-  Box,
-  Button,
-  config,
-  Dialog,
-  Icon,
-  IconButton,
-  Icons,
-  Menu,
-  MenuItem,
-  PopOut,
-  RectCords,
-  Spinner,
-  Text,
-} from 'folds';
+import { Box, Button, config, Dialog, IconButton, Menu, MenuItem, PopOut, RectCords, Spinner, Text } from 'folds';
+import { Icon, Icons } from '../../components/icons';
 import { HttpApiEvent, HttpApiEventHandlerMap, MatrixClient, SyncState } from 'matrix-js-sdk';
 import FocusTrap from 'focus-trap-react';
 import React, { MouseEventHandler, ReactNode, useCallback, useEffect, useRef, useState } from 'react';

src/app/pages/client/WelcomePage.tsx

@@ -1,5 +1,6 @@
 import React, { useEffect, useState } from 'react';
-import { Box, Button, Icon, Icons, Text, config, toRem } from 'folds';
+import { Box, Button, Text, config, toRem } from 'folds';
+import { Icon, Icons } from '../../components/icons';
 import { Page, PageHero, PageHeroSection } from '../../components/page';
 import PaarrotSVG from '../../../../public/res/svg/paarrot.svg';
 import { getVersion } from '@tauri-apps/api/app';

src/app/pages/client/create/Create.tsx

@@ -1,5 +1,6 @@
 import React from 'react';
-import { Box, Icon, Icons, Scroll } from 'folds';
+import { Box, Scroll } from 'folds';
+import { Icon, Icons } from '../../../components/icons';
 import {
   Page,
   PageContent,

src/app/pages/client/direct/Direct.tsx

@@ -1,20 +1,7 @@
 import React, { MouseEventHandler, forwardRef, useMemo, useRef, useState } from 'react';
 import { useAtom, useAtomValue } from 'jotai';
-import {
-  Avatar,
-  Box,
-  Button,
-  Icon,
-  IconButton,
-  Icons,
-  Menu,
-  MenuItem,
-  PopOut,
-  RectCords,
-  Text,
-  config,
-  toRem,
-} from 'folds';
+import { Avatar, Box, Button, IconButton, Menu, MenuItem, PopOut, RectCords, Text, config, toRem } from 'folds';
+import { Icon, Icons } from '../../../components/icons';
 import { useVirtualizer } from '@tanstack/react-virtual';
 import FocusTrap from 'focus-trap-react';
 import { useNavigate } from 'react-router-dom';

src/app/pages/client/direct/DirectCreate.tsx

@@ -1,6 +1,7 @@
 import React, { useEffect } from 'react';
 import { useNavigate, useSearchParams } from 'react-router-dom';
-import { Box, Icon, IconButton, Icons, Scroll } from 'folds';
+import { Box, IconButton, Scroll } from 'folds';
+import { Icon, Icons } from '../../../components/icons';
 import { useMatrixClient } from '../../../hooks/useMatrixClient';
 import { getDirectCreateSearchParams } from '../../pathSearchParam';
 import { getDirectRoomPath } from '../../pathUtils';

src/app/pages/client/explore/Explore.tsx

@@ -1,23 +1,8 @@
 import React, { FormEventHandler, useCallback, useRef, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import FocusTrap from 'focus-trap-react';
-import {
-  Avatar,
-  Box,
-  Button,
-  Dialog,
-  Header,
-  Icon,
-  IconButton,
-  Icons,
-  Input,
-  Overlay,
-  OverlayBackdrop,
-  OverlayCenter,
-  Text,
-  color,
-  config,
-} from 'folds';
+import { Avatar, Box, Button, Dialog, Header, IconButton, Input, Overlay, OverlayBackdrop, OverlayCenter, Text, color, config } from 'folds';
+import { Icon, Icons } from '../../../components/icons';
 import {
   NavCategory,
   NavCategoryHeader,

src/app/pages/client/explore/Featured.tsx

@@ -1,5 +1,6 @@
 import React from 'react';
-import { Box, Icon, IconButton, Icons, Scroll, Text } from 'folds';
+import { Box, IconButton, Scroll, Text } from 'folds';
+import { Icon, Icons } from '../../../components/icons';
 import { useAtomValue } from 'jotai';
 import { useClientConfig } from '../../../hooks/useClientConfig';
 import { RoomCard, RoomCardGrid } from '../../../components/room-card';

src/app/pages/client/explore/Server.tsx

@@ -8,25 +8,8 @@ import React, {
   useRef,
   useState,
 } from 'react';
-import {
-  Box,
-  Button,
-  Chip,
-  Icon,
-  IconButton,
-  Icons,
-  Input,
-  Line,
-  Menu,
-  MenuItem,
-  PopOut,
-  RectCords,
-  Scroll,
-  Spinner,
-  Text,
-  config,
-  toRem,
-} from 'folds';
+import { Box, Button, Chip, IconButton, Input, Line, Menu, MenuItem, PopOut, RectCords, Scroll, Spinner, Text, config, toRem } from 'folds';
+import { Icon, Icons } from '../../../components/icons';
 import { useNavigate, useParams, useSearchParams } from 'react-router-dom';
 import FocusTrap from 'focus-trap-react';
 import { useAtomValue } from 'jotai';

src/app/pages/client/home/CreateRoom.tsx

@@ -1,5 +1,6 @@
 import React from 'react';
-import { Box, Icon, Icons, Scroll, IconButton } from 'folds';
+import { Box, Scroll, IconButton } from 'folds';
+import { Icon, Icons } from '../../../components/icons';
 import {
   Page,
   PageContent,

src/app/pages/client/home/Home.tsx

@@ -1,20 +1,7 @@
 import React, { MouseEventHandler, forwardRef, useMemo, useRef, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
-import {
-  Avatar,
-  Box,
-  Button,
-  Icon,
-  IconButton,
-  Icons,
-  Menu,
-  MenuItem,
-  PopOut,
-  RectCords,
-  Text,
-  config,
-  toRem,
-} from 'folds';
+import { Avatar, Box, Button, IconButton, Menu, MenuItem, PopOut, RectCords, Text, config, toRem } from 'folds';
+import { Icon, Icons } from '../../../components/icons';
 import { useVirtualizer } from '@tanstack/react-virtual';
 import { useAtom, useAtomValue } from 'jotai';
 import FocusTrap from 'focus-trap-react';

src/app/pages/client/home/HomeThreadsCategory.tsx

@@ -1,13 +1,7 @@
 import React, { useCallback, useEffect, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
-import {
-  Avatar,
-  Box,
-  Icon,
-  Icons,
-  Text,
-  Badge,
-} from 'folds';
+import { Avatar, Box, Text, Badge } from 'folds';
+import { Icon, Icons } from '../../../components/icons';
 import { useAtom, useSetAtom } from 'jotai';
 import { Room, Thread, ThreadEvent } from 'matrix-js-sdk';
 import { NavCategory, NavCategoryHeader, NavItem, NavItemContent, NavButton } from '../../../components/nav';

src/app/pages/client/home/Search.tsx

@@ -1,5 +1,6 @@
 import React, { useRef } from 'react';
-import { Box, Icon, Icons, Text, Scroll, IconButton } from 'folds';
+import { Box, Text, Scroll, IconButton } from 'folds';
+import { Icon, Icons } from '../../../components/icons';
 import { Page, PageContent, PageContentCenter, PageHeader } from '../../../components/page';
 import { MessageSearch } from '../../../features/message-search';
 import { useHomeRooms } from './useHomeRooms';

src/app/pages/client/inbox/Inbox.tsx

@@ -1,5 +1,6 @@
 import React, { useRef } from 'react';
-import { Avatar, Box, Icon, Icons, Text } from 'folds';
+import { Avatar, Box, Text } from 'folds';
+import { Icon, Icons } from '../../../components/icons';
 import { useAtomValue } from 'jotai';
 import { NavCategory, NavCategoryHeader, NavItem, NavItemContent, NavLink } from '../../../components/nav';
 import { getInboxInvitesPath, getInboxNotificationsPath } from '../../pathUtils';

src/app/pages/client/inbox/Invites.tsx

@@ -1,22 +1,6 @@
 import React, { useCallback, useMemo, useRef, useState } from 'react';
-import {
-  Avatar,
-  Badge,
-  Box,
-  Button,
-  Chip,
-  Icon,
-  IconButton,
-  Icons,
-  Overlay,
-  OverlayBackdrop,
-  OverlayCenter,
-  Scroll,
-  Spinner,
-  Text,
-  color,
-  config,
-} from 'folds';
+import { Avatar, Badge, Box, Button, Chip, IconButton, Overlay, OverlayBackdrop, OverlayCenter, Scroll, Spinner, Text, color, config } from 'folds';
+import { Icon, Icons } from '../../../components/icons';
 import { useAtomValue } from 'jotai';
 import { RoomTopicEventContent } from 'matrix-js-sdk/lib/types';
 import FocusTrap from 'focus-trap-react';

src/app/pages/client/inbox/Notifications.tsx

@@ -1,18 +1,7 @@
 /* eslint-disable react/destructuring-assignment */
 import React, { MouseEventHandler, useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import {
-  Avatar,
-  Box,
-  Chip,
-  Header,
-  Icon,
-  IconButton,
-  Icons,
-  Scroll,
-  Text,
-  config,
-  toRem,
-} from 'folds';
+import { Avatar, Box, Chip, Header, IconButton, Scroll, Text, config, toRem } from 'folds';
+import { Icon, Icons } from '../../../components/icons';
 import { useSearchParams } from 'react-router-dom';
 import {
   INotification,

src/app/pages/client/sidebar/CreateTab.tsx

@@ -1,5 +1,6 @@
 import React, { MouseEventHandler, useState } from 'react';
-import { Box, config, Icon, Icons, Menu, PopOut, RectCords, Text } from 'folds';
+import { Box, config, Menu, PopOut, RectCords, Text } from 'folds';
+import { Icon, Icons } from '../../../components/icons';
 import FocusTrap from 'focus-trap-react';
 import { useNavigate } from 'react-router-dom';
 import { SidebarAvatar, SidebarItem, SidebarItemTooltip } from '../../../components/sidebar';

src/app/pages/client/sidebar/DirectTab.tsx

@@ -1,6 +1,7 @@
 import React, { MouseEventHandler, forwardRef, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
-import { Box, Icon, Icons, Menu, MenuItem, PopOut, RectCords, Text, config, toRem } from 'folds';
+import { Box, Menu, MenuItem, PopOut, RectCords, Text, config, toRem } from 'folds';
+import { Icon, Icons } from '../../../components/icons';
 import FocusTrap from 'focus-trap-react';
 import { useAtomValue } from 'jotai';
 import PaarrotSVG from '../../../../../public/res/svg/paarrot.svg';

src/app/pages/client/sidebar/ExploreTab.tsx

@@ -1,5 +1,6 @@
+import { Icon, Icons } from '../../../components/icons';
 import React from 'react';
-import { Icon, Icons } from 'folds';
+
 import { useNavigate } from 'react-router-dom';
 import { useAtomValue } from 'jotai';
 import { SidebarAvatar, SidebarItem, SidebarItemTooltip } from '../../../components/sidebar';

src/app/pages/client/sidebar/HomeTab.tsx

@@ -1,6 +1,7 @@
 import React, { MouseEventHandler, forwardRef, useState } from 'react';
 import { useNavigateWithTransition } from '../../../hooks/useViewTransitions';
-import { Box, Icon, Icons, Line, Menu, MenuItem, PopOut, RectCords, Text, config, toRem } from 'folds';
+import { Box, Line, Menu, MenuItem, PopOut, RectCords, Text, config, toRem } from 'folds';
+import { Icon, Icons } from '../../../components/icons';
 import { useAtomValue } from 'jotai';
 import FocusTrap from 'focus-trap-react';
 import { useOrphanRooms } from '../../../state/hooks/roomList';

src/app/pages/client/sidebar/InboxTab.tsx

@@ -1,6 +1,7 @@
+import { Icon, Icons } from '../../../components/icons';
 import React from 'react';
 import { useNavigateWithTransition } from '../../../hooks/useViewTransitions';
-import { Icon, Icons } from 'folds';
+
 import { useAtomValue } from 'jotai';
 import {
   SidebarAvatar,

src/app/pages/client/sidebar/SearchTab.tsx

@@ -1,5 +1,6 @@
+import { Icon, Icons } from '../../../components/icons';
 import React from 'react';
-import { Icon, Icons } from 'folds';
+
 import { useAtom } from 'jotai';
 import { SidebarAvatar, SidebarItem, SidebarItemTooltip } from '../../../components/sidebar';
 import { searchModalAtom } from '../../../state/searchModal';

src/app/pages/client/sidebar/SettingsTab.tsx

@@ -1,5 +1,6 @@
 import React, { MouseEventHandler, useState } from 'react';
-import { Box, config, Icon, Icons, Line, Menu, MenuItem, PopOut, RectCords, Text } from 'folds';
+import { Box, config, Line, Menu, MenuItem, PopOut, RectCords, Text } from 'folds';
+import { Icon, Icons } from '../../../components/icons';
 import FocusTrap from 'focus-trap-react';
 import { useNavigateWithTransition } from '../../../hooks/useViewTransitions';
 import { SidebarItem, SidebarAvatar } from '../../../components/sidebar';

src/app/pages/client/sidebar/SpaceTabs.tsx

@@ -10,20 +10,8 @@ import React, {
   useState,
 } from 'react';
 import { useNavigateWithTransition } from '../../../hooks/useViewTransitions';
-import {
-  Box,
-  Icon,
-  IconButton,
-  Icons,
-  Line,
-  Menu,
-  MenuItem,
-  PopOut,
-  RectCords,
-  Text,
-  config,
-  toRem,
-} from 'folds';
+import { Box, IconButton, Line, Menu, MenuItem, PopOut, RectCords, Text, config, toRem } from 'folds';
+import { Icon, Icons } from '../../../components/icons';
 import { useAtom, useAtomValue } from 'jotai';
 import { Room } from 'matrix-js-sdk';
 import {

src/app/pages/client/sidebar/UnverifiedTab.tsx

@@ -1,5 +1,6 @@
 import React, { useState } from 'react';
-import { Badge, color, Icon, Icons, Text } from 'folds';
+import { Badge, color, Text } from 'folds';
+import { Icon, Icons } from '../../../components/icons';
 import {
   SidebarAvatar,
   SidebarItem,

src/app/pages/client/space/Search.tsx

@@ -1,5 +1,6 @@
 import React, { useRef } from 'react';
-import { Box, Icon, Icons, Text, Scroll, IconButton } from 'folds';
+import { Box, Text, Scroll, IconButton } from 'folds';
+import { Icon, Icons } from '../../../components/icons';
 import { useAtomValue } from 'jotai';
 import { Page, PageContent, PageContentCenter, PageHeader } from '../../../components/page';
 import { MessageSearch } from '../../../features/message-search';

src/app/pages/client/space/Space.tsx

@@ -7,24 +7,8 @@ import React, {
   useState,
 } from 'react';
 import { useAtom, useAtomValue } from 'jotai';
-import {
-  Avatar,
-  Box,
-  Button,
-  Icon,
-  IconButton,
-  Icons,
-  Line,
-  Menu,
-  MenuItem,
-  PopOut,
-  RectCords,
-  Spinner,
-  Text,
-  color,
-  config,
-  toRem,
-} from 'folds';
+import { Avatar, Box, Button, IconButton, Line, Menu, MenuItem, PopOut, RectCords, Spinner, Text, color, config, toRem } from 'folds';
+import { Icon, Icons } from '../../../components/icons';
 import { useVirtualizer } from '@tanstack/react-virtual';
 import { JoinRule, Room, Thread, ThreadEvent } from 'matrix-js-sdk';
 import { RoomJoinRulesEventContent } from 'matrix-js-sdk/lib/types';
@@ -87,6 +71,8 @@ import { BreakWord } from '../../../styles/Text.css';
 import { InviteUserPrompt } from '../../../components/invite-user-prompt';
 import { isSpace, shouldShowForumLobby } from '../../../utils/room';
 import { SpaceOptionsMenu } from '../../../features/space/SpaceOptionsMenu';
+import { ForumFeedSidebar } from '../../../features/forum/ForumFeedSidebar';
+import * as forumBoardCss from '../../../features/forum/ForumBoardView.css';
 
 function SpaceHeader() {
   const space = useSpace();
@@ -350,7 +336,14 @@ export function Space() {
     getSpaceRoomPath(spaceIdOrAlias, getCanonicalAliasOrRoomId(mx, roomId));
 
   if (shouldShowForumLobby(space)) {
-    return null;
+    return (
+      <PageNav className={forumBoardCss.ForumPageNav}>
+        <SpaceHeader />
+        <Box grow="Yes" direction="Column" style={{ minHeight: 0, overflow: 'hidden' }}>
+          <ForumFeedSidebar />
+        </Box>
+      </PageNav>
+    );
   }
 
   return (