feat: full discovery integration

src/components/navigation/BottomNavigation.tsx

@@ -1,4 +1,4 @@
-import { Message, Group } from "@styled-icons/boxicons-solid";
+import { Message, Group, Compass } from "@styled-icons/boxicons-solid";
 import { observer } from "mobx-react-lite";
 import { useHistory, useLocation } from "react-router";
 import styled, { css } from "styled-components";
@@ -56,7 +56,8 @@ export default observer(() => {
 
     const friendsActive = path.startsWith("/friends");
     const settingsActive = path.startsWith("/settings");
-    const homeActive = !(friendsActive || settingsActive);
+    const discoverActive = path.startsWith("/discover");
+    const homeActive = !(friendsActive || settingsActive || discoverActive);
 
     return (
         <Base>
@@ -102,6 +103,15 @@ export default observer(() => {
                         </IconButton>
                     </ConditionalLink>
                 </Button>*/}
+                <Button active={discoverActive}>
+                    <ConditionalLink
+                        active={discoverActive}
+                        to="/discover/servers">
+                        <IconButton>
+                            <Compass size={24} />
+                        </IconButton>
+                    </ConditionalLink>
+                </Button>
                 <Button active={settingsActive}>
                     <ConditionalLink active={settingsActive} to="/settings">
                         <IconButton>

src/components/settings/AppearanceShims.tsx

@@ -50,10 +50,8 @@ export const ThemeBaseSelectorShim = observer(() => {
  * TODO: stabilise
  */
 export const ThemeShopShim = () => {
-    if (!useApplicationState().experiments.isEnabled("theme_shop")) return null;
-
     return (
-        <Link to="/settings/theme_shop" replace>
+        <Link to="/discover/themes" replace>
             <CategoryButton
                 icon={<Store size={24} />}
                 action="chevron"