Merge branch 'master' of github.com:binary-com/deriv-app into aum/WAL…

…L-2271/fix-ui-crypto-deposit
binary-com · Oct 25, 2023 · e5c4d0b · e5c4d0b
2 parents a2c6c1e + e5e1158
commit e5c4d0b
Show file tree

Hide file tree

Showing 72 changed files with 1,730 additions and 510 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -94,9 +94,9 @@
 #  deriv-app/bot
 # ==============================================================
 
-/packages/bot-skeleton/**/*                                     @prince-deriv @sandeep-deriv
-/packages/bot-web-ui/**/*                                       @prince-deriv @sandeep-deriv
-/packages/indicators/**/*                                       @prince-deriv @sandeep-deriv
+/packages/bot-skeleton/**/*                                     @prince-deriv @sandeep-deriv @vinu-deriv
+/packages/bot-web-ui/**/*                                       @prince-deriv @sandeep-deriv @vinu-deriv
+/packages/indicators/**/*                                       @prince-deriv @sandeep-deriv @vinu-deriv
 
 
 # ==============================================================

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/bot-web-ui/package.json b/packages/bot-web-ui/package.json
@@ -56,8 +56,8 @@
         "lint-staged": "^10.4.0",
         "loader-utils": "^1.1.0",
         "mini-css-extract-plugin": "^1.3.4",
-        "sass": "^1.62.1",
         "raw-loader": "^4.0.0",
+        "sass": "^1.62.1",
         "sass-loader": "^12.6.0",
         "sass-resources-loader": "^2.1.1",
         "stylelint-webpack-plugin": "^2.1.1",
@@ -71,6 +71,7 @@
         "@deriv/bot-skeleton": "^1.0.0",
         "@deriv/components": "^1.0.0",
         "@deriv/deriv-charts": "1.4.0",
+        "@deriv/deriv-charts-beta": "npm:@deriv/deriv-charts@^2.0.0-beta.14",
         "@deriv/shared": "^1.0.0",
         "@deriv/stores": "^1.0.0",
         "@deriv/translations": "^1.0.0",

diff --git a/packages/bot-web-ui/src/components/chart/__tests__/toolbar-widgets.spec.tsx b/packages/bot-web-ui/src/components/chart/__tests__/toolbar-widgets.spec.tsx
@@ -51,21 +51,31 @@ describe('ToolbarWidgets', () => {
         );
     });
 
-    it('should render ToolbarWidgets in desktop', () => {
+    it('should render ToolbarWidgets in desktop', async () => {
         (isMobile as jest.Mock).mockReturnValueOnce(false);
         (isDesktop as jest.Mock).mockReturnValueOnce(true);
-        render(<ToolbarWidgets updateChartType={mockUpdateChartType} updateGranularity={mockUpdateGranularity} />, {
-            wrapper,
-        });
-        expect(screen.getByText('Mocked StudyLegend')).toBeInTheDocument();
+        render(
+            <React.Suspense fallback={<div />}>
+                <ToolbarWidgets updateChartType={mockUpdateChartType} updateGranularity={mockUpdateGranularity} />
+            </React.Suspense>,
+            {
+                wrapper,
+            }
+        );
+        expect(await screen.findByText('Mocked StudyLegend')).toBeInTheDocument();
     });
 
-    it('should render ToolbarWidgets in mobile', () => {
+    it('should render ToolbarWidgets in mobile', async () => {
         (isMobile as jest.Mock).mockReturnValueOnce(true);
         (isDesktop as jest.Mock).mockReturnValueOnce(false);
-        render(<ToolbarWidgets updateChartType={mockUpdateChartType} updateGranularity={mockUpdateGranularity} />, {
-            wrapper,
-        });
-        expect(screen.queryByText('Mocked StudyLegend')).not.toBeInTheDocument();
+        render(
+            <React.Suspense fallback={<div />}>
+                <ToolbarWidgets updateChartType={mockUpdateChartType} updateGranularity={mockUpdateGranularity} />
+            </React.Suspense>,
+            {
+                wrapper,
+            }
+        );
+        expect(await screen.findByText('Mocked ChartMode')).toBeInTheDocument();
     });
 });