From 9e153ffb3aef998935a8e3d10fffabea51555d63 Mon Sep 17 00:00:00 2001 From: Nuzhy-Deriv Date: Tue, 26 Dec 2023 15:13:34 +0800 Subject: [PATCH 1/5] fix: active menu items in partners, careers nav --- package-lock.json | 24 ++++++++++++------------ package.json | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1ccbd133c59..b26f92d689f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,14 +11,14 @@ "dependencies": { "@artsy/fresnel": "^6.2.1", "@builder.io/partytown": "^0.8.1", - "@deriv-com/blocks": "^0.55.0", - "@deriv-com/components": "^0.35.0", + "@deriv-com/blocks": "^0.57.0", + "@deriv-com/components": "^0.36.0", "@deriv-com/hooks": "^0.10.0", "@deriv-com/providers": "^0.10.0", "@deriv/analytics": "^1.4.3", "@deriv/deriv-api": "^1.0.13", "@deriv/quill-design": "^1.2.6", - "@deriv/quill-icons": "^1.0.16", + "@deriv/quill-icons": "^1.1.4", "@hookform/resolvers": "^3.3.2", "@livechat/customer-sdk": "^3.1.5", "@loadable/component": "^5.15.3", @@ -3004,14 +3004,14 @@ } }, "node_modules/@deriv-com/blocks": { - "version": "0.55.0", - "resolved": "https://npm.pkg.github.com/download/@deriv-com/blocks/0.55.0/fc7f3a5b01a7f70e1ec3042b2ab44399a100bfa8", - "integrity": "sha512-XZpDjr1N4G/z6aU4SjATvZpoMj+JVv+tWS0FXzYKo2Ofw/SgtGI7E0LsaMbdCEYo2EpRTv5ObzTF+mM28AMO3Q==" + "version": "0.57.0", + "resolved": "https://npm.pkg.github.com/download/@deriv-com/blocks/0.57.0/5348a8932720df57f0ae7cfce0f241820a97619e", + "integrity": "sha512-2kY3cQlhN0NNmDz53vrM74dZ06FKpfsObqcOEkVwMmi9JH8fLI7Ivy5Qpa1MceCfq47ojwRwjhh2/86rM4RHYw==" }, "node_modules/@deriv-com/components": { - "version": "0.35.0", - "resolved": "https://npm.pkg.github.com/download/@deriv-com/components/0.35.0/c2f5acd8bb04c7787ceafa0719a2205a6165e411", - "integrity": "sha512-PPCqHg7dZJCcHc6Ck6LVqJIvZXw9cIwdqHiCI+22hI6Umy7a+VYY4xHy1o4Cdp6+xVEShgVD40ZYxFzmPZbdwA==" + "version": "0.36.0", + "resolved": "https://npm.pkg.github.com/download/@deriv-com/components/0.36.0/de4121e9ece7baf2bb00a7cd880dfaaad8aeeb3d", + "integrity": "sha512-B0m3tKHji8VGUw+Bawg+tFHFR8eI1xLytlpZ0bT/q+XbxE7puFYQ0PCt9cJaWr5/RbPRnCMH5tvNFsGpUQ0fiA==" }, "node_modules/@deriv-com/hooks": { "version": "0.10.0", @@ -3084,9 +3084,9 @@ } }, "node_modules/@deriv/quill-icons": { - "version": "1.0.16", - "resolved": "https://registry.npmjs.org/@deriv/quill-icons/-/quill-icons-1.0.16.tgz", - "integrity": "sha512-bKjhIictrp85MKNKWZ6B5YFbUUulZVgIcPbsWJ8eXxhAYKAKAFleQXT+HFWJB6ciq4qoD83h3VzXN5eH5r1JkQ==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/@deriv/quill-icons/-/quill-icons-1.1.4.tgz", + "integrity": "sha512-iiWiosN16sRScwR4t3a47Gk6pHpXyTIaY7osAsTD2XNgzBfmEKuD/JAer3YA3oTbbPmtqP1WcZxbRfI+icq4Jg==", "peerDependencies": { "react": ">= 16", "react-dom": ">= 16" diff --git a/package.json b/package.json index 78f9321993e..cb2641dfee4 100644 --- a/package.json +++ b/package.json @@ -6,14 +6,14 @@ "dependencies": { "@artsy/fresnel": "^6.2.1", "@builder.io/partytown": "^0.8.1", - "@deriv-com/blocks": "^0.55.0", - "@deriv-com/components": "^0.35.0", + "@deriv-com/blocks": "^0.57.0", + "@deriv-com/components": "^0.36.0", "@deriv-com/hooks": "^0.10.0", "@deriv-com/providers": "^0.10.0", "@deriv/analytics": "^1.4.3", "@deriv/deriv-api": "^1.0.13", "@deriv/quill-design": "^1.2.6", - "@deriv/quill-icons": "^1.0.16", + "@deriv/quill-icons": "^1.1.4", "@hookform/resolvers": "^3.3.2", "@livechat/customer-sdk": "^3.1.5", "@loadable/component": "^5.15.3", From 7bdfa6580eb4cdfa9bcd121e39560f981d1e089e Mon Sep 17 00:00:00 2001 From: Nuzhy-Deriv Date: Tue, 26 Dec 2023 15:48:29 +0800 Subject: [PATCH 2/5] fix: update quill-icons version --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index b26f92d689f..fae759e4441 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,7 +18,7 @@ "@deriv/analytics": "^1.4.3", "@deriv/deriv-api": "^1.0.13", "@deriv/quill-design": "^1.2.6", - "@deriv/quill-icons": "^1.1.4", + "@deriv/quill-icons": "1.0.16", "@hookform/resolvers": "^3.3.2", "@livechat/customer-sdk": "^3.1.5", "@loadable/component": "^5.15.3", @@ -3084,9 +3084,9 @@ } }, "node_modules/@deriv/quill-icons": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/@deriv/quill-icons/-/quill-icons-1.1.4.tgz", - "integrity": "sha512-iiWiosN16sRScwR4t3a47Gk6pHpXyTIaY7osAsTD2XNgzBfmEKuD/JAer3YA3oTbbPmtqP1WcZxbRfI+icq4Jg==", + "version": "1.0.16", + "resolved": "https://registry.npmjs.org/@deriv/quill-icons/-/quill-icons-1.0.16.tgz", + "integrity": "sha512-bKjhIictrp85MKNKWZ6B5YFbUUulZVgIcPbsWJ8eXxhAYKAKAFleQXT+HFWJB6ciq4qoD83h3VzXN5eH5r1JkQ==", "peerDependencies": { "react": ">= 16", "react-dom": ">= 16" diff --git a/package.json b/package.json index cb2641dfee4..9d9d5478ecd 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "@deriv/analytics": "^1.4.3", "@deriv/deriv-api": "^1.0.13", "@deriv/quill-design": "^1.2.6", - "@deriv/quill-icons": "^1.1.4", + "@deriv/quill-icons": "1.0.16", "@hookform/resolvers": "^3.3.2", "@livechat/customer-sdk": "^3.1.5", "@loadable/component": "^5.15.3", From b89b0c23c8c57405675890f22823b2451119bafa Mon Sep 17 00:00:00 2001 From: Nuzhy-Deriv Date: Tue, 26 Dec 2023 16:10:41 +0800 Subject: [PATCH 3/5] fix: labelPaired issue --- package-lock.json | 8 ++++---- package.json | 2 +- .../components/templates/footer/download.tsx | 12 ++++++------ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index fae759e4441..8d5942bd385 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,7 +18,7 @@ "@deriv/analytics": "^1.4.3", "@deriv/deriv-api": "^1.0.13", "@deriv/quill-design": "^1.2.6", - "@deriv/quill-icons": "1.0.16", + "@deriv/quill-icons": "^1.0.17", "@hookform/resolvers": "^3.3.2", "@livechat/customer-sdk": "^3.1.5", "@loadable/component": "^5.15.3", @@ -3084,9 +3084,9 @@ } }, "node_modules/@deriv/quill-icons": { - "version": "1.0.16", - "resolved": "https://registry.npmjs.org/@deriv/quill-icons/-/quill-icons-1.0.16.tgz", - "integrity": "sha512-bKjhIictrp85MKNKWZ6B5YFbUUulZVgIcPbsWJ8eXxhAYKAKAFleQXT+HFWJB6ciq4qoD83h3VzXN5eH5r1JkQ==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/@deriv/quill-icons/-/quill-icons-1.1.4.tgz", + "integrity": "sha512-iiWiosN16sRScwR4t3a47Gk6pHpXyTIaY7osAsTD2XNgzBfmEKuD/JAer3YA3oTbbPmtqP1WcZxbRfI+icq4Jg==", "peerDependencies": { "react": ">= 16", "react-dom": ">= 16" diff --git a/package.json b/package.json index 9d9d5478ecd..dde1a03ad61 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "@deriv/analytics": "^1.4.3", "@deriv/deriv-api": "^1.0.13", "@deriv/quill-design": "^1.2.6", - "@deriv/quill-icons": "1.0.16", + "@deriv/quill-icons": "^1.0.17", "@hookform/resolvers": "^3.3.2", "@livechat/customer-sdk": "^3.1.5", "@loadable/component": "^5.15.3", diff --git a/src/features/components/templates/footer/download.tsx b/src/features/components/templates/footer/download.tsx index a0a62c84386..dd61d6e2017 100644 --- a/src/features/components/templates/footer/download.tsx +++ b/src/features/components/templates/footer/download.tsx @@ -1,8 +1,8 @@ import React from 'react' import { - LabelPairedAppleIcon, - LabelPairedGooglePlayIcon, - LabelPairedHuaweiAppGalleryIcon, + LabelPairedAppleMdIcon, + LabelPairedGooglePlayMdIcon, + LabelPairedHuaweiAppGalleryMdIcon, // eslint-disable-next-line import/no-unresolved } from '@deriv/quill-icons/LabelPaired' import clsx from 'clsx' @@ -21,7 +21,7 @@ const DownloadBadges = () => { target="_blank" className={clsx(sharedClasses, 'order-last')} > - + { target="_blank" className={clsx(sharedClasses)} > - + { target="_blank" className={clsx(sharedClasses)} > - + Date: Tue, 26 Dec 2023 16:13:48 +0800 Subject: [PATCH 4/5] fix: labelPaired issue in navigation --- .../components/templates/navigation/main-nav/nav.buttons.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/features/components/templates/navigation/main-nav/nav.buttons.tsx b/src/features/components/templates/navigation/main-nav/nav.buttons.tsx index eb74b6d7115..b5991d7bb79 100644 --- a/src/features/components/templates/navigation/main-nav/nav.buttons.tsx +++ b/src/features/components/templates/navigation/main-nav/nav.buttons.tsx @@ -2,7 +2,7 @@ import React from 'react' import { MobileNavToggle } from '@deriv-com/blocks' import { Button } from '@deriv/quill-design' // eslint-disable-next-line import/no-unresolved -import { LabelPairedGrid2BoldIcon } from '@deriv/quill-icons/LabelPaired' +import { LabelPairedGridMdBoldIcon } from '@deriv/quill-icons/LabelPaired' import { Localize } from 'components/localization' import { handleRedirectToTradersHub } from 'components/custom/utils' import useAuthCheck from 'components/hooks/use-auth-check' @@ -25,7 +25,7 @@ export const MainNavigationButtons = () => { colorStyle="black" size="lg" onClick={handleRedirectToTradersHub} - icon={LabelPairedGrid2BoldIcon} + icon={LabelPairedGridMdBoldIcon} iconPosition="start" > From 3beab92332ab6e3c49904ff5b6e318e545ea1000 Mon Sep 17 00:00:00 2001 From: Nuzhy-Deriv Date: Tue, 26 Dec 2023 17:12:31 +0800 Subject: [PATCH 5/5] fix: update footer icon colors --- .../components/templates/footer/data.tsx | 26 +++++++++---------- .../components/templates/footer/download.tsx | 12 ++++----- .../navigation/main-nav/nav.buttons.tsx | 4 +-- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/features/components/templates/footer/data.tsx b/src/features/components/templates/footer/data.tsx index e3eacbfb77c..e4e7c14f825 100644 --- a/src/features/components/templates/footer/data.tsx +++ b/src/features/components/templates/footer/data.tsx @@ -489,61 +489,61 @@ export const warnText = ( export const socialButtonsROW = [ { - icon: , + icon: , href: 'https://www.facebook.com/derivdotcom', }, { - icon: , + icon: , href: 'https://www.instagram.com/deriv_official', }, { - icon: , + icon: , href: 'https://twitter.com/derivdotcom/', }, { - icon: , + icon: , href: 'https://www.youtube.com/@deriv', }, { - icon: , + icon: , href: 'https://www.linkedin.com/company/derivdotcom/', }, ] export const socialButtonsEU = [ { - icon: , + icon: , href: 'https://www.facebook.com/DerivEU', }, { - icon: , + icon: , href: 'https://www.instagram.com/deriv_eu/', }, { - icon: , + icon: , href: 'https://twitter.com/deriv_eu/', }, { - icon: , + icon: , href: 'https://www.youtube.com/@deriv', }, { - icon: , + icon: , href: 'https://www.linkedin.com/company/derivdotcom/', }, ] export const socialButtonsCareers = [ { - icon: , + icon: , href: 'https://www.facebook.com/derivcareers', }, { - icon: , + icon: , href: 'https://www.instagram.com/derivcareers/', }, { - icon: , + icon: , href: 'https://www.linkedin.com/company/derivdotcom/life/', }, ] diff --git a/src/features/components/templates/footer/download.tsx b/src/features/components/templates/footer/download.tsx index dd61d6e2017..d456643bbe6 100644 --- a/src/features/components/templates/footer/download.tsx +++ b/src/features/components/templates/footer/download.tsx @@ -1,8 +1,8 @@ import React from 'react' import { - LabelPairedAppleMdIcon, - LabelPairedGooglePlayMdIcon, - LabelPairedHuaweiAppGalleryMdIcon, + LabelPairedAppleLgIcon, + LabelPairedGooglePlayLgIcon, + LabelPairedHuaweiAppGalleryLgIcon, // eslint-disable-next-line import/no-unresolved } from '@deriv/quill-icons/LabelPaired' import clsx from 'clsx' @@ -21,7 +21,7 @@ const DownloadBadges = () => { target="_blank" className={clsx(sharedClasses, 'order-last')} > - + { target="_blank" className={clsx(sharedClasses)} > - + { target="_blank" className={clsx(sharedClasses)} > - + { colorStyle="black" size="lg" onClick={handleRedirectToTradersHub} - icon={LabelPairedGridMdBoldIcon} + icon={LabelPairedGridLgBoldIcon} iconPosition="start" >