From 58854f414f90b5e41c96e0d97646f61455de03c4 Mon Sep 17 00:00:00 2001 From: Akmal Djumakhodjaev Date: Wed, 6 Dec 2023 11:34:45 +0800 Subject: [PATCH 1/6] chore: update node-saas version --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index c881235c176..841db089666 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10648,9 +10648,9 @@ "dev": true }, "node-sass": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.12.0.tgz", - "integrity": "sha512-A1Iv4oN+Iel6EPv77/HddXErL2a+gZ4uBeZUy+a8O35CFYTXhgA8MgLCWBtwpGZdCvTvQ9d+bQxX/QC36GDPpQ==", + "version": "4.14.0", + "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.14.0.tgz", + "integrity": "sha512-AxqU+DFpk0lEz95sI6jO0hU0Rwyw7BXVEv6o9OItoXLyeygPeaSpiV4rwQb10JiTghHaa0gZeD21sz+OsQluaw==", "dev": true, "requires": { "async-foreach": "^0.1.3", @@ -10660,7 +10660,7 @@ "get-stdin": "^4.0.1", "glob": "^7.0.3", "in-publish": "^2.0.0", - "lodash": "^4.17.11", + "lodash": "^4.17.15", "meow": "^3.7.0", "mkdirp": "^0.5.1", "nan": "^2.13.2", diff --git a/package.json b/package.json index d06d70f8d58..7a363751e08 100644 --- a/package.json +++ b/package.json @@ -89,7 +89,7 @@ "mocha": "5.2.0", "mock-local-storage": "1.1.7", "node-gettext": "2.0.0", - "node-sass": "4.12.0", + "node-sass": "4.14.0", "postcss-scss": "0.4.1", "react-render-html": "0.6.0", "react-svg-loader": "3.0.1", From 4759f4b11ea7f934970512599fd55e7f7d2c89df Mon Sep 17 00:00:00 2001 From: Akmal Djumakhodjaev Date: Wed, 6 Dec 2023 11:35:11 +0800 Subject: [PATCH 2/6] fix: console error with unique key --- src/javascript/app/pages/trade/markets.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/javascript/app/pages/trade/markets.jsx b/src/javascript/app/pages/trade/markets.jsx index 9e2847255f3..e4c62958165 100644 --- a/src/javascript/app/pages/trade/markets.jsx +++ b/src/javascript/app/pages/trade/markets.jsx @@ -567,7 +567,7 @@ class Markets extends React.Component { const derived_category = group_markets[item].markets[0].key; return ( item === 'none' ? ( - + {group_markets[item].markets.map((m) => (
  • Date: Fri, 8 Dec 2023 13:43:10 +0800 Subject: [PATCH 3/6] feat: trigger deployment From c79830cc055993615ad294a025a2594451fe094f Mon Sep 17 00:00:00 2001 From: Akmal Djumakhodjaev Date: Fri, 8 Dec 2023 14:07:08 +0800 Subject: [PATCH 4/6] revert node-sass version change --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7a363751e08..d06d70f8d58 100644 --- a/package.json +++ b/package.json @@ -89,7 +89,7 @@ "mocha": "5.2.0", "mock-local-storage": "1.1.7", "node-gettext": "2.0.0", - "node-sass": "4.14.0", + "node-sass": "4.12.0", "postcss-scss": "0.4.1", "react-render-html": "0.6.0", "react-svg-loader": "3.0.1", From 844a21c881b75076baa97653d9e4d72f89dd0dc3 Mon Sep 17 00:00:00 2001 From: Akmal Djumakhodjaev Date: Fri, 8 Dec 2023 14:19:28 +0800 Subject: [PATCH 5/6] Revert "chore: update node-saas version" This reverts commit 58854f414f90b5e41c96e0d97646f61455de03c4. --- package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 841db089666..c881235c176 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10648,9 +10648,9 @@ "dev": true }, "node-sass": { - "version": "4.14.0", - "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.14.0.tgz", - "integrity": "sha512-AxqU+DFpk0lEz95sI6jO0hU0Rwyw7BXVEv6o9OItoXLyeygPeaSpiV4rwQb10JiTghHaa0gZeD21sz+OsQluaw==", + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.12.0.tgz", + "integrity": "sha512-A1Iv4oN+Iel6EPv77/HddXErL2a+gZ4uBeZUy+a8O35CFYTXhgA8MgLCWBtwpGZdCvTvQ9d+bQxX/QC36GDPpQ==", "dev": true, "requires": { "async-foreach": "^0.1.3", @@ -10660,7 +10660,7 @@ "get-stdin": "^4.0.1", "glob": "^7.0.3", "in-publish": "^2.0.0", - "lodash": "^4.17.15", + "lodash": "^4.17.11", "meow": "^3.7.0", "mkdirp": "^0.5.1", "nan": "^2.13.2", From f46bc21b83bec9dfe810fb00a5bc0ae0650a1801 Mon Sep 17 00:00:00 2001 From: Akmal Djumakhodjaev Date: Fri, 8 Dec 2023 15:27:06 +0800 Subject: [PATCH 6/6] fix gtm issue by adding missing data tag --- src/root_files/app/index.html | 1 + src/templates/_common/_layout/head.jsx | 1 + src/templates/landing_pages/_common/layout.jsx | 1 + 3 files changed, 3 insertions(+) diff --git a/src/root_files/app/index.html b/src/root_files/app/index.html index ca62f392872..ee99171a48a 100644 --- a/src/root_files/app/index.html +++ b/src/root_files/app/index.html @@ -18,6 +18,7 @@ +