Merge remote-tracking branch 'origin/ld/dropdown-render' into ld/drop…

…down-render
DestinyItemManager · Aug 7, 2024 · 8b0bf9e · 8b0bf9e
2 parents cf05217 + 90bbc49
commit 8b0bf9e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -1,5 +1,6 @@
 ## Next
 
+* Fixed character sorting on the Loadouts page.
 * Dropdown no longer flickers on Firefox.
 
 ## 8.31.0 <span class="changelog-date">(2024-08-04)</span>

diff --git a/src/app/destiny1/loadout-builder/D1LoadoutBuilder.tsx b/src/app/destiny1/loadout-builder/D1LoadoutBuilder.tsx
@@ -22,7 +22,7 @@ import CharacterSelect from '../../dim-ui/CharacterSelect';
 import CollapsibleTitle from '../../dim-ui/CollapsibleTitle';
 import ErrorBoundary from '../../dim-ui/ErrorBoundary';
 import { D1GridNode, D1Item, DimItem } from '../../inventory/item-types';
-import { bucketsSelector, storesSelector } from '../../inventory/selectors';
+import { bucketsSelector, sortedStoresSelector } from '../../inventory/selectors';
 import { D1Store } from '../../inventory/store-types';
 import { AppIcon, refreshIcon } from '../../shell/icons';
 import { Vendor, loadVendors } from '../vendors/vendor.service';
@@ -106,7 +106,7 @@ const initialState: State = {
 
 export default function D1LoadoutBuilder({ account }: { account: DestinyAccount }) {
   const buckets = useSelector(bucketsSelector);
-  const stores = useSelector(storesSelector) as D1Store[];
+  const stores = useSelector(sortedStoresSelector) as D1Store[];
   const defs = useD1Definitions();
 
   const [state, setStateFull] = useState(initialState);

diff --git a/src/app/inventory/__snapshots__/d2-stores.test.ts.snap b/src/app/inventory/__snapshots__/d2-stores.test.ts.snap
@@ -11143,7 +11143,7 @@ exports[`process stores generates a correct  Weapons CSV export 1`] = `
     "Kill Tracker": 1431,
     "Loadouts": "",
     "Locked": true,
-    "Mag": 31,
+    "Mag": 30,
     "Masterwork Tier": 10,
     "Masterwork Type": "Range",
     "Name": "Graviton Lance",

diff --git a/src/app/loadout/Loadouts.tsx b/src/app/loadout/Loadouts.tsx
@@ -9,7 +9,7 @@ import ShowPageLoading from 'app/dim-ui/ShowPageLoading';
 import { VirtualListRef, WindowVirtualList } from 'app/dim-ui/VirtualList';
 import ColorDestinySymbols from 'app/dim-ui/destiny-symbols/ColorDestinySymbols';
 import { t, tl } from 'app/i18next-t';
-import { artifactUnlocksSelector, storesSelector } from 'app/inventory/selectors';
+import { artifactUnlocksSelector, sortedStoresSelector } from 'app/inventory/selectors';
 import { useLoadStores } from 'app/inventory/store/hooks';
 import {
   MakeLoadoutAnalysisAvailable,
@@ -81,7 +81,7 @@ export default function LoadoutsContainer({ account }: { account: DestinyAccount
 function Loadouts({ account }: { account: DestinyAccount }) {
   const dispatch = useDispatch();
 
-  const stores = useSelector(storesSelector);
+  const stores = useSelector(sortedStoresSelector);
   const selectedStore = useSelector(selectedLoadoutStoreSelector);
 
   const setSelectedStoreId = useCallback(