From 5f2532c3d7b4217f0df30be59a241a6a2838ddb5 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Tue, 9 Aug 2022 11:07:45 -0500 Subject: [PATCH] Throw out unnedeed QueryClientProvider changes --- app/soapbox/containers/soapbox.tsx | 1 - app/soapbox/features/ui/index.tsx | 72 ++++++++++++++---------------- 2 files changed, 34 insertions(+), 39 deletions(-) diff --git a/app/soapbox/containers/soapbox.tsx b/app/soapbox/containers/soapbox.tsx index 413673775..220e22af4 100644 --- a/app/soapbox/containers/soapbox.tsx +++ b/app/soapbox/containers/soapbox.tsx @@ -81,7 +81,6 @@ const loadInitial = () => { /** Highest level node with the Redux store. */ const SoapboxMount = () => { useCachedLocationHandler(); - const me = useAppSelector(state => state.me); const instance = useAppSelector(state => state.instance); const account = useOwnAccount(); diff --git a/app/soapbox/features/ui/index.tsx b/app/soapbox/features/ui/index.tsx index 67f5d7500..b9fdab67d 100644 --- a/app/soapbox/features/ui/index.tsx +++ b/app/soapbox/features/ui/index.tsx @@ -1,6 +1,5 @@ 'use strict'; -import { QueryClientProvider } from '@tanstack/react-query'; import debounce from 'lodash/debounce'; import React, { useState, useEffect, useRef, useCallback } from 'react'; import { HotKeys } from 'react-hotkeys'; @@ -36,7 +35,6 @@ import HomePage from 'soapbox/pages/home_page'; import ProfilePage from 'soapbox/pages/profile_page'; import RemoteInstancePage from 'soapbox/pages/remote_instance_page'; import StatusPage from 'soapbox/pages/status_page'; -import { queryClient } from 'soapbox/queries/client'; import { getAccessToken, getVapidKey } from 'soapbox/utils/auth'; import { isStandalone } from 'soapbox/utils/state'; // import GroupSidebarPanel from '../groups/sidebar_panel'; @@ -650,53 +648,51 @@ const UI: React.FC = ({ children }) => { }; return ( - - -
- + +
+ -
- +
+ - - - {!standalone && } - + + + {!standalone && } + - - {children} - - + + {children} + + - {me && floatingActionButton} + {me && floatingActionButton} - - {Component => } - + + {Component => } + - {me && ( - - {Component => } - - )} - {me && features.chats && !mobile && ( - - {Component => } - - )} - - - + {me && ( + {Component => } - - + )} + {me && features.chats && !mobile && ( + {Component => } -
+ )} + + + + {Component => } + + + + {Component => } +
- - +
+
); };