feat: tappable from lure in popup

Author: Mygod

packages/types/lib/scanner.d.ts

@@ -282,6 +282,7 @@ export interface Tappable {
   lat: number
   lon: number
   type: string
+  fort_id: string | null
   item_id: number
   count: number | null
   expire_timestamp: number | null

server/src/graphql/typeDefs/scanner.graphql

@@ -208,6 +208,7 @@ type Tappable {
   lat: Float
   lon: Float
   type: String
+  fort_id: String
   item_id: Int
   count: Int
   expire_timestamp: Int

server/src/models/Tappable.js

@@ -36,6 +36,7 @@ class Tappable extends Model {
       'lat',
       'lon',
       'type',
+      'fort_id',
       'item_id',
       'count',
       'expire_timestamp',
@@ -108,6 +109,7 @@ class Tappable extends Model {
       'lat',
       'lon',
       'type',
+      'fort_id',
       'item_id',
       'count',
       'expire_timestamp',

src/features/tappable/TappablePopup.jsx

@@ -80,6 +80,10 @@ export function TappablePopup({ tappable, rewardIcon }) {
     displaySettings.popup.rewardAsPrimary && hasRewardIcon
   const hasTappableIcon = !!tappableIcon && !useRewardAsPrimary
   const itemDisplayName = count > 1 ? `${itemName} x${count}` : itemName
+  const isLure = React.useMemo(
+    () => Boolean(tappable.fort_id),
+    [tappable.fort_id],
+  )
 
   const [menuAnchorEl, setMenuAnchorEl] = React.useState(null)
 
@@ -263,6 +267,22 @@ export function TappablePopup({ tappable, rewardIcon }) {
           </Grid>
         </Grid>
       )}
+      {isLure && (
+        <Grid xs={12} textAlign="center">
+          <Typography
+            variant="caption"
+            component="div"
+            sx={{
+              display: 'flex',
+              alignItems: 'center',
+              justifyContent: 'center',
+              gap: 0.75,
+            }}
+          >
+            {t('seen_lure_wild')}
+          </Typography>
+        </Grid>
+      )}
       {hasExpireTime && (
         <Grid
           xs={12}

src/services/queries/tappable.js

@@ -20,6 +20,7 @@ export const GET_ALL_TAPPABLES = gql`
       lat
       lon
       type
+      fort_id
       item_id
       count
       expire_timestamp
@@ -34,6 +35,7 @@ export const GET_TAPPABLE_BY_ID = gql`
     tappableById(id: $id) {
       id
       type
+      fort_id
       item_id
       count
       expire_timestamp