Merge pull request #3 from lenisko/gym_defenders_fixes

feat(client): drop defenders from extra info, fix defenders hearth

Author: sanderDijkxhoorn

src/features/gym/GymPopup.jsx

@@ -20,14 +20,13 @@ import { useMemory } from '@store/useMemory'
 import { useLayoutStore } from '@store/useLayoutStore'
 import { setDeepStore, useStorage } from '@store/useStorage'
 import { ErrorBoundary } from '@components/ErrorBoundary'
-import { Img, TextWithIcon } from '@components/Img'
+import { Img } from '@components/Img'
 import { Title } from '@components/popups/Title'
 import { PowerUp } from '@components/popups/PowerUp'
 import { GenderIcon } from '@components/popups/GenderIcon'
 import { Navigation } from '@components/popups/Navigation'
 import { Coords } from '@components/popups/Coords'
 import { TimeStamp } from '@components/popups/TimeStamps'
-import { ExtraInfo } from '@components/popups/ExtraInfo'
 import { useAnalytics } from '@hooks/useAnalytics'
 import { getTimeUntil } from '@utils/getTimeUntil'
 import { formatInterval } from '@utils/formatInterval'
@@ -191,7 +190,10 @@ function DefendersModal({ gym, onClose }) {
         {defenders.map((def) => {
           const fullCP = def.cp_when_deployed
           const currentCP = def.cp_now
-          const percent = Math.max(0, Math.min(1, currentCP / fullCP))
+          const percent = Math.max(
+            0,
+            Math.min(1, (currentCP / fullCP) * 1.25 - 0.25),
+          )
 
           return (
             <div
@@ -947,55 +949,13 @@ const GymFooter = ({ lat, lon, hasRaid, gym, setShowDefenders }) => {
  * @param {import('@rm/types').Gym} props
  * @returns
  */
-const ExtraGymInfo = ({
-  last_modified_timestamp,
-  lat,
-  lon,
-  updated,
-  total_cp,
-  guarding_pokemon_id,
-  guarding_pokemon_display,
-}) => {
-  const { t, i18n } = useTranslation()
-  const Icons = useMemory((s) => s.Icons)
-  const gymValidDataLimit = useMemory((s) => s.gymValidDataLimit)
+const ExtraGymInfo = ({ last_modified_timestamp, lat, lon, updated }) => {
   const enableGymPopupCoords = useStorage(
     (s) => s.userSettings.gyms.enableGymPopupCoords,
   )
 
-  const numFormatter = new Intl.NumberFormat(i18n.language)
-  /** @type {Partial<import('@rm/types').PokemonDisplay>} */
-  const gpd = guarding_pokemon_display || {}
-
   return (
     <Grid container alignItems="center" justifyContent="center">
-      {!!guarding_pokemon_id && updated > gymValidDataLimit && (
-        <ExtraInfo title="defender">
-          <TextWithIcon
-            src={Icons.getPokemonByDisplay(guarding_pokemon_id, gpd)}
-          >
-            {gpd.badge === 1 && (
-              <>
-                <Img
-                  src={Icons.getMisc('bestbuddy')}
-                  alt={t('best_buddy')}
-                  maxHeight={15}
-                  maxWidth={15}
-                />
-                &nbsp;
-              </>
-            )}
-            {t(`poke_${guarding_pokemon_id}`)}
-          </TextWithIcon>
-        </ExtraInfo>
-      )}
-      {!!total_cp && updated > gymValidDataLimit && (
-        <ExtraInfo title="total_cp">{numFormatter.format(total_cp)}</ExtraInfo>
-      )}
-      <Divider
-        flexItem
-        style={{ width: '100%', height: 2, margin: '10px 0' }}
-      />
       <TimeStamp time={updated}>last_seen</TimeStamp>
       <TimeStamp time={last_modified_timestamp}>last_modified</TimeStamp>
       {enableGymPopupCoords && (