Merge branch 'develop' into fix/ddw-923-stake-pool-list-table-view-ad…

…justments

CHANGELOG.md

@@ -13,6 +13,7 @@
 ### Fixes
 
 - Fixed stake pool list styling ([PR 2920](https://github.com/input-output-hk/daedalus/pull/2920))
+- Fixed PopOver overlap ([PR 2954](https://github.com/input-output-hk/daedalus/pull/2954))
 - Fixed tooltip being hidden in several places ([PR-2934](https://github.com/input-output-hk/daedalus/pull/2934))
 - Adjusted padding for search field in stake pools ([PR 2945](https://github.com/input-output-hk/daedalus/pull/2945))
 - Fixed margin for dialogs content and token table header ([PR 2944](https://github.com/input-output-hk/daedalus/pull/2944))

README.md

@@ -160,14 +160,12 @@ Most of the commands need `nix` and will run only on Linux or macOS.
 - Windows 10/11
 - Daedalus testnet installation (similar version used in branch) in `C:\Program Files\Daedalus Testnet`
 - NodeJS 16
-- Python2 *
-- `yarn global add windows-build-tools` * (if this does not work extract daedalus\nix\windows-usb-libs.zip under daedalus\build folder)
-- Microsoft Build Tools 2015 *
-- Microsoft Visual Studio 2017 (Include Desktop development with C++) *
+- Python2
+- `yarn global add windows-build-tools` (if this does not work extract daedalus\nix\windows-usb-libs.zip under daedalus\build folder)
+- Microsoft Build Tools 2015
+- Microsoft Visual Studio 2017 (Include Desktop development with C++)
 - `yarn config set msvsversion 2015 --global`
 
-*needed for compiling [email protected] on Windows
-
 #### Steps
 - `yarn install`
 - `yarn dev:windows`

package.json

@@ -139,7 +139,7 @@
     "eslint-plugin-react": "7.21.2",
     "eslint-plugin-react-hooks": "4.1.2",
     "esm": "3.2.25",
-    "fast-sass-loader": "1.5.0",
+    "fast-sass-loader": "2.0.1",
     "file-loader": "4.2.0",
     "gulp-shell": "0.8.0",
     "hash.js": "1.1.7",
@@ -156,7 +156,6 @@
     "mobx-react-devtools": "6.1.1",
     "node-forge": "1.0.0",
     "node-libs-browser": "2.2.1",
-    "node-sass": "4.14.1",
     "nodemon": "2.0.4",
     "npmlog": "4.1.2",
     "postcss": "8.2.13",
@@ -168,7 +167,8 @@
     "react-intl-translations-manager": "5.0.3",
     "react-syntax-highlighter": "13.5.3",
     "regenerator-runtime": "0.13.7",
-    "sass-loader": "7.1.0",
+    "sass": "1.32.13",
+    "sass-loader": "10.1.1",
     "seedrandom": "3.0.5",
     "sinon": "9.2.2",
     "spawn-sync": "2.0.0",
@@ -257,7 +257,7 @@
     "react-intl": "2.7.2",
     "react-lottie": "1.2.3",
     "react-markdown": "4.3.1",
-    "react-polymorph": "1.0.3",
+    "react-polymorph": "1.0.4",
     "react-router": "5.2.0",
     "react-router-dom": "5.2.0",
     "react-svg-inline": "2.1.1",