From ab2fa0a945b645ceb336d0dbe4fc9ba52f0dfc7d Mon Sep 17 00:00:00 2001
From: kamieniarz <krzosman@gmail.com>
Date: Tue, 26 Mar 2024 21:45:59 +0100
Subject: [PATCH 1/8] Update Popup.jsx

---
 src/features/scanner/Popup.jsx | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/features/scanner/Popup.jsx b/src/features/scanner/Popup.jsx
index 4fcd65e49..d6266d364 100644
--- a/src/features/scanner/Popup.jsx
+++ b/src/features/scanner/Popup.jsx
@@ -21,7 +21,7 @@ import { ConfigContext } from './ContextProvider'
  * @param {{ children: React.ReactNode, mode: import('./hooks/store').ScanMode }} props
  * @returns
  */
-export function ScanOnDemandPopup({ children, mode }) {
+export function ScanNextOnDemandPopup({ children, mode }) {
   const { t } = useTranslation()
   const context = React.useContext(ConfigContext)
 
@@ -44,3 +44,27 @@ export function ScanOnDemandPopup({ children, mode }) {
     </Popup>
   )
 }
+
+export function ScanZoneOnDemandPopup({ children, mode }) {
+  const { t } = useTranslation()
+  const context = React.useContext(ConfigContext)
+
+  return (
+    <Popup minWidth={90} maxWidth={200} autoPan={false}>
+      <List>
+        <StyledListItemText
+          className="no-leaflet-margin"
+          secondary={t('scan_zone_choose')}
+        />
+        <DividerWithMargin />
+        {context.scannerType !== 'mad' && children}
+        {context.showScanCount && <ScanRequests />}
+        {context.showScanQueue && <ScanQueue />}
+        <DividerWithMargin />
+        <ScanConfirm mode={mode} />
+        <InAllowedArea />
+        <ScanCancel mode={mode} />
+      </List>
+    </Popup>
+  )
+}

From c914a1f11410b1795437e7572e633dcb7cad49c9 Mon Sep 17 00:00:00 2001
From: kamieniarz <krzosman@gmail.com>
Date: Tue, 26 Mar 2024 21:47:41 +0100
Subject: [PATCH 2/8] Update index.jsx

---
 src/features/scanner/scanNext/index.jsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/features/scanner/scanNext/index.jsx b/src/features/scanner/scanNext/index.jsx
index d3dcc898a..6eb20f768 100644
--- a/src/features/scanner/scanNext/index.jsx
+++ b/src/features/scanner/scanNext/index.jsx
@@ -5,7 +5,7 @@ import { ScanCircle, ScanCircles } from '../Shared'
 import { useCheckValid } from '../hooks/useCheckValid'
 import { ScanNextPopup } from './PopupContent'
 import { ScanOnDemandMarker } from '../Marker'
-import { ScanOnDemandPopup } from '../Popup'
+import { ScanNextOnDemandPopup } from '../Popup'
 import { useScanStore } from '../hooks/store'
 
 const POKEMON_RADIUS = 70
@@ -22,9 +22,9 @@ export function ScanNext() {
   return (
     <>
       <ScanOnDemandMarker>
-        <ScanOnDemandPopup mode="scanNext">
+        <ScanNextOnDemandPopup mode="scanNext">
           <ScanNextPopup />
-        </ScanOnDemandPopup>
+        </ScanNextOnDemandPopup>
       </ScanOnDemandMarker>
       {scanNextSize === 'M' ? (
         <ScanCircle

From d8c410b5a7360a37433436216396ac445e5ce825 Mon Sep 17 00:00:00 2001
From: kamieniarz <krzosman@gmail.com>
Date: Tue, 26 Mar 2024 21:48:02 +0100
Subject: [PATCH 3/8] Update index.jsx

---
 src/features/scanner/scanZone/index.jsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/features/scanner/scanZone/index.jsx b/src/features/scanner/scanZone/index.jsx
index 672ad77ad..ea96faf31 100644
--- a/src/features/scanner/scanZone/index.jsx
+++ b/src/features/scanner/scanZone/index.jsx
@@ -5,7 +5,7 @@ import { ScanCircles } from '../Shared'
 import { useCheckValid } from '../hooks/useCheckValid'
 import { ScanZonePopup } from './PopupContent'
 import { ScanOnDemandMarker } from '../Marker'
-import { ScanOnDemandPopup } from '../Popup'
+import { ScanZoneOnDemandPopup } from '../Popup'
 
 /**
  *
@@ -17,9 +17,9 @@ export function ScanZone() {
   return (
     <>
       <ScanOnDemandMarker>
-        <ScanOnDemandPopup mode="scanZone">
+        <ScanZoneOnDemandPopup mode="scanZone">
           <ScanZonePopup />
-        </ScanOnDemandPopup>
+        </ScanZoneOnDemandPopup>
       </ScanOnDemandMarker>
       <ScanCircles />
     </>

From fbcc9b16f2848f33659779b0491fbf534d0e2574 Mon Sep 17 00:00:00 2001
From: kamieniarz <krzosman@gmail.com>
Date: Fri, 29 Mar 2024 00:07:59 +0100
Subject: [PATCH 4/8] Update index.jsx

---
 src/features/scanner/scanNext/index.jsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/features/scanner/scanNext/index.jsx b/src/features/scanner/scanNext/index.jsx
index 6eb20f768..d3dcc898a 100644
--- a/src/features/scanner/scanNext/index.jsx
+++ b/src/features/scanner/scanNext/index.jsx
@@ -5,7 +5,7 @@ import { ScanCircle, ScanCircles } from '../Shared'
 import { useCheckValid } from '../hooks/useCheckValid'
 import { ScanNextPopup } from './PopupContent'
 import { ScanOnDemandMarker } from '../Marker'
-import { ScanNextOnDemandPopup } from '../Popup'
+import { ScanOnDemandPopup } from '../Popup'
 import { useScanStore } from '../hooks/store'
 
 const POKEMON_RADIUS = 70
@@ -22,9 +22,9 @@ export function ScanNext() {
   return (
     <>
       <ScanOnDemandMarker>
-        <ScanNextOnDemandPopup mode="scanNext">
+        <ScanOnDemandPopup mode="scanNext">
           <ScanNextPopup />
-        </ScanNextOnDemandPopup>
+        </ScanOnDemandPopup>
       </ScanOnDemandMarker>
       {scanNextSize === 'M' ? (
         <ScanCircle

From 389881bfe48330b5afe4adf4fa049df1fde11445 Mon Sep 17 00:00:00 2001
From: kamieniarz <krzosman@gmail.com>
Date: Fri, 29 Mar 2024 00:08:40 +0100
Subject: [PATCH 5/8] Update index.jsx

---
 src/features/scanner/scanZone/index.jsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/features/scanner/scanZone/index.jsx b/src/features/scanner/scanZone/index.jsx
index ea96faf31..672ad77ad 100644
--- a/src/features/scanner/scanZone/index.jsx
+++ b/src/features/scanner/scanZone/index.jsx
@@ -5,7 +5,7 @@ import { ScanCircles } from '../Shared'
 import { useCheckValid } from '../hooks/useCheckValid'
 import { ScanZonePopup } from './PopupContent'
 import { ScanOnDemandMarker } from '../Marker'
-import { ScanZoneOnDemandPopup } from '../Popup'
+import { ScanOnDemandPopup } from '../Popup'
 
 /**
  *
@@ -17,9 +17,9 @@ export function ScanZone() {
   return (
     <>
       <ScanOnDemandMarker>
-        <ScanZoneOnDemandPopup mode="scanZone">
+        <ScanOnDemandPopup mode="scanZone">
           <ScanZonePopup />
-        </ScanZoneOnDemandPopup>
+        </ScanOnDemandPopup>
       </ScanOnDemandMarker>
       <ScanCircles />
     </>

From ba9d47f4574ebe80917f322350b2f142edfd9324 Mon Sep 17 00:00:00 2001
From: kamieniarz <krzosman@gmail.com>
Date: Fri, 29 Mar 2024 00:09:33 +0100
Subject: [PATCH 6/8] Update Popup.jsx

---
 src/features/scanner/Popup.jsx | 28 ++--------------------------
 1 file changed, 2 insertions(+), 26 deletions(-)

diff --git a/src/features/scanner/Popup.jsx b/src/features/scanner/Popup.jsx
index d6266d364..9e5cdaab0 100644
--- a/src/features/scanner/Popup.jsx
+++ b/src/features/scanner/Popup.jsx
@@ -21,7 +21,7 @@ import { ConfigContext } from './ContextProvider'
  * @param {{ children: React.ReactNode, mode: import('./hooks/store').ScanMode }} props
  * @returns
  */
-export function ScanNextOnDemandPopup({ children, mode }) {
+export function ScanOnDemandPopup({ children, mode }) {
   const { t } = useTranslation()
   const context = React.useContext(ConfigContext)
 
@@ -30,31 +30,7 @@ export function ScanNextOnDemandPopup({ children, mode }) {
       <List>
         <StyledListItemText
           className="no-leaflet-margin"
-          secondary={t('scan_next_choose')}
-        />
-        <DividerWithMargin />
-        {context.scannerType !== 'mad' && children}
-        {context.showScanCount && <ScanRequests />}
-        {context.showScanQueue && <ScanQueue />}
-        <DividerWithMargin />
-        <ScanConfirm mode={mode} />
-        <InAllowedArea />
-        <ScanCancel mode={mode} />
-      </List>
-    </Popup>
-  )
-}
-
-export function ScanZoneOnDemandPopup({ children, mode }) {
-  const { t } = useTranslation()
-  const context = React.useContext(ConfigContext)
-
-  return (
-    <Popup minWidth={90} maxWidth={200} autoPan={false}>
-      <List>
-        <StyledListItemText
-          className="no-leaflet-margin"
-          secondary={t('scan_zone_choose')}
+          secondary={t(mode === 'scanZone' ? 'scan_zone_choose' : 'scan_next_choose')}
         />
         <DividerWithMargin />
         {context.scannerType !== 'mad' && children}

From ec8a237672b3c23cf78394c4248499528c94dea0 Mon Sep 17 00:00:00 2001
From: kamieniarz <krzosman@gmail.com>
Date: Fri, 29 Mar 2024 20:55:35 +0100
Subject: [PATCH 7/8] Update Popup.jsx

---
 src/features/scanner/Popup.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/features/scanner/Popup.jsx b/src/features/scanner/Popup.jsx
index 9e5cdaab0..a236df257 100644
--- a/src/features/scanner/Popup.jsx
+++ b/src/features/scanner/Popup.jsx
@@ -30,7 +30,7 @@ export function ScanOnDemandPopup({ children, mode }) {
       <List>
         <StyledListItemText
           className="no-leaflet-margin"
-          secondary={t(mode === 'scanZone' ? 'scan_zone_choose' : 'scan_next_choose')}
+            mode === 'scanZone' ? 'scan_zone_choose' : 'scan_next_choose',
         />
         <DividerWithMargin />
         {context.scannerType !== 'mad' && children}

From 7b7f09ad8df7224dd80c6f2623555e652798c81b Mon Sep 17 00:00:00 2001
From: kamieniarz <krzosman@gmail.com>
Date: Fri, 29 Mar 2024 20:57:49 +0100
Subject: [PATCH 8/8] Update Popup.jsx

---
 src/features/scanner/Popup.jsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/features/scanner/Popup.jsx b/src/features/scanner/Popup.jsx
index a236df257..7ed60a84d 100644
--- a/src/features/scanner/Popup.jsx
+++ b/src/features/scanner/Popup.jsx
@@ -30,7 +30,9 @@ export function ScanOnDemandPopup({ children, mode }) {
       <List>
         <StyledListItemText
           className="no-leaflet-margin"
+          secondary={t(
             mode === 'scanZone' ? 'scan_zone_choose' : 'scan_next_choose',
+          )}
         />
         <DividerWithMargin />
         {context.scannerType !== 'mad' && children}