Merge pull request #925 from WatWowMap/gym-badge-fixes

fix: gym badge fixes
WatWowMap · Jan 17, 2024 · 7456972 · 7456972
2 parents bef5385 + 1cadea0
commit 7456972
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/src/components/layout/dialogs/BadgeSelection.jsx b/src/components/layout/dialogs/BadgeSelection.jsx
@@ -35,7 +35,7 @@ const footerOptions =
 export default function BadgeSelection() {
   const { gymId, badge, open } = useLayoutStore((s) => s.gymBadge)
   const [setBadgeInDb] = useMutation(Query.user('setGymBadge'), {
-    refetchQueries: ['GetBadgeInfo'],
+    refetchQueries: ['GetBadgeInfo', 'Gyms', 'Raids', 'GymsRaids'],
   })
 
   /** @type {import('packages/types/lib').MultiSelectorProps<typeof badge>['onClick']} */
@@ -66,7 +66,7 @@ export default function BadgeSelection() {
       <DialogContent sx={{ mt: 2 }}>
         <MultiSelector
           items={ENUM_BADGES}
-          value={badge}
+          value={badge || 0}
           onClick={onClick}
           tKey="badge_"
         />

diff --git a/src/components/layout/dialogs/profile/GymBadges.jsx b/src/components/layout/dialogs/profile/GymBadges.jsx
@@ -22,7 +22,7 @@ export function UserGymBadges() {
   })
 
   const counts = React.useMemo(() => {
-    const counter = { gold: 0, silver: 0, bronze: 0 }
+    const counter = { bronze: 0, silver: 0, gold: 0 }
 
     if (data?.badges) {
       data.badges.forEach((gym) => {

diff --git a/src/components/popups/Gym.jsx b/src/components/popups/Gym.jsx
@@ -239,10 +239,12 @@ const DropdownOptions = ({
     if (gymBadges) {
       options.push({
         name: 'gym_badge_menu',
-        action: () =>
-          useLayoutStore.setState({
+        action: () => {
+          handleClose()
+          return useLayoutStore.setState({
             gymBadge: { badge, gymId: id, open: true },
-          }),
+          })
+        },
       })
     }
   }