Skip to content

Commit

Permalink
Merge branch 'master' into mitra-trah-3842-add-deposit-banner
Browse files Browse the repository at this point in the history
  • Loading branch information
mitra-deriv committed Oct 17, 2024
2 parents 109bdde + 828f210 commit 4cd53db
Show file tree
Hide file tree
Showing 2,469 changed files with 62,863 additions and 66,129 deletions.
1 change: 0 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ module.exports = {
},
{
files: ['**/__tests__/**/*.[jt]s?(x)', '**/?(*.)+(spec|test).[jt]s?(x)'],
excludedFiles: '**/integration-tests/**/*.[jt]s?(x)',
extends: ['plugin:testing-library/react'],
},
{
Expand Down
80 changes: 38 additions & 42 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# ==================================================================================
# ==================================================================================
#
# Configuration of code ownership and review approvals for the binary-com/deriv-app repo.
# Configuration of code ownership and review approvals for the deriv-com/deriv-app repo.
#
# More info: https://help.github.com/articles/about-codeowners/
#
Expand Down Expand Up @@ -38,15 +38,26 @@
# ali-hosseini-deriv
# amina-deriv
# balakrishna-deriv
# dan-deriv
# farrah-deriv
# habib-deriv
# heorhi-deriv
# hirad-deriv
# mahdiyeh-deriv
# maryia-deriv
# jim-deriv
# likhith-deriv
# matin-deriv
# nada-deriv
# nijil-deriv
# sandeep-deriv
# yashim-deriv
# shafin-deriv
# vinu-deriv
# wojciech-deriv
# yashim-deriv
# farabi-deriv
# maryia-matskevich-deriv
# shahzaib-deriv
# rupato-deriv
# akmal-deriv

######################################################################################################
#
Expand All @@ -66,124 +77,109 @@
# (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)
# ==============================================================

* @balakrishna-deriv @yashim-deriv @wojciech-deriv @matin-deriv @markwylde-deriv
* @ali-hosseini-deriv @dan-deriv @matin-deriv @wojciech-deriv @yashim-deriv


# ==============================================================
# deriv-app/account
# ==============================================================

/packages/account/**/* @matin-deriv @amina-deriv @maryia-deriv


# ==============================================================
# deriv-app/analytics
# ==============================================================

/packages/analytics/**/* @ali-hosseini-deriv
/packages/account/**/* @ali-hosseini-deriv @amina-deriv @likhith-deriv @matin-deriv


# ==============================================================
# deriv-app/appstore
# ==============================================================

/packages/appstore/**/* @matin-deriv @mahdiyeh-deriv @nijil-deriv
/packages/appstore/**/* @ali-hosseini-deriv @amina-deriv @balakrishna-deriv @farrah-deriv @habib-deriv @matin-deriv @nijil-deriv @sandeep-deriv @wojciech-deriv @yashim-deriv


# ==============================================================
# deriv-app/bot
# ==============================================================

/packages/bot-skeleton/**/* @sandeep-deriv @vinu-deriv
/packages/bot-web-ui/**/* @sandeep-deriv @vinu-deriv
/packages/indicators/**/* @sandeep-deriv @vinu-deriv
/packages/bot-skeleton/**/* @sandeep-deriv @shafin-deriv @wojciech-deriv
/packages/bot-web-ui/**/* @sandeep-deriv @shafin-deriv @wojciech-deriv
/packages/indicators/**/* @sandeep-deriv @shafin-deriv @wojciech-deriv


# ==============================================================
# deriv-app/cashier
# ==============================================================

/packages/cashier/**/* @farrah-deriv @nijil-deriv @wojciech-deriv
/packages/cashier/**/* @heorhi-deriv @nijil-deriv @wojciech-deriv


# ==============================================================
# deriv-app/cfd
# ==============================================================

/packages/cfd/**/* @hirad-deriv @matin-deriv
/packages/cfd/**/* @ali-hosseini-deriv @habib-deriv @hirad-deriv


# ==============================================================
# deriv-app/core
# ==============================================================

/packages/api/**/* @ali-hosseini-deriv @matin-deriv
/packages/core/**/* @ali-hosseini-deriv @matin-deriv @maryia-deriv
/packages/shared/**/* @ali-hosseini-deriv @matin-deriv @maryia-deriv
/packages/components/**/* @ali-hosseini-deriv @matin-deriv @maryia-deriv
/packages/translations/**/* @ali-hosseini-deriv @matin-deriv @maryia-deriv
/packages/utils/**/* @ali-hosseini-deriv @matin-deriv @maryia-deriv
/packages/hooks/**/* @ali-hosseini-deriv @matin-deriv
/packages/stores/**/* @ali-hosseini-deriv @matin-deriv @maryia-deriv
/packages/core/**/* @ali-hosseini-deriv @amina-deriv @balakrishna-deriv @farrah-deriv @habib-deriv @matin-deriv @nijil-deriv @sandeep-deriv @wojciech-deriv @yashim-deriv
/packages/shared/**/* @ali-hosseini-deriv @amina-deriv @balakrishna-deriv @farrah-deriv @habib-deriv @matin-deriv @nijil-deriv @sandeep-deriv @wojciech-deriv @yashim-deriv
/packages/components/**/* @ali-hosseini-deriv @amina-deriv @balakrishna-deriv @farrah-deriv @habib-deriv @matin-deriv @nijil-deriv @sandeep-deriv @wojciech-deriv @yashim-deriv
/packages/translations/**/* @ali-hosseini-deriv @amina-deriv @balakrishna-deriv @farrah-deriv @habib-deriv @matin-deriv @nijil-deriv @sandeep-deriv @wojciech-deriv @yashim-deriv @heorhi-deriv @jim-deriv @vinu-deriv @nada-deriv @hirad-deriv @farabi-deriv @likhith-deriv @maryia-matskevich-deriv @shahzaib-deriv @rupato-deriv @akmal-deriv
/packages/utils/**/* @ali-hosseini-deriv @amina-deriv @balakrishna-deriv @farrah-deriv @habib-deriv @matin-deriv @nijil-deriv @sandeep-deriv @wojciech-deriv @yashim-deriv
/packages/hooks/**/* @ali-hosseini-deriv @amina-deriv @balakrishna-deriv @farrah-deriv @habib-deriv @matin-deriv @nijil-deriv @sandeep-deriv @wojciech-deriv @yashim-deriv
/packages/stores/**/* @ali-hosseini-deriv @amina-deriv @balakrishna-deriv @farrah-deriv @habib-deriv @matin-deriv @nijil-deriv @sandeep-deriv @wojciech-deriv @yashim-deriv


# ==============================================================
# deriv-app/p2p
# ==============================================================

/packages/p2p/**/* @farrah-deriv @nijil-deriv
/packages/p2p/**/* @ali-hosseini-deriv @farrah-deriv @matin-deriv @nada-deriv


# ==============================================================
# deriv-app/publisher
# ==============================================================

/packages/publisher/**/* @nijil-deriv
/packages/publisher/**/* @ali-hosseini-deriv @wojciech-deriv


# ==============================================================
# deriv-app/reports
# ==============================================================

/packages/reports/**/* @mahdiyeh-deriv @matin-deriv @maryia-deriv
/packages/reports/**/* @heorhi-deriv @nijil-deriv @vinu-deriv @wojciech-deriv


# ==============================================================
# deriv-app/trader
# ==============================================================

/packages/trader/**/* @matin-deriv @maryia-deriv


# ==============================================================
# deriv-app/tradershub
# ==============================================================

/packages/tradershub/**/* @matin-deriv @mahdiyeh-deriv @thisyahlen-deriv
/packages/trader/**/* @nijil-deriv @vinu-deriv @wojciech-deriv


# ==============================================================
# deriv-app/wallets
# ==============================================================

/packages/wallets/**/* @adrienne-deriv @thisyahlen-deriv @farhan-nurzi-deriv @wojciech-deriv @aizad-deriv @heorhi-deriv
/packages/wallets/**/* @heorhi-deriv @jim-deriv @nijil-deriv @wojciech-deriv


# ==============================================================
# deriv-app/api
# Deprecated - do not use. For -v2 projects use api-v2. For old projects - do not use api nor api-v2, use old patterns / old hooks.
# ==============================================================

/packages/api/**/* @wojciech-deriv @matin-deriv @yashim-deriv
/packages/api/**/* @ali-hosseini-deriv @wojciech-deriv

# ==============================================================
# deriv-app/api-v2
# ==============================================================

/packages/api-v2/**/* @adrienne-deriv @thisyahlen-deriv @farhan-nurzi-deriv @wojciech-deriv @ali-hosseini-deriv @amina-deriv @balakrishna-deriv @farrah-deriv @hirad-deriv @mahdiyeh-deriv @maryia-deriv @matin-deriv @nijil-deriv @sandeep-deriv @yashim-deriv
/packages/api-v2/**/* @ali-hosseini-deriv @amina-deriv @balakrishna-deriv @farrah-deriv @habib-deriv @matin-deriv @nijil-deriv @sandeep-deriv @wojciech-deriv @yashim-deriv

# ==============================================================
# scripts/check-imports.js
# ==============================================================

/scripts/check-imports.js @wojciech-deriv @matin-deriv @yashim-deriv
/scripts/check-imports.js @ali-hosseini-deriv @matin-deriv @wojciech-deriv @yashim-deriv
7 changes: 5 additions & 2 deletions .github/actions/publish_to_pages_uat/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ inputs:
CLOUDFLARE_API_TOKEN:
description: 'Cloudflare token'
required: true
BRANCH_NAME:
description: 'Branch name'
required: true
runs:
using: composite
steps:
Expand All @@ -17,6 +20,6 @@ runs:
run: |
npm i [email protected]
cd packages/core
npx wrangler pages deploy dist/ --project-name=deriv-app-pages --branch=uat
echo "New uat website - https://uat.cf-pages-deriv-app.deriv.com"
npx wrangler pages deploy dist/ --project-name=deriv-app-pages --branch=${{ inputs.BRANCH_NAME }}
echo "New uat website - https://${{ inputs.BRANCH_NAME }}.cf-pages-deriv-app.deriv.com"
shell: bash
2 changes: 1 addition & 1 deletion .github/workflows/automationrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"checks_limit": 40
},
"circleci": {
"project_slug": "gh/binary-com/deriv-app",
"project_slug": "gh/deriv-com/deriv-app",
"branch": "master",
"workflow_name": "release_staging"
},
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/generate_and_push_deriv_api_types.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:

jobs:
generate_and_push_deriv_api_types:
if: github.repository == 'binary-com/deriv-app'
if: github.repository == 'deriv-com/deriv-app'
runs-on: "ubuntu-latest"
steps:
- name: Setup node
Expand Down Expand Up @@ -112,5 +112,5 @@ jobs:
sudo apt install gh
gh auth login --with-token <<< ${{ github.token }}
gh pr close "$package_name" || true
gh pr create --title "Bump $package_name from $safe_old_version to $new_version" --body "Diff url: $diff_url\n \`\`\`diff ${pr_body:0:5000} \`\`\`" --base "master" --head "binary-com:$package_name"
gh pr create --title "Bump $package_name from $safe_old_version to $new_version" --body "Diff url: $diff_url\n \`\`\`diff ${pr_body:0:5000} \`\`\`" --base "master" --head "deriv-com:$package_name"
fi
4 changes: 2 additions & 2 deletions .github/workflows/push_and_pull_crowdin_translations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ on:

jobs:
push_and_pull_crowdin_translations:
if: github.repository == 'binary-com/deriv-app'
if: github.repository == 'deriv-com/deriv-app'
runs-on: ubuntu-latest
strategy:
matrix:
Expand Down Expand Up @@ -153,5 +153,5 @@ jobs:
sudo apt install gh
gh auth login --with-token <<< ${{ github.token }}
gh pr close "$branch_name" || true
gh pr create --base "master" --title "Sync Crowdin Translations 📚" --head "binary-com:$branch_name" --body "This is an automated Pull Request designed to synchronize our project's translations with Crowdin. It pushes new strings for translation and pulls completed translations, ensuring our project remains multilingual and up-to-date."
gh pr create --base "master" --title "Sync Crowdin Translations 📚" --head "deriv-com:$branch_name" --body "This is an automated Pull Request designed to synchronize our project's translations with Crowdin. It pushes new strings for translation and pulls completed translations, ensuring our project remains multilingual and up-to-date."
fi
2 changes: 1 addition & 1 deletion .github/workflows/release_staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Build
uses: "./.github/actions/build"
with:
NODE_ENV: production
NODE_ENV: staging
IS_GROWTHBOOK_ENABLED: ${{ vars.IS_GROWTHBOOK_ENABLED }}
DATADOG_APPLICATION_ID: ${{ vars.DATADOG_APPLICATION_ID }}
DATADOG_CLIENT_TOKEN: ${{ vars.DATADOG_CLIENT_TOKEN }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/release_uat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,4 @@ jobs:
with:
CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
BRANCH_NAME: uat
53 changes: 53 additions & 0 deletions .github/workflows/release_uat2.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
name: Deriv App Release to UAT2 Environment
on:
workflow_dispatch:

jobs:
build_test_and_publish:
name: Build, Test and Publish to Cloudflare UAT2
runs-on: Runner_16cores_Deriv-app
environment: Staging
steps:
- name: Checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
- name: Setup Node
uses: "./.github/actions/setup_node"
- name: Install Dependencies
uses: "./.github/actions/npm_install_from_cache"
- name: Download Remote Config Backup File
uses: ./.github/actions/download_remote_config_backup
with:
REMOTE_CONFIG_URL: ${{ vars.REMOTE_CONFIG_URL }}
- name: Build
uses: "./.github/actions/build"
with:
NODE_ENV: staging
CROWDIN_WALLETS_API_KEY: ${{ secrets.CROWDIN_WALLETS_API_KEY }}
DATADOG_APPLICATION_ID: ${{ vars.DATADOG_APPLICATION_ID }}
DATADOG_CLIENT_TOKEN: ${{ vars.DATADOG_CLIENT_TOKEN }}
IS_GROWTHBOOK_ENABLED: ${{ vars.IS_GROWTHBOOK_ENABLED }}
DATADOG_CLIENT_TOKEN_LOGS: ${{ vars.DATADOG_CLIENT_TOKEN_LOGS }}
DATADOG_SESSION_REPLAY_SAMPLE_RATE: ${{ vars.DATADOG_SESSION_REPLAY_SAMPLE_RATE }}
DATADOG_SESSION_SAMPLE_RATE: ${{ vars.DATADOG_SESSION_SAMPLE_RATE }}
DATADOG_SESSION_SAMPLE_RATE_LOGS: ${{ vars.DATADOG_SESSION_SAMPLE_RATE_LOGS }}
GD_API_KEY: ${{ secrets.GD_API_KEY }}
GD_APP_ID: ${{ secrets.GD_APP_ID }}
GD_CLIENT_ID: ${{ secrets.GD_CLIENT_ID }}
RUDDERSTACK_KEY: ${{ vars.RUDDERSTACK_KEY }}
GROWTHBOOK_CLIENT_KEY: ${{ vars.GROWTHBOOK_CLIENT_KEY }}
GROWTHBOOK_DECRYPTION_KEY: ${{ vars.GROWTHBOOK_DECRYPTION_KEY }}
REF_NAME: ${{ github.ref_name }}
REMOTE_CONFIG_URL: ${{ vars.REMOTE_CONFIG_URL }}
TRUSTPILOT_API_KEY: ${{ secrets.TRUSTPILOT_API_KEY }}
- name: Versioning
uses: "./.github/actions/versioning"
with:
release_type: uat2
- name: Run tests
run: npm test
- name: Publish to Cloudflare Pages UAT2
uses: "./.github/actions/publish_to_pages_uat"
with:
CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
BRANCH_NAME: uat2
2 changes: 1 addition & 1 deletion .github/workflows/remote_config_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,6 @@ jobs:
sudo apt install gh
gh auth login --with-token <<< ${{ github.token }}
gh pr close "$REMOTE_CONFIG_BRANCH" || true
gh pr create --base "master" --title "Sync Remote Config File 🤖" --head "binary-com:$REMOTE_CONFIG_BRANCH" --body "This is an automated Pull Request designed to synchronize our project's Remote Config from Its origin. It checks for the changes in the remote config URL and in case of any change, it will update it using this PR."
gh pr create --base "master" --title "Sync Remote Config File 🤖" --head "deriv-com:$REMOTE_CONFIG_BRANCH" --body "This is an automated Pull Request designed to synchronize our project's Remote Config from Its origin. It checks for the changes in the remote config URL and in case of any change, it will update it using this PR."
fi
shell: bash
2 changes: 1 addition & 1 deletion .github/workflows/smoketests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,6 @@ jobs:
owner: 'regentmarkets',
repo: 'e2e-deriv-app',
workflow_id: 'E2E_Run_PR.yml',
ref: 'mark/pr-commit-v2',
ref: 'master',
inputs: workflowInputs
});
4 changes: 0 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,8 @@ jobs:
run: npx tsc --project packages/wallets/tsconfig.json -noEmit
- name: Check ESLint for @deriv/wallets
run: npx eslint --fix --ignore-path packages/wallets/.eslintignore --config packages/wallets/.eslintrc.js packages/wallets
- name: Check ESLint for @deriv/cashier-v2
run: npx eslint --fix --ignore-path packages/cashier-v2/.eslintignore --config packages/cashier-v2/.eslintrc.js packages/cashier-v2
- name: Check Stylelint for @deriv/wallets
run: npx stylelint packages/wallets/**/*.scss
- name: Check Stylelint for @deriv/cashier-v2
run: npx stylelint packages/cashier-v2/**/*.scss
- name: Check tests for @deriv/hooks
run: bash ./scripts/check-tests.sh packages/hooks/src
- name: Check tests for @deriv/utils
Expand Down
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@ packages/wallets/src/translations/messages.json
.env
.env.*
*.env
test-results/
playwright-report/
playwright/.cache/
.nx
packages/*/stats.json
packages/*/report.json
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

This repository contains the various platforms of the Deriv application.

![CircleCI](https://img.shields.io/circleci/build/github/binary-com/deriv-app) ![Prerequisite](https://img.shields.io/badge/node-18.x-blue.svg) ![Prerequisite](https://img.shields.io/badge/npm-9.x-blue.svg)
![Prerequisite](https://img.shields.io/badge/node-18.x-blue.svg) ![Prerequisite](https://img.shields.io/badge/npm-9.x-blue.svg)
[![lerna](https://img.shields.io/badge/maintained%20with-lerna-cc00ff.svg)](https://lerna.js.org/)
![Sonar Tech Debt](https://img.shields.io/sonar/tech_debt/binary-com_deriv-app?server=https%3A%2F%2Fsonarcloud.io)
![Sonar Violations (short format)](https://img.shields.io/sonar/violations/binary-com_deriv-app?server=https%3A%2F%2Fsonarcloud.io)
Expand Down Expand Up @@ -52,7 +52,7 @@ Before running or contribute to this project, you need to have the setup of the
2. **Clone using SSH**

```sh
git clone [email protected]:binary-com/deriv-app.git
git clone [email protected]:deriv-com/deriv-app.git
```

> **Internal**: NX and Lerna integration
Expand Down
Loading

0 comments on commit 4cd53db

Please sign in to comment.