Merge pull request #10853 from DestinyItemManager/search-profile

Move search history under destiny profile
DestinyItemManager · Dec 18, 2024 · e9fa55f · e9fa55f
2 parents 40b8911 + eb8f5c1
commit e9fa55f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/src/app/App.tsx b/src/app/App.tsx
@@ -28,9 +28,6 @@ const WhatsNew = lazy(() => import(/* webpackChunkName: "whatsNew" */ './whats-n
 const SettingsPage = lazy(
   () => import(/* webpackChunkName: "settings" */ './settings/SettingsPage'),
 );
-const SearchHistory = lazy(
-  () => import(/* webpackChunkName: "searchHistory" */ './search/SearchHistory'),
-);
 const Debug = lazy(() => import(/* webpackChunkName: "debug" */ './debug/Debug'));
 
 export default function App() {
@@ -128,14 +125,6 @@ export default function App() {
                 />
               ) : (
                 <>
-                  <Route
-                    path="search-history"
-                    element={
-                      <ErrorBoundary name="searchHistory" key="searchHistory">
-                        <SearchHistory />
-                      </ErrorBoundary>
-                    }
-                  />
                   <Route path="armory/*" element={<DefaultAccount />} />
                   <Route path=":membershipId/:destinyVersion/*" element={<Destiny />} />
                   <Route path="*" element={<DefaultAccount />} />

diff --git a/src/app/shell/Destiny.tsx b/src/app/shell/Destiny.tsx
@@ -74,6 +74,10 @@ const Activities = lazy(
 const Records = lazy(() => import(/* webpackChunkName: "records" */ 'app/records/Records'));
 const Loadouts = lazy(() => import(/* webpackChunkName: "loadouts" */ 'app/loadout/Loadouts'));
 
+const SearchHistory = lazy(
+  () => import(/* webpackChunkName: "searchHistory" */ '../search/SearchHistory'),
+);
+
 /**
  * Base view for pages that show Destiny content.
  */
@@ -312,6 +316,15 @@ export default function Destiny() {
                 }
               />
             )}
+
+            <Route
+              path="search-history"
+              element={
+                <ErrorBoundary name="searchHistory" key="searchHistory">
+                  <SearchHistory />
+                </ErrorBoundary>
+              }
+            />
             <Route path="*" element={<Navigate to="../inventory" />} />
           </Routes>
         </div>