Merge remote-tracking branch 'upstream/master' into shafin/BOT-585/ch…

…ore--improve-FAQ-accordion-scroll

.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"
@@ -109,53 +110,6 @@ commands:
           name: Tag
           command: echo "<< parameters.version_name >>-$(date -u +"%Y-%m-%dT%H:%M:%SZ")" > packages/core/dist/version
 
-  docker_build_push:
-    description: "Build and Push image to docker hub"
-    parameters:
-      docker_image_latest_tag:
-        type: string
-        default: "latest-staging"
-      docker_image_name:
-        type: string
-        default: "deriv-app"
-      docker_file:
-        type: string
-        default: "Dockerfile"
-    steps:
-      - setup_remote_docker
-      - run:
-          name: Building docker image
-          command: |
-            TAG=${CIRCLE_TAG:-$CIRCLE_SHA1}
-            docker build -t ${DOCKHUB_ORGANISATION}/<< parameters.docker_image_name >>:${TAG} -t ${DOCKHUB_ORGANISATION}/<< parameters.docker_image_name >>:<< parameters.docker_image_latest_tag >>  -f << parameters.docker_file >> .
-      - run:
-          name: Pushing Image to docker hub
-          command: |
-            TAG=${CIRCLE_TAG:-$CIRCLE_SHA1}
-            echo $DOCKERHUB_PASSWORD | docker login -u $DOCKERHUB_USERNAME --password-stdin
-            docker push ${DOCKHUB_ORGANISATION}/<< parameters.docker_image_name >>:<< parameters.docker_image_latest_tag >>
-            docker push ${DOCKHUB_ORGANISATION}/<< parameters.docker_image_name >>:${TAG}
-  k8s_deploy:
-    description: "Deploy to k8s cluster"
-    parameters:
-      k8s_namespace:
-        type: string
-        default: "deriv-app-staging"
-      k8s_service:
-        type: string
-        default: "deriv-app"
-    steps:
-      - k8s/install-kubectl
-      - run:
-          name: Deploying to k8s cluster to namespace << parameters.k8s_namespace >>
-          command: |
-            TAG=${CIRCLE_TAG:-$CIRCLE_SHA1}
-            export NAMESPACE=<< parameters.k8s_namespace >>
-            git clone https://github.com/binary-com/devops-ci-scripts
-            cd devops-ci-scripts/k8s-build_tools
-            echo $CA_CRT | base64 --decode > ca.crt
-            ./release.sh << parameters.k8s_service >> ${TAG}
-
   publish_to_pages_staging:
     description: "Publish to cloudflare pages"
     steps:
@@ -202,8 +156,6 @@ jobs:
           root: packages
           paths:
             - core
-      - docker_build_push
-      - k8s_deploy
       - notify_slack
     environment:
       NODE_ENV: staging
@@ -222,10 +174,8 @@ jobs:
           root: packages
           paths:
             - core
-      - docker_build_push:
-          docker_image_latest_tag: latest
-      - k8s_deploy:
-          k8s_namespace: "deriv-app-production"
+
+
       - notify_slack
     environment:
       NODE_ENV: staging
@@ -278,6 +228,12 @@ jobs:
       # - run:
       #     name: "Check TypeScript for @deriv/cashier"
       #     command: npx tsc --project packages/cashier/tsconfig.json -noEmit
+      - run:
+          name: "Check ESLint for @deriv/wallets"
+          command: npx eslint --fix --config packages/wallets/.eslintrc.js packages/wallets
+      - run:
+          name: "Check Stylelint for @deriv/wallets"
+          command: npx stylelint packages/wallets/**/*.scss
       - run:
           name: "Check tests for @deriv/hooks"
           command: bash ./scripts/check-tests.sh packages/hooks/src

.github/CODEOWNERS

@@ -155,3 +155,15 @@
 /packages/trader/**/*                                           @matin-deriv @maryia-deriv
 
 
+# ==============================================================
+#  deriv-app/wallets
+# ==============================================================
+
+/packages/wallets/**/*                                          @adrienne-deriv @thisyahlen-deriv @farhan-nurzi-deriv
+
+
+# ==============================================================
+#  deriv-app/api
+# ==============================================================
+
+/packages/api/**/*                                              @adrienne-deriv @thisyahlen-deriv @farhan-nurzi-deriv

.gitignore

@@ -23,4 +23,6 @@ packages/appstore/lib/
 packages/appstore/.out
 .env
 nx-cloud.env
-
+test-results/
+playwright-report/
+playwright/.cache/

.husky/pre-commit

@@ -1,4 +1,6 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-npx lint-staged --allow-empty
+npx lint-staged --allow-empty
+
+bash ./.husky/secret-scanner.sh

.husky/secret-scanner.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+
+#checking absolute paths
+if command -v trufflehog &> /dev/null; then
+    trufflehog_path="trufflehog"
+elif [[ -x /usr/local/bin/trufflehog ]]; then
+    trufflehog_path="/usr/local/bin/trufflehog"
+elif [[ -x /opt/homebrew/bin/trufflehog ]]; then
+    trufflehog_path="/opt/homebrew/bin/trufflehog"
+else
+    echo "Trufflehog is not setup. Please connect with Product Security Team"
+    exit 1
+fi
+
+# Use `filesysytem` if the git repo does not have any commits i.e its a new git repo.
+if git log -1 > /dev/null 2>&1; then
+    $trufflehog_path git file://. --no-update --since-commit HEAD --fail > /tmp/trufflehog_output_$(whoami) 2>&1
+    trufflehog_exit_code=$?
+else
+    $trufflehog_path filesystem . --no-update --fail > /tmp/trufflehog_output_$(whoami) 2>&1
+    trufflehog_exit_code=$?
+fi
+
+# Only display results to stdout if trufflehog found something.
+if [ $trufflehog_exit_code -eq 183 ]; then
+    cat /tmp/trufflehog_output_$(whoami)
+    echo "TruffleHog found secrets. Aborting commit. use --no-verify to bypass it"
+    exit $trufflehog_exit_code
+fi

.stylelintrc.js

@@ -36,7 +36,7 @@ module.exports = {
         'shorthand-property-no-redundant-values': true,
         'string-no-newline': true,
         'time-min-milliseconds': 100,
-        'unit-allowed-list': ['fr', 'px', 'em', 'rem', '%', 'vw', 'vh', 'deg', 'ms', 's', 'dpcm'],
+        'unit-allowed-list': ['fr', 'px', 'em', 'rem', '%', 'svh', 'vw', 'vh', 'deg', 'ms', 's', 'dpcm'],
         'value-keyword-case': 'lower',
     },
     extends: [