chore: clean up conflicts

deriv-com · Oct 17, 2024 · bab48c9 · bab48c9
2 parents 1abbdc6 + 89cdcd6
commit bab48c9
Show file tree

Hide file tree

Showing 260 changed files with 27,438 additions and 16,877 deletions.
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
@@ -95,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/.gitignore b/.gitignore
@@ -27,5 +27,6 @@ yarn-error.log*
 
 .idea
 
-.vscode/settings.json
+.vscode
+.vscode*
 .vercel
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
diff --git a/.vscode/settings.json b/.vscode/settings.json
diff --git a/config/v3/get_settings/receive.json b/config/v3/get_settings/receive.json
@@ -278,6 +278,14 @@
                         "string"
                     ]
                 },
+                "tin_skipped": {
+                    "description": "[Optional] Whether the client has skipped the TIN form. Only applicable for real money account.",
+                    "type": "integer",
+                    "enum": [
+                        0,
+                        1
+                    ]
+                },
                 "tnc_status": {
                     "description": "Terms and condition status tells us whether all the accounts of this user has accepted the latest T&C version.",
                     "type": "object"

diff --git a/config/v3/new_account_maltainvest/example.json b/config/v3/new_account_maltainvest/example.json
@@ -38,6 +38,7 @@
     "source_of_wealth": "Company Ownership",
     "tax_identification_number": "111-222-333",
     "tax_residence": "de,nl",
+    "tin_skipped": 0,
     "tnc_acceptance": 1,
     "trading_experience_financial_instruments": "Less than a year",
     "trading_frequency_financial_instruments": "1 - 5 transactions in the past 12 months"

diff --git a/config/v3/new_account_maltainvest/send.json b/config/v3/new_account_maltainvest/send.json
@@ -390,6 +390,14 @@
             "type": "string",
             "pattern": "^[a-z]{0,2}(?:,[a-z]{2})*$"
         },
+        "tin_skipped": {
+            "description": "[Optional] Whether the client has skipped the TIN form. Only applicable for real money account.",
+            "type": "integer",
+            "enum": [
+                0,
+                1
+            ]
+        },
         "tnc_acceptance": {
             "description": "The tnc acceptance status of the user.",
             "type": "integer",

diff --git a/config/v3/new_account_real/example.json b/config/v3/new_account_real/example.json
@@ -20,5 +20,6 @@
     "secret_question": "Mother's maiden name",
     "tax_identification_number": "012142545",
     "tax_residence": "ar,sg",
+    "tin_skipped": 0,
     "tnc_acceptance": 1
 }
diff --git a/config/v3/new_account_real/send.json b/config/v3/new_account_real/send.json
@@ -97,6 +97,17 @@
             "type": "string",
             "pattern": "^[0-9]{4}-[0-9]{1,2}-[0-9]{1,2}$"
         },
+        "employment_status": {
+            "description": "Employment Status.",
+            "type": "string",
+            "enum": [
+                "Employed",
+                "Pensioner",
+                "Self-Employed",
+                "Student",
+                "Unemployed"
+            ]
+        },
         "fatca_declaration": {
             "description": "[Optional] Indicates client's self-declaration of FATCA.",
             "type": "integer",
@@ -183,6 +194,14 @@
             "type": "string",
             "pattern": "^[a-z]{0,2}(?:,[a-z]{2})*$"
         },
+        "tin_skipped": {
+            "description": "[Optional] Whether the client has skipped the TIN form. Only applicable for real money account.",
+            "type": "integer",
+            "enum": [
+                0,
+                1
+            ]
+        },
         "tnc_acceptance": {
             "description": "The tnc acceptance status of the user.",
             "type": "integer",

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/config/v3/residence_list/receive.json b/config/v3/residence_list/receive.json
@@ -73,6 +73,10 @@
                                         "description": "Mandatory TIN flag",
                                         "type": "boolean"
                                     },
+                                    "poi_equivalent": {
+                                        "description": "POI equivalent flag",
+                                        "type": "boolean"
+                                    },
                                     "tin_cleaner": {
                                         "description": "Cleanup regex",
                                         "type": "string"

diff --git a/config/v3/set_settings/example.json b/config/v3/set_settings/example.json
@@ -13,5 +13,6 @@
     "preferred_language": "EN",
     "request_professional_status": 1,
     "tax_identification_number": "987654321",
-    "tax_residence": "hk"
+    "tax_residence": "hk",
+    "tin_skipped": 0
 }
diff --git a/config/v3/set_settings/send.json b/config/v3/set_settings/send.json
@@ -217,6 +217,14 @@
             "type": "string",
             "pattern": "^[a-z]{0,2}(?:,[a-z]{2})*$"
         },
+        "tin_skipped": {
+            "description": "[Optional] Whether the client has skipped the TIN form. Only applicable for real money account.",
+            "type": "integer",
+            "enum": [
+                0,
+                1
+            ]
+        },
         "trading_hub": {
             "description": "[Optional] Enable/Disable Trading Hub dashboard",
             "type": "integer",

diff --git a/docusaurus.config.js b/docusaurus.config.js
@@ -51,6 +51,7 @@ const config = {
         ],
       },
     ],
+    require.resolve('./plugins/custom-webpack-plugin'),
   ],
 
   presets: [
@@ -105,21 +106,22 @@ const config = {
             position: 'left',
             label: 'Documentation',
           },
-          { to: 'dashboard', label: 'Dashboard', position: 'left' },
           {
             to: 'api-explorer',
             position: 'left',
-            label: 'API Explorer',
+            label: 'API explorer',
           },
-          { to: 'https://tech.deriv.com/', label: 'Blog', position: 'left' },
-          { to: 'https://hackerone.com/deriv?type=team', label: 'Bug bounty', position: 'left' },
           {
-            type: 'custom-navbar-separator',
-            position: 'right',
+            to: 'https://tech.deriv.com/',
+            label: 'Deriv tech',
+            position: 'left',
+            className: 'external-nav-link',
           },
           {
-            type: 'custom-api-token-navbar-item',
-            position: 'right',
+            to: 'https://hackerone.com/deriv?type=team',
+            label: 'Bug bounty',
+            position: 'left',
+            className: 'external-nav-link',
           },
           {
             type: 'custom-user-navbar-item',