chore: merge master, resolve conflicts

deriv-com · Oct 21, 2024 · b924467 · b924467
2 parents 818f1ae + 5d94382
commit b924467
Show file tree

Hide file tree

Showing 197 changed files with 6,833 additions and 3,547 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/account/build/webpack.config.js b/packages/account/build/webpack.config.js
@@ -22,6 +22,7 @@ module.exports = function (env) {
             'terms-of-use-config': 'Configs/terms-of-use-config',
             'trading-assessment-config': 'Configs/trading-assessment-config',
             'test-warning-modal': 'Components/trading-assessment/test-warning-modal',
+            'employment-tax-info-config': 'Configs/employment-tax-info-config',
         },
         mode: IS_RELEASE ? 'production' : 'development',
         module: {

diff --git a/packages/account/package.json b/packages/account/package.json
@@ -35,7 +35,7 @@
         "@deriv-com/utils": "^0.0.36",
         "@deriv-com/ui": "1.36.4",
         "@deriv/api": "^1.0.0",
-        "@deriv-com/quill-ui": "1.16.23",
+        "@deriv-com/quill-ui": "1.18.0",
         "@deriv/components": "^1.0.0",
         "@deriv/hooks": "^1.0.0",
         "@deriv/quill-icons": "1.23.3",

diff --git a/...count/src/Components/additional-kyc-info-modal/__test__/additional-kyc-info-form.spec.tsx b/...count/src/Components/additional-kyc-info-modal/__test__/additional-kyc-info-form.spec.tsx
diff --git a/...ount/src/Components/additional-kyc-info-modal/__test__/additional-kyc-info-modal.spec.tsx b/...ount/src/Components/additional-kyc-info-modal/__test__/additional-kyc-info-modal.spec.tsx
diff --git a/packages/account/src/Components/additional-kyc-info-modal/__test__/form-config.spec.tsx b/packages/account/src/Components/additional-kyc-info-modal/__test__/form-config.spec.tsx