Merge branch 'dev-merge' into dev

package.json

@@ -30,7 +30,7 @@
         "@popperjs/core": "^2.9.2",
         "aes-js": "^3.1.1",
         "base-x": "^3.0.2",
-        "bootstrap": "^5.1.0",
+        "bootstrap": "^4.6.0",
         "bootstrap-dark": "^1.0.3",
         "create-react-class": "^15.6.3",
         "echarts": "^5.1.2",

yarn.lock

@@ -2440,11 +2440,16 @@ bootstrap-dark@^1.0.3:
   dependencies:
     bootstrap ">=4.3"
 
-bootstrap@>=4.3, bootstrap@^5.1.0:
+bootstrap@>=4.3:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.1.0.tgz#543ef8f44f4b9af67b0230f19508542fec38ef55"
   integrity sha512-bs74WNI9BgBo3cEovmdMHikSKoXnDgA6VQjJ7TyTotU6L7d41ZyCEEelPwkYEzsG/Zjv3ie9IE3EMAje0W9Xew==
 
+bootstrap@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.6.0.tgz#97b9f29ac98f98dfa43bf7468262d84392552fd7"
+  integrity sha512-Io55IuQY3kydzHtbGvQya3H+KorS/M9rSNyfCGCg9WZ4pyT/lCxIlpJgG1GXW/PswzC84Tr2fBYi+7+jFVQQBw==
+
 boxen@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/boxen/-/boxen-1.3.0.tgz#55c6c39a8ba58d9c61ad22cd877532deb665a20b"