Merge branch 'main' into combined-prs-branch

the-hideout · Aug 15, 2023 · b0beceb · b0beceb
2 parents a702ad9 + 7829a50
commit b0beceb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/components/canvas-grid/index.js b/src/components/canvas-grid/index.js
@@ -24,7 +24,7 @@ function CanvasGrid(props) {
         const canvasEle = canvas.current;
 
         if (!canvasEle) {
-            return true;
+            return;
         }
 
         canvasEle.width = canvasEle.clientWidth;

diff --git a/src/data/maps.json b/src/data/maps.json
@@ -10,10 +10,10 @@
                 "maxZoom": 5,
                 "transform": [0.38, 0, 0.38, 0],
                 "coordinateRotation": 180,
-                "bounds": [[340, 0], [-320, 520]],
+                "bounds": [[324, -215], [-279, 548]],
                 "author": "Shebuka",
                 "authorLink": "https://github.com/TarkovTracker/tarkovdata/",
-                "svgPath": "https://assets.tarkov.dev/maps/svg/StreetsOfTarkov.svg"
+                "svgPath": "https://assets.tarkov.dev/maps/svg/StreetsOfTarkov-0.13.5.svg"
             },
             {
                 "key": "streets-3d",

diff --git a/src/pages/ammo/index.js b/src/pages/ammo/index.js
@@ -73,10 +73,10 @@ function Ammo() {
     const { t } = useTranslation();
 
     useEffect(() => {
-        if (currentAmmo === []) {
+        if (!currentAmmo || !currentAmmo.length) {
             setSelectedLegendName([]);
 
-            return true;
+            return;
         }
 
         if (currentAmmo) {