From d30a7374e04e176df57fa449909fa1da101314e4 Mon Sep 17 00:00:00 2001 From: Likhith Kolayari Date: Mon, 13 May 2024 11:54:45 +0400 Subject: [PATCH 1/5] chore: added deriv sharable libs to account package --- package-lock.json | 8 +- packages/account-v2/package.json | 2 +- packages/account-v2/src/modules/package.json | 2 +- packages/account/build/webpack.config.js | 2 + packages/account/package.json | 4 +- .../src/Assets/ic-12-months-expiry.svg | 63 ------- .../account/src/Assets/ic-blurry-document.svg | 155 ------------------ .../src/Assets/ic-cropped-document.svg | 78 --------- .../Assets/ic-document-address-mismatch.svg | 58 ------- .../src/Assets/ic-document-name-mismatch.svg | 50 ------ packages/account/src/Assets/ic-envelop.svg | 110 ------------- .../poa-common-mistake-examples-config.tsx | 26 +-- packages/cashier-v2/package.json | 2 +- packages/core/package.json | 3 +- packages/p2p-v2/package.json | 2 +- packages/tradershub/package.json | 2 +- packages/wallets/package.json | 2 +- 17 files changed, 30 insertions(+), 539 deletions(-) delete mode 100644 packages/account/src/Assets/ic-12-months-expiry.svg delete mode 100644 packages/account/src/Assets/ic-blurry-document.svg delete mode 100644 packages/account/src/Assets/ic-cropped-document.svg delete mode 100644 packages/account/src/Assets/ic-document-address-mismatch.svg delete mode 100644 packages/account/src/Assets/ic-document-name-mismatch.svg delete mode 100644 packages/account/src/Assets/ic-envelop.svg diff --git a/package-lock.json b/package-lock.json index 7304473b9f91..82a8a0f27f98 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,7 +22,7 @@ "@deriv/deriv-charts": "^2.1.15", "@deriv/js-interpreter": "^3.0.0", "@deriv/quill-design": "^1.3.2", - "@deriv/quill-icons": "^1.22.4", + "@deriv/quill-icons": "^1.22.7", "@deriv/react-joyride": "^2.6.2", "@deriv/ui": "^0.6.0", "@livechat/customer-sdk": "^2.0.4", @@ -3078,9 +3078,9 @@ } }, "node_modules/@deriv/quill-icons": { - "version": "1.22.4", - "resolved": "https://registry.npmjs.org/@deriv/quill-icons/-/quill-icons-1.22.4.tgz", - "integrity": "sha512-05/DpUwWo17ECaPHeSlcFHeJOSF60ONDa6BthkIFwpBzTSaQgeD/s+Hwd0CivQDEaqjxJPoY2y54+EZ3ubmaWA==", + "version": "1.22.7", + "resolved": "https://registry.npmjs.org/@deriv/quill-icons/-/quill-icons-1.22.7.tgz", + "integrity": "sha512-6+HkLQya5dSllZ1gPwxrJuPPAFphSSieGhbpeWyrJsgKCFog9JmfKUoVdE/WmItElAh+JW3TWqzcQIOKklySMQ==", "peerDependencies": { "react": ">= 16", "react-dom": ">= 16" diff --git a/packages/account-v2/package.json b/packages/account-v2/package.json index 606c3156bce1..46e14df09a6f 100644 --- a/packages/account-v2/package.json +++ b/packages/account-v2/package.json @@ -16,7 +16,7 @@ "@deriv-com/utils": "^0.0.20", "@deriv/api-types": "^1.0.172", "@deriv/api-v2": "^1.0.0", - "@deriv/quill-icons": "^1.22.4", + "@deriv/quill-icons": "^1.22.7", "class-variance-authority": "^0.7.0", "dayjs": "^1.11.10", "formik": "^2.1.4", diff --git a/packages/account-v2/src/modules/package.json b/packages/account-v2/src/modules/package.json index 793cc25ec763..20bb3eaab357 100644 --- a/packages/account-v2/src/modules/package.json +++ b/packages/account-v2/src/modules/package.json @@ -27,7 +27,7 @@ ], "peerDependencies": { "@deriv-com/ui": "~1.14.5", - "@deriv/quill-icons": "~1.22.4", + "@deriv/quill-icons": "~1.22.7", "@deriv/api-v2": "1.0.0", "yup": "^0.32.11", "formik": "^2.1.4", diff --git a/packages/account/build/webpack.config.js b/packages/account/build/webpack.config.js index d4e8d6b2e42c..e2d317aebc35 100644 --- a/packages/account/build/webpack.config.js +++ b/packages/account/build/webpack.config.js @@ -97,6 +97,8 @@ module.exports = function (env) { '@deriv/components': '@deriv/components', '@deriv/translations': '@deriv/translations', '@deriv-com/analytics': `@deriv-com/analytics`, + '@deriv/quill-icons': `@deriv/quill-icons`, + '@deriv-com/utils': '@deriv-com/utils', }, /^@deriv\/shared\/.+$/, /^@deriv\/components\/.+$/, diff --git a/packages/account/package.json b/packages/account/package.json index 26795af12eb5..2abcd5143fb7 100644 --- a/packages/account/package.json +++ b/packages/account/package.json @@ -30,11 +30,13 @@ "dependencies": { "@binary-com/binary-document-uploader": "^2.4.8", "@deriv-com/analytics": "1.4.13", - "@deriv/api-types": "^1.0.172", + "@deriv-com/utils": "^0.0.20", "@deriv/api": "^1.0.0", + "@deriv/api-types": "^1.0.172", "@deriv/components": "^1.0.0", "@deriv/hooks": "^1.0.0", "@deriv/integration": "1.0.0", + "@deriv/quill-icons": "^1.22.7", "@deriv/shared": "^1.0.0", "@deriv/stores": "^1.0.0", "@deriv/translations": "^1.0.0", diff --git a/packages/account/src/Assets/ic-12-months-expiry.svg b/packages/account/src/Assets/ic-12-months-expiry.svg deleted file mode 100644 index ec790c0cc6c6..000000000000 --- a/packages/account/src/Assets/ic-12-months-expiry.svg +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/packages/account/src/Assets/ic-blurry-document.svg b/packages/account/src/Assets/ic-blurry-document.svg deleted file mode 100644 index d0cdf47114e8..000000000000 --- a/packages/account/src/Assets/ic-blurry-document.svg +++ /dev/null @@ -1,155 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/packages/account/src/Assets/ic-cropped-document.svg b/packages/account/src/Assets/ic-cropped-document.svg deleted file mode 100644 index d9914cf734d9..000000000000 --- a/packages/account/src/Assets/ic-cropped-document.svg +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/packages/account/src/Assets/ic-document-address-mismatch.svg b/packages/account/src/Assets/ic-document-address-mismatch.svg deleted file mode 100644 index d53d8f41fe78..000000000000 --- a/packages/account/src/Assets/ic-document-address-mismatch.svg +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/packages/account/src/Assets/ic-document-name-mismatch.svg b/packages/account/src/Assets/ic-document-name-mismatch.svg deleted file mode 100644 index 427dc50f014d..000000000000 --- a/packages/account/src/Assets/ic-document-name-mismatch.svg +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/packages/account/src/Assets/ic-envelop.svg b/packages/account/src/Assets/ic-envelop.svg deleted file mode 100644 index 92d0b680b584..000000000000 --- a/packages/account/src/Assets/ic-envelop.svg +++ /dev/null @@ -1,110 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/packages/account/src/Configs/poa-common-mistake-examples-config.tsx b/packages/account/src/Configs/poa-common-mistake-examples-config.tsx index 34d1b4b4b11f..68db4b6f622c 100644 --- a/packages/account/src/Configs/poa-common-mistake-examples-config.tsx +++ b/packages/account/src/Configs/poa-common-mistake-examples-config.tsx @@ -1,12 +1,14 @@ import React from 'react'; import { Localize } from '@deriv/translations'; -import IcDocumentNameMismatch from '../Assets/ic-document-name-mismatch.svg'; -import IcDocumentAddressMismatch from '../Assets/ic-document-address-mismatch.svg'; +import { + DerivLightIcBlurryDocumentIcon, + DerivLightIcCroppedDocumentIcon, + DerivLightIcDocumentAddressMismatchIcon, + DerivLightIcDocumentNameMismatchIcon, + DerivLightIcEnvelopeIcon, + DerivLightIcOldIssuedDocumentIcon, +} from '@deriv/quill-icons'; import Ic6MonthsIssuedDocument from '../Assets/ic-6-month-issued-document.svg'; -import Ic12MonthsIssuedDocument from '../Assets/ic-12-months-expiry.svg'; -import IcBlurryDocument from '../Assets/ic-blurry-document.svg'; -import IcCroppedDocument from '../Assets/ic-cropped-document.svg'; -import IcEnvelope from '../Assets/ic-envelop.svg'; type TExampleImageConfig = { image: React.ComponentType>; @@ -19,12 +21,12 @@ type TExampleImageConfig = { */ export const getExampleImagesConfig = (is_eu: boolean): Array => [ { - image: IcDocumentNameMismatch, + image: DerivLightIcDocumentNameMismatchIcon, description: , ref: 'name_mismatch', }, { - image: IcDocumentAddressMismatch, + image: DerivLightIcDocumentAddressMismatchIcon, description: , ref: 'address_mismatch', }, @@ -36,23 +38,23 @@ export const getExampleImagesConfig = (is_eu: boolean): Array, ref: 'old_12_month_issued_document', }), }, { - image: IcBlurryDocument, + image: DerivLightIcBlurryDocumentIcon, description: , ref: 'blurry_document', }, { - image: IcCroppedDocument, + image: DerivLightIcCroppedDocumentIcon, description: , ref: 'cropped_document', }, { - image: IcEnvelope, + image: DerivLightIcEnvelopeIcon, description: , ref: 'envelope', }, diff --git a/packages/cashier-v2/package.json b/packages/cashier-v2/package.json index cb20db352836..fb1614eee0f4 100644 --- a/packages/cashier-v2/package.json +++ b/packages/cashier-v2/package.json @@ -17,7 +17,7 @@ "@deriv-com/utils": "^0.0.20", "@deriv/api-v2": "^1.0.0", "@deriv/integration": "^1.0.0", - "@deriv/quill-icons": "^1.22.4", + "@deriv/quill-icons": "^1.22.7", "@deriv/utils": "^1.0.0", "clsx": "^2.0.0", "formik": "^2.1.4", diff --git a/packages/core/package.json b/packages/core/package.json index 364e29ba8c81..f2e5f3c49bde 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -111,6 +111,7 @@ "@deriv/p2p": "^0.7.3", "@deriv/p2p-v2": "^1.0.0", "@deriv/quill-design": "^1.3.2", + "@deriv/quill-icons": "^1.22.7", "@deriv/reports": "^1.0.0", "@deriv/shared": "^1.0.0", "@deriv/stores": "^1.0.0", @@ -153,8 +154,6 @@ "react-tiny-popover": "^7.0.1", "react-transition-group": "4.4.2", "react-window": "^1.8.5", - "@simplewebauthn/browser": "^8.3.4", - "@simplewebauthn/typescript-types": "^8.3.4", "usehooks-ts": "^2.7.0" } } diff --git a/packages/p2p-v2/package.json b/packages/p2p-v2/package.json index 5ca74e8a4b84..53bc47d32df9 100644 --- a/packages/p2p-v2/package.json +++ b/packages/p2p-v2/package.json @@ -17,7 +17,7 @@ "@deriv-com/utils": "^0.0.20", "@deriv/api-v2": "^1.0.0", "@deriv/integration": "^1.0.0", - "@deriv/quill-icons": "^1.22.4", + "@deriv/quill-icons": "^1.22.7", "@deriv/react-joyride": "^2.6.2", "@sendbird/chat": "^4.9.7", "@tanstack/react-table": "^8.10.3", diff --git a/packages/tradershub/package.json b/packages/tradershub/package.json index 0c57606bf89b..7b9be7aaef23 100644 --- a/packages/tradershub/package.json +++ b/packages/tradershub/package.json @@ -16,7 +16,7 @@ "dependencies": { "@deriv/api-v2": "^1.0.0", "@deriv-lib/account-v2-lib": "1.0.0", - "@deriv/quill-icons": "^1.22.4", + "@deriv/quill-icons": "^1.22.7", "@deriv-com/ui": "^1.14.5", "@deriv-com/utils": "^0.0.20", "@deriv/react-joyride": "^2.6.2", diff --git a/packages/wallets/package.json b/packages/wallets/package.json index ecfce67ab299..2973076480f7 100644 --- a/packages/wallets/package.json +++ b/packages/wallets/package.json @@ -17,7 +17,7 @@ "@deriv-com/utils": "^0.0.20", "@deriv/api-v2": "^1.0.0", "@deriv/integration": "^1.0.0", - "@deriv/quill-icons": "^1.22.4", + "@deriv/quill-icons": "^1.22.7", "@deriv/react-joyride": "^2.6.2", "@deriv/utils": "^1.0.0", "@tanstack/react-table": "^8.10.3", From 5556c43ef1dc97dded9087cca88bad021cb79203 Mon Sep 17 00:00:00 2001 From: Likhith Kolayari Date: Mon, 13 May 2024 12:21:27 +0400 Subject: [PATCH 2/5] fix svg icons --- .../src/Assets/ic-12-months-expiry.svg | 63 +++++++++++++++++++ .../src/Assets/ic-6-month-issued-document.svg | 57 ----------------- .../poa-common-mistake-examples-config.tsx | 6 +- 3 files changed, 66 insertions(+), 60 deletions(-) create mode 100644 packages/account/src/Assets/ic-12-months-expiry.svg delete mode 100644 packages/account/src/Assets/ic-6-month-issued-document.svg diff --git a/packages/account/src/Assets/ic-12-months-expiry.svg b/packages/account/src/Assets/ic-12-months-expiry.svg new file mode 100644 index 000000000000..f0409446268c --- /dev/null +++ b/packages/account/src/Assets/ic-12-months-expiry.svg @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/packages/account/src/Assets/ic-6-month-issued-document.svg b/packages/account/src/Assets/ic-6-month-issued-document.svg deleted file mode 100644 index 7bd48aaf3630..000000000000 --- a/packages/account/src/Assets/ic-6-month-issued-document.svg +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/packages/account/src/Configs/poa-common-mistake-examples-config.tsx b/packages/account/src/Configs/poa-common-mistake-examples-config.tsx index 68db4b6f622c..032c0bf4ba7c 100644 --- a/packages/account/src/Configs/poa-common-mistake-examples-config.tsx +++ b/packages/account/src/Configs/poa-common-mistake-examples-config.tsx @@ -8,7 +8,7 @@ import { DerivLightIcEnvelopeIcon, DerivLightIcOldIssuedDocumentIcon, } from '@deriv/quill-icons'; -import Ic6MonthsIssuedDocument from '../Assets/ic-6-month-issued-document.svg'; +import Ic12MonthsIssuedDocument from '../Assets/ic-12-months-expiry.svg'; type TExampleImageConfig = { image: React.ComponentType>; @@ -33,12 +33,12 @@ export const getExampleImagesConfig = (is_eu: boolean): Array, ref: 'old_6_month_issued_document', } : { - image: DerivLightIcOldIssuedDocumentIcon, + image: Ic12MonthsIssuedDocument, description: , ref: 'old_12_month_issued_document', }), From 4a58b99df72637b7d5b2a5026fb4aff7ef3edb00 Mon Sep 17 00:00:00 2001 From: Likhith Kolayari Date: Mon, 13 May 2024 12:42:22 +0400 Subject: [PATCH 3/5] chore: added deriv sharable libs to account package --- packages/account/src/Assets/ic-12-months-expiry.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/account/src/Assets/ic-12-months-expiry.svg b/packages/account/src/Assets/ic-12-months-expiry.svg index f0409446268c..ec790c0cc6c6 100644 --- a/packages/account/src/Assets/ic-12-months-expiry.svg +++ b/packages/account/src/Assets/ic-12-months-expiry.svg @@ -60,4 +60,4 @@ - \ No newline at end of file + From 7efee2f9d525c8aa49e4804d42d725cd0d776b54 Mon Sep 17 00:00:00 2001 From: Likhith Kolayari Date: Mon, 13 May 2024 14:16:00 +0400 Subject: [PATCH 4/5] chore: trigger rebuild From dd8c23d47e898ff6b85f2be66d3ee902135585b3 Mon Sep 17 00:00:00 2001 From: Likhith Kolayari Date: Fri, 17 May 2024 14:02:07 +0400 Subject: [PATCH 5/5] Merge branch 'master' into likhith/coj-795/setup-deriv-utils-and-quill-icons-in-account --- packages/trader/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/trader/package.json b/packages/trader/package.json index 2ce1dc85cb65..3207f66d94c5 100644 --- a/packages/trader/package.json +++ b/packages/trader/package.json @@ -100,7 +100,7 @@ "@deriv/shared": "^1.0.0", "@deriv/stores": "^1.0.0", "@deriv/translations": "^1.0.0", - "@deriv/quill-icons": "^1.22.4", + "@deriv/quill-icons": "^1.22.7", "@types/react-loadable": "^5.5.6", "classnames": "^2.2.6", "extend": "^3.0.2",