Merge pull request #983 from the-hideout/feature/fixes_and_additions

Fixes and additions

package.json

@@ -29,22 +29,22 @@
   },
   "dependencies": {
     "@emotion/styled": "^11.13.0",
-    "@marsidev/react-turnstile": "^1.0.1",
-    "@mdi/js": "^6.9.96",
+    "@marsidev/react-turnstile": "^1.0.2",
+    "@mdi/js": "^7.4.47",
     "@mdi/react": "^1.6.1",
     "@mui/lab": "^6.0.0-beta.8",
-    "@mui/material": "^6.0.1",
-    "@mui/x-tree-view": "^7.15.0",
+    "@mui/material": "^6.0.2",
+    "@mui/x-tree-view": "^7.16.0",
     "@reduxjs/toolkit": "^2.2.7",
     "@testing-library/jest-dom": "^6.5.0",
     "@testing-library/react": "^16.0.1",
     "@tippyjs/react": "^4.2.6",
     "classnames": "^2.5.1",
-    "critical": "^6.0.5",
+    "critical": "^7.2.0",
     "cross-fetch": "^4.0.0",
     "dayjs": "^1.11.13",
     "fast-deep-equal": "^3.1.3",
-    "framer-motion": "^11.3.31",
+    "framer-motion": "^11.5.4",
     "fuse.js": "^7.0.0",
     "i18next": "^23.14.0",
     "i18next-browser-languagedetector": "^8.0.0",
@@ -61,9 +61,9 @@
     "react-dom": "^18.3.1",
     "react-error-boundary": "^4.0.13",
     "react-helmet": "^6.1.0",
-    "react-hotkeys-hook": "^4.5.0",
+    "react-hotkeys-hook": "^4.5.1",
     "react-i18next": "^15.0.1",
-    "react-intersection-observer": "^9.13.0",
+    "react-intersection-observer": "^9.13.1",
     "react-loader-spinner": "^6.1.6",
     "react-query": "^3.39.3",
     "react-redux": "^9.1.2",
@@ -78,7 +78,7 @@
     "react-zoom-pan-pinch": "^3.6.1",
     "resize-observer-polyfill": "^1.5.1",
     "source-map-explorer": "^2.5.3",
-    "victory": "^37.1.0"
+    "victory": "^37.1.1"
   },
   "jest": {
     "transformIgnorePatterns": []

src/components/barters-table/index.js

@@ -308,7 +308,7 @@ function BartersTable({ selectedTrader, nameFilter, itemFilter, showAll, useBart
                     },
                 );
 
-                if (isNaN(cost) && costItems.length === 1 && costItems[0].id === '5d235b4d86f7742e017bc88a') {      // "gp-coin"
+                if (cost === 0 && costItems.length === 1 && costItems[0].id === '5d235b4d86f7742e017bc88a') {      // "gp-coin"
                     cost = bestSellTo.priceRUB * howManyWeSell;
                     const GPCoinPrice = cost / costItems[0].count;
                     costItems[0].price = GPCoinPrice;

src/components/footer/index.js

@@ -1,9 +1,9 @@
 import { Trans, useTranslation } from 'react-i18next';
 import { Link } from 'react-router-dom';
 
-import { ReactComponent as GithubIcon } from '../supporter/Github.svg';
-import { ReactComponent as DiscordIcon } from '../supporter/Discord.svg';
-import { ReactComponent as XIcon } from '../supporter/X.svg';
+import { ReactComponent as GithubIcon } from '../../images/Github.svg';
+import { ReactComponent as DiscordIcon } from '../../images/Discord.svg';
+import { ReactComponent as XIcon } from '../../images/X.svg';
 
 import './index.css';
 import UkraineButton from '../ukraine-button/index.js';

src/components/station-skill-trader-setting/index.js

@@ -67,7 +67,7 @@ const getOptionsForSkill = (t, skillKey) => {
 const getOptionsForTrader = (t, traderKey) => {
     let options = getNumericSelect(1, 4);
 
-    if (traderKey === 'jaeger') {
+    if (traderKey === 'jaeger' || traderKey === 'ref') {
         options.unshift({
             value: 0,
             label: t('Locked'),

src/components/supporter/index.js

@@ -1,5 +1,5 @@
-import { ReactComponent as PatreonIcon } from './Patreon.svg';
-import { ReactComponent as GithubIcon } from './Github.svg';
+import { ReactComponent as PatreonIcon } from '../../images/Patreon.svg';
+import { ReactComponent as GithubIcon } from '../../images/Github.svg';
 
 import './index.css';