chore: 🔥 resolved merge conflicts

ahmed-deriv · Oct 14, 2024 · eea6b6c · eea6b6c
2 parents de9d7ac + 7b018b8
commit eea6b6c
Show file tree

Hide file tree

Showing 15 changed files with 72 additions and 277 deletions.
diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml
@@ -14,9 +14,6 @@ inputs:
   GROWTHBOOK_CLIENT_KEY:
     description: Growthbook client key for analytics
     required: false
-  GROWTHBOOK_DECRYPTION_KEY:
-    description: Growthbook decryption key for analytics
-    required: false
 runs:
   using: composite
   steps:
@@ -26,6 +23,5 @@ runs:
         TRACKJS_TOKEN: ${{ inputs.TRACKJS_TOKEN }}
         RUDDERSTACK_KEY: ${{ inputs.RUDDERSTACK_KEY }}
         GROWTHBOOK_CLIENT_KEY: ${{ inputs.GROWTHBOOK_CLIENT_KEY }}
-        GROWTHBOOK_DECRYPTION_KEY: ${{ inputs.GROWTHBOOK_DECRYPTION_KEY }}
       run: npm run build
       shell: bash
diff --git a/.github/actions/versioning/action.yml b/.github/actions/versioning/action.yml
@@ -15,5 +15,5 @@ runs:
       env:
         RELEASE_TYPE: ${{ inputs.RELEASE_TYPE }}
         RELEASE_TAG: ${{ inputs.RELEASE_TAG }}
-      run: echo "$RELEASE_TYPE--GITHUB_REF:$RELEASE_TAG--DATE:$(date -u +'%Y-%m-%dT%H:%M:%SZ')" > build/version.txt
+      run: echo "$RELEASE_TAG" > build/version.txt
       shell: bash
diff --git a/.github/workflows/release_production.yml b/.github/workflows/release_production.yml
@@ -25,7 +25,6 @@ jobs:
           NODE_ENV: production
           TRACKJS_TOKEN: ${{ secrets.TRACKJS_TOKEN }}
           RUDDERSTACK_KEY: ${{ vars.RUDDERSTACK_KEY }}
-          GROWTHBOOK_DECRYPTION_KEY: ${{ secrets.GROWTHBOOK_DECRYPTION_KEY }}
           GROWTHBOOK_CLIENT_KEY: ${{ vars.GROWTHBOOK_CLIENT_KEY }}
       - name: Versioning
         uses: ./.github/actions/versioning
@@ -96,7 +95,7 @@ jobs:
           VERCEL_SCOPE: deriv
           ALIAS_DOMAIN_URL: 'api-docs-dr.binary.sx'
       - name: Send Slack Notification
-        if: always() && ${{ steps.publish_to_vercel.outcome != 'success'}}
+        if: ${{ steps.publish_to_vercel.outcome != 'success'}}
         uses: ./.github/actions/notify_slack
         with:
           SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}

diff --git a/.github/workflows/release_staging.yml b/.github/workflows/release_staging.yml
@@ -22,7 +22,6 @@ jobs:
         with:
           NODE_ENV: staging
           RUDDERSTACK_KEY: ${{ vars.RUDDERSTACK_KEY }}
-          GROWTHBOOK_DECRYPTION_KEY: ${{ secrets.GROWTHBOOK_DECRYPTION_KEY }}
           GROWTHBOOK_CLIENT_KEY: ${{ vars.GROWTHBOOK_CLIENT_KEY }}
       - name: Versioning
         uses: ./.github/actions/versioning

diff --git a/.github/workflows/release_test.yml b/.github/workflows/release_test.yml
@@ -27,7 +27,6 @@ jobs:
           NODE_ENV: staging
           TRACKJS_TOKEN: ${{ secrets.TRACKJS_TOKEN }}
           RUDDERSTACK_KEY: ${{ vars.RUDDERSTACK_KEY }}
-          GROWTHBOOK_DECRYPTION_KEY: ${{ secrets.GROWTHBOOK_DECRYPTION_KEY }}
           GROWTHBOOK_CLIENT_KEY: ${{ vars.GROWTHBOOK_CLIENT_KEY }}
       - name: Versioning
         uses: ./.github/actions/versioning

diff --git a/config/v3/document_upload/send.json b/config/v3/document_upload/send.json
@@ -55,6 +55,7 @@
                 "driving_licence",
                 "utility_bill",
                 "bankstatement",
+                "bank_statement",
                 "power_of_attorney",
                 "amlglobalcheck",
                 "docverification",
@@ -86,6 +87,9 @@
                 "memorandum",
                 "authorisation_letter",
                 "declarations",
+                "affidavit",
+                "official_letter",
+                "rental_agreement",
                 "business_documents_others"
             ]
         },

diff --git a/config/v3/get_account_status/receive.json b/config/v3/get_account_status/receive.json
@@ -163,6 +163,14 @@
                                                 1
                                             ]
                                         },
+                                        "mu": {
+                                            "description": "This represents whether the client is allowed or not to create an account under this jurisdiction",
+                                            "type": "integer",
+                                            "enum": [
+                                                0,
+                                                1
+                                            ]
+                                        },
                                         "samoa": {
                                             "description": "This represents whether the client is allowed or not to create an account under this jurisdiction",
                                             "type": "integer",

diff --git a/config/v3/landing_company_details/send.json b/config/v3/landing_company_details/send.json
@@ -23,7 +23,8 @@
                 "samoa-virtual",
                 "dsl",
                 "bvi",
-                "labuan"
+                "labuan",
+                "mu"
             ]
         },
         "country": {

diff --git a/config/v3/partner_accounts/receive.json b/config/v3/partner_accounts/receive.json
@@ -45,10 +45,6 @@
                                     "company"
                                 ]
                             },
-                            "platform_url": {
-                                "description": "Platform URL for Dynamic works dashboard to be redirected from Partners Hub which will be set in BackOffice.",
-                                "type": "string"
-                            },
                             "provider": {
                                 "description": "Defines the provider platform.",
                                 "type": "string",
@@ -63,6 +59,18 @@
                             }
                         }
                     }
+                },
+                "platform_url": {
+                    "description": "Platform URL for Dynamic works dashboard to be redirected from Partners Hub which will be set in BackOffice.",
+                    "type": "object",
+                    "additionalProperties": false,
+                    "patternProperties": {
+                        "^[a-zA-Z_]+$": {
+                            "description": "Partner's provider as key and platform URL as value",
+                            "type": "string",
+                            "pattern": "^[\\w_@./:#&+-]*$"
+                        }
+                    }
                 }
             }
         },

diff --git a/docusaurus.config.js b/docusaurus.config.js
@@ -21,7 +21,6 @@ const config = {
   customFields: {
     trackJsToken: process.env.TRACKJS_TOKEN,
     rudderstackKey: process.env.RUDDERSTACK_KEY,
-    growthbookDecryptionKey: process.env.GROWTHBOOK_DECRYPTION_KEY,
     growthbookClientKey: process.env.GROWTHBOOK_CLIENT_KEY,
   },
 

diff --git a/jest.config.js b/jest.config.js
@@ -22,7 +22,7 @@ module.exports = {
     '^.+\\.mjs$': 'babel-jest',
   },
   transformIgnorePatterns: [
-    'node_modules/(?!(@docusaurus|swiper|ssr-window|dom7)|@theme|@deriv-com/quill-ui)',
+    'node_modules/(?!(@docusaurus|swiper|ssr-window|dom7)|@theme|@deriv-com/quill-ui|@deriv-com/auth-client)',
   ],
   moduleNameMapper: {
     '@theme/(.*)': '@docusaurus/theme-classic/src/theme/$1',