fix: resolve conflicts

binary-com · Aug 10, 2023 · 13e96e7 · 13e96e7
2 parents 50b98b6 + 381d126
commit 13e96e7
Show file tree

Hide file tree

Showing 212 changed files with 5,841 additions and 2,677 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -161,9 +161,9 @@ commands:
       - run:
           name: "Publish to cloudflare pages (staging)"
           command: |
-            npm i wrangler@2.0.19
+            npm i wrangler@3.1.0
             cd packages/core
-            npx wrangler pages publish dist/ --project-name=deriv-app-pages --branch=staging
+            npx wrangler pages deploy dist/ --project-name=deriv-app-pages --branch=staging
             echo "New staging website - http://staging.cf-pages-deriv-app.deriv.com"
 
   publish_to_pages_production:
@@ -172,9 +172,9 @@ commands:
       - run:
           name: "Publish to cloudflare pages (production)"
           command: |
-            npm i wrangler@2.0.19
+            npm i wrangler@3.1.0
             cd packages/core
-            npx wrangler pages publish dist/ --project-name=deriv-app-pages --branch=main
+            npx wrangler pages deploy dist/ --project-name=deriv-app-pages --branch=main
             echo "New website - http://cf-pages-deriv-app.deriv.com"
 
 jobs:

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -35,14 +35,17 @@
 #  (just to make this file easier to understand)
 # ================================================
 
-#  akmal-binary
-#  bahar-fs
-#  balakrishna-binary
-#  carol-binary
-#  matin-binary
-#  mehrzad-fs
-#  nijil-binary
-#  njazuli-deriv
+#  ali-hosseini-deriv
+#  amina-deriv
+#  balakrishna-deriv
+#  farrah-deriv
+#  hirad-deriv
+#  mahdiyeh-deriv
+#  maryia-deriv
+#  matin-deriv
+#  nijil-deriv
+#  prince-deriv
+#  sandeep-deriv
 #  yashim-deriv
 
 ######################################################################################################
@@ -63,76 +66,92 @@
 # (in case no pattern matches a path in a PR - this should be treated as a bug and result in adding the path to CODEOWNERS)
 # ==============================================================
 
-*                                                               @matin-binary @nijil-binary @mehrzad-fs @balakrishna-binary 
-
+*                                                               @balakrishna-deriv @yashim-deriv
 
 
 # ==============================================================
 #  deriv-app/account
 # ==============================================================
 
-/packages/account/**/*                                          @yashim-deriv
-
+/packages/account/**/*                                          @matin-deriv @amina-deriv
 
 
 # ==============================================================
-#  deriv-app/bot
+#  deriv-app/analytics
 # ==============================================================
 
-/packages/bot-skeleton/**/*                                     @mehrzad-fs
-/packages/bot-web-ui/**/*                                       @mehrzad-fs
-/packages/indicators/**/*                                       @mehrzad-fs
+/packages/analytics/**/*                                        @ali-hosseini-deriv
 
 
 # ==============================================================
-#  deriv-app/core
+#  deriv-app/appstore
 # ==============================================================
 
-/packages/core/**/*                                             @balakrishna-binary @matin-binary 
-/packages/shared/**/*                                           @balakrishna-binary @matin-binary 
-/packages/components/**/*                                       @balakrishna-binary @matin-binary 
-/packages/translations/**/*                                     @balakrishna-binary @matin-binary 
+/packages/appstore/**/*                                         @matin-deriv @mahdiyeh-deriv @nijil-deriv
 
 
 # ==============================================================
-#  deriv-app/p2p
+#  deriv-app/bot
 # ==============================================================
 
-/packages/p2p/**/*                                              @carol-binary @nijil-binary
+/packages/bot-skeleton/**/*                                     @prince-deriv @sandeep-deriv
+/packages/bot-web-ui/**/*                                       @prince-deriv @sandeep-deriv
+/packages/indicators/**/*                                       @prince-deriv @sandeep-deriv
 
 
 # ==============================================================
 #  deriv-app/cashier
 # ==============================================================
 
-/packages/cashier/**/*                                          @bahar-fs @nijil-binary
+/packages/cashier/**/*                                          @farrah-deriv @nijil-deriv
+
 
 # ==============================================================
 #  deriv-app/cfd
 # ==============================================================
 
-/packages/cfd/**/*                                             @balakrishna-binary @matin-binary @yashim-deriv 
+/packages/cfd/**/*                                              @hirad-deriv @matin-deriv
+
 
 # ==============================================================
-#  deriv-app/trader
+#  deriv-app/core
 # ==============================================================
 
-/packages/trader/**/*                                           @matin-binary @balakrishna-binary @akmal-binary 
+/packages/api/**/*                                              @ali-hosseini-deriv @matin-deriv
+/packages/core/**/*                                             @ali-hosseini-deriv @matin-deriv
+/packages/shared/**/*                                           @ali-hosseini-deriv @matin-deriv
+/packages/components/**/*                                       @ali-hosseini-deriv @matin-deriv
+/packages/translations/**/*                                     @ali-hosseini-deriv @matin-deriv
+/packages/utils/**/*                                            @ali-hosseini-deriv @matin-deriv
+/packages/hooks/**/*                                            @ali-hosseini-deriv @matin-deriv
+/packages/stores/**/*                                           @ali-hosseini-deriv @matin-deriv
+
 
 # ==============================================================
-#  deriv-app/reports
+#  deriv-app/p2p
 # ==============================================================
 
-/packages/reports/**/*                                           @matin-binary @balakrishna-binary
+/packages/p2p/**/*                                              @farrah-deriv @nijil-deriv
+
 
 # ==============================================================
 #  deriv-app/publisher
 # ==============================================================
 
-/packages/publisher/**/*                                        @nijil-binary
+/packages/publisher/**/*                                        @nijil-deriv
+
 
 # ==============================================================
-#  deriv-app/appstore
+#  deriv-app/reports
 # ==============================================================
 
-/packages/appstore/**/*                                         @matin-binary @balakrishna-binary @njazuli-deriv @bahar-fs
+/packages/reports/**/*                                          @mahdiyeh-deriv @matin-deriv @maryia-deriv
+
+
+# ==============================================================
+#  deriv-app/trader
+# ==============================================================
+
+/packages/trader/**/*                                           @matin-deriv @maryia-deriv
+
+
diff --git a/__mocks__/globals.js b/__mocks__/globals.js
@@ -0,0 +1,4 @@
+// Mock copy-anything module which is causing issues with jest in coveralls
+jest.mock('copy-anything', () => ({
+    copy: jest.fn(),
+}));