chore: fixed merge conflicts

.circleci/config.yml

@@ -77,6 +77,7 @@ commands:
             - "packages/trader/node_modules"
             - "packages/translations/node_modules"
             - "packages/utils/node_modules"
+            - "packages/analytics/node_modules"
             # VERIFY_CACHE_FOLDERS_END (DO NOT REMOVE)
 
   build:
@@ -264,6 +265,9 @@ jobs:
       - run:
           name: "Check TypeScript for @deriv/utils"
           command: npx tsc --project packages/utils/tsconfig.json -noEmit
+      - run:
+          name: "Check TypeScript for @deriv/analytics"
+          command: npx tsc --project packages/analytics/tsconfig.json -noEmit
       - run:
           name: "Check TypeScript for @deriv/stores"
           command: npx tsc --project packages/stores/tsconfig.json -noEmit
@@ -276,6 +280,9 @@ jobs:
       - run:
           name: "Check tests for @deriv/utils"
           command: bash ./scripts/check-tests.sh packages/utils/src
+      - run:
+          name: "Check tests for @deriv/analytics"
+          command: bash ./scripts/check-tests.sh packages/analytics/src
       - build
       - run:
           name: "Run tests"

.github/workflows/coveralls.yml

@@ -0,0 +1,26 @@
+on: ["push", "pull_request"]
+
+name: Coveralls
+
+jobs:
+
+  build:
+    name: Reporter
+    runs-on: ubuntu-latest
+    steps:
+
+      - uses: actions/checkout@v3
+
+      - name: Use Node.js 18.x
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18.x
+
+      - name: Bootstrap, Build, and make test-coverage
+        run: |
+          npm ci
+          npm run bootstrap
+          npm run build:all
+          JEST_MAX_WORKERS=3 npm run test:jest
+      - name: Coveralls
+        uses: coverallsapp/github-action@v2

.github/workflows/merge_and_release_to_staging.yml

@@ -4,9 +4,9 @@ permissions:
 on:
   workflow_dispatch:
     inputs:
-      tag:
-        description: "Tag"
-        required: true
+      release_tag_task_url:
+          description: "Release Tag task URL(e.g. https://app.clickup.com/t/1**/W*-*)"
+          required: true
       skip_circleci_checks:
         description: "Skip checking CircleCI workflow"
         type: boolean
@@ -35,13 +35,10 @@ jobs:
         run: |
           sleep 10
       - name: Release issues in Deriv.app
-        uses: binary-com/fe-toolbox@production_V20230615_0
+        uses: binary-com/fe-toolbox@v0.0.2
         with:
-          tag: ${{ inputs.tag }}
+          release_tag_task_url: ${{ inputs.release_tag_task_url }}
           platform: 'Deriv.app'
-          list_id: ${{ secrets.LIST_ID }}
-          release_tags_list_id: ${{ secrets.RELEASE_TAGS_LIST_ID }}
-          regression_testing_template_id: ${{ secrets.REGRESSION_TESTING_TEMPLATE_ID }}
           config_path: ./.github/workflows/automationrc.json
           skip_circleci_checks: ${{ inputs.skip_circleci_checks }}
           skip_pending_checks: ${{ inputs.skip_pending_checks }}