Merge pull request #90 from suisin-deriv/suisin/resolve_conflicts

Suisin/resolve conflicts
suisin-deriv · Sep 18, 2023 · bfdb98d · bfdb98d
2 parents d099693 + 78b6d1a
commit bfdb98d
Show file tree

Hide file tree

Showing 510 changed files with 26,025 additions and 9,015 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -70,6 +70,7 @@ commands:
             - "packages/hooks/node_modules"
             - "packages/cfd/node_modules"
             - "packages/indicators/node_modules"
+            - "packages/integration/node_modules"
             - "packages/p2p/node_modules"
             - "packages/reports/node_modules"
             - "packages/shared/node_modules"

diff --git a/.gitignore b/.gitignore
@@ -23,4 +23,6 @@ packages/appstore/lib/
 packages/appstore/.out
 .env
 nx-cloud.env
-
+test-results/
+playwright-report/
+playwright/.cache/
diff --git a/end-to-end-test/.env.example b/end-to-end-test/.env.example
diff --git a/end-to-end-test/.github/workflows/playwright.yml b/end-to-end-test/.github/workflows/playwright.yml
diff --git a/end-to-end-test/.gitignore b/end-to-end-test/.gitignore
diff --git a/end-to-end-test/README.md b/end-to-end-test/README.md
diff --git a/end-to-end-test/global-setup.ts b/end-to-end-test/global-setup.ts
diff --git a/end-to-end-test/package.json b/end-to-end-test/package.json
diff --git a/end-to-end-test/playwright.config.ts b/end-to-end-test/playwright.config.ts
diff --git a/end-to-end-test/tests/change-endpoint/change-endpoint.tsx b/end-to-end-test/tests/change-endpoint/change-endpoint.tsx