diff --git a/package-lock.json b/package-lock.json index 124268a6..9f320ce1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,7 +15,7 @@ "@deriv-com/translations": "^1.2.4", "@deriv-com/ui": "^1.29.0", "@deriv-com/utils": "^0.0.28", - "@deriv/quill-icons": "^1.23.5", + "@deriv/quill-icons": "^1.23.8", "@sendbird/chat": "^4.11.3", "@tanstack/react-query": "^5.28.14", "@tanstack/react-table": "^8.15.0", @@ -3887,9 +3887,9 @@ } }, "node_modules/@deriv/quill-icons": { - "version": "1.23.5", - "resolved": "https://registry.npmjs.org/@deriv/quill-icons/-/quill-icons-1.23.5.tgz", - "integrity": "sha512-YYLINwk1sbErnCc8Qq2dcCTKDRAbs5efB/Xh5jIw5CF9e0SF7G+7YLKWpmmkcTh4Z/KCySzRePWJilYSAwngMw==", + "version": "1.23.8", + "resolved": "https://registry.npmjs.org/@deriv/quill-icons/-/quill-icons-1.23.8.tgz", + "integrity": "sha512-mD4LyZYSy5omv9q0qo5QcqHsSAVfYDc3V6bTAMg9+v1PxuQxaXDqk7wzF8CgRkkv1xUnEXtf3ioknCbXLJ+wwg==", "peerDependencies": { "react": ">= 16", "react-dom": ">= 16" diff --git a/package.json b/package.json index 8ac8be1b..a2e10c0d 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "@deriv-com/translations": "^1.2.4", "@deriv-com/ui": "^1.29.0", "@deriv-com/utils": "^0.0.28", - "@deriv/quill-icons": "^1.23.5", + "@deriv/quill-icons": "^1.23.8", "@sendbird/chat": "^4.11.3", "@tanstack/react-query": "^5.28.14", "@tanstack/react-table": "^8.15.0", diff --git a/src/assets/404.png b/src/assets/404.png deleted file mode 100644 index e839b591..00000000 Binary files a/src/assets/404.png and /dev/null differ diff --git a/src/assets/blog.svg b/src/assets/blog.svg deleted file mode 100644 index 8a964be9..00000000 --- a/src/assets/blog.svg +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/src/assets/introducing-deriv-p2p.svg b/src/assets/introducing-deriv-p2p.svg deleted file mode 100644 index 180ff980..00000000 --- a/src/assets/introducing-deriv-p2p.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/src/assets/p2p-unavailable.svg b/src/assets/p2p-unavailable.svg deleted file mode 100644 index a081cc8a..00000000 --- a/src/assets/p2p-unavailable.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/src/assets/use-deriv-p2p.svg b/src/assets/use-deriv-p2p.svg deleted file mode 100644 index 039d7854..00000000 --- a/src/assets/use-deriv-p2p.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/src/components/BlockedScenarios/BlockedScenarios.tsx b/src/components/BlockedScenarios/BlockedScenarios.tsx index 8206386b..4bdf2555 100644 --- a/src/components/BlockedScenarios/BlockedScenarios.tsx +++ b/src/components/BlockedScenarios/BlockedScenarios.tsx @@ -1,9 +1,9 @@ -import { ReactComponent as P2pUnavailable } from '@/assets/p2p-unavailable.svg'; import { useLiveChat } from '@/hooks'; import { DerivLightIcCashierBlockedIcon, DerivLightIcCashierLockedIcon, DerivLightIcCashierUnderMaintenanceIcon, + DerivLightWalletCurrencyUnavailableIcon as P2pUnavailable, } from '@deriv/quill-icons'; import { Localize } from '@deriv-com/translations'; import { ActionScreen, Button, Text, useDevice } from '@deriv-com/ui'; diff --git a/src/components/Page404/Page404.tsx b/src/components/Page404/Page404.tsx index c7406d02..20b5a768 100644 --- a/src/components/Page404/Page404.tsx +++ b/src/components/Page404/Page404.tsx @@ -1,6 +1,6 @@ import { useHistory } from 'react-router-dom'; -import Icon404 from '@/assets/404.png'; import { BUY_SELL_URL } from '@/constants'; +import { DerivLight404ErrorIcon } from '@deriv/quill-icons'; import { Localize } from '@deriv-com/translations'; import { Button, Text, useDevice } from '@deriv-com/ui'; import './Page404.scss'; @@ -11,10 +11,7 @@ const Page404 = () => { const descriptionSize = isDesktop ? 'md' : 'sm'; return (
- {/* TODO: to be replaced with quill icons */} -
- Page not found -
+
diff --git a/src/components/PaymentMethodForm/PaymentMethodFormAutocomplete/PaymentMethodFormAutocomplete.tsx b/src/components/PaymentMethodForm/PaymentMethodFormAutocomplete/PaymentMethodFormAutocomplete.tsx index f2f10f7b..e1aacfad 100644 --- a/src/components/PaymentMethodForm/PaymentMethodFormAutocomplete/PaymentMethodFormAutocomplete.tsx +++ b/src/components/PaymentMethodForm/PaymentMethodFormAutocomplete/PaymentMethodFormAutocomplete.tsx @@ -1,5 +1,5 @@ import { TFormState, THooks, TPaymentMethod, TSelectedPaymentMethod } from 'types'; -import { LabelPairedSearchMdRegularIcon, LegacyCloseCircle1pxIcon } from '@deriv/quill-icons'; +import { LabelPairedSearchMdRegularIcon, LegacyCloseCircle1pxBlackIcon } from '@deriv/quill-icons'; import { Localize, useTranslations } from '@deriv-com/translations'; import { Button, Dropdown, Input, Text } from '@deriv-com/ui'; @@ -29,7 +29,7 @@ const PaymentMethodFormAutocomplete = ({ label={localize('Choose your payment method')} rightPlaceholder={ actionType === 'EDIT' ? null : ( - + ) } type='search' diff --git a/src/hooks/custom-hooks/useSendbird.ts b/src/hooks/custom-hooks/useSendbird.ts index 617803e8..45af8528 100644 --- a/src/hooks/custom-hooks/useSendbird.ts +++ b/src/hooks/custom-hooks/useSendbird.ts @@ -273,9 +273,10 @@ const useSendbird = (orderId: string | undefined, isErrorOrderInfo: boolean, cha useEffect(() => { // if the user has not created a chat URL for the order yet, create one using p2p_create_chat endpoint // chatChannelUrl is received from order details, hence check if chat url was already created using p2p_create_chat - if (!chatChannel?.url && sendbirdServiceToken?.app_id && orderId) { + // initialise Chat only if chatchannelurl is already present in order details, but chatChannel is not created in sendbird. + if (!chatChannel?.url && sendbirdServiceToken?.app_id && orderId && chatChannelUrl) { initialiseChat(); - } else if (orderId && !chatChannelUrl && !chatChannel?.url) { + } else if (orderId && !chatChannelUrl && !chatChannel?.url && sendbirdServiceToken?.app_id) { createChat({ order_id: orderId, }); diff --git a/src/pages/guide/screens/Blog/Blog.tsx b/src/pages/guide/screens/Blog/Blog.tsx index 535180e7..aa5313e8 100644 --- a/src/pages/guide/screens/Blog/Blog.tsx +++ b/src/pages/guide/screens/Blog/Blog.tsx @@ -1,6 +1,5 @@ -//TODO: Replace this with Quill icon once ready -import { ReactComponent as BlogIcon } from '@/assets/blog.svg'; import { HOW_TO_PROTECT_YOURSELF_URL } from '@/constants'; +import { DerivLightP2pSecureImageIcon as BlogIcon } from '@deriv/quill-icons'; import { Localize } from '@deriv-com/translations'; import { Text, useDevice } from '@deriv-com/ui'; import { Carousel } from '../../components'; diff --git a/src/pages/guide/screens/Videos/Videos.tsx b/src/pages/guide/screens/Videos/Videos.tsx index 315aef78..c48deeed 100644 --- a/src/pages/guide/screens/Videos/Videos.tsx +++ b/src/pages/guide/screens/Videos/Videos.tsx @@ -1,10 +1,12 @@ import { useState } from 'react'; -import { ReactComponent as IntroducingDerivP2PIcon } from '@/assets/introducing-deriv-p2p.svg'; -import { ReactComponent as UseDerivP2PIcon } from '@/assets/use-deriv-p2p.svg'; import { VideoPlayerModal } from '@/components/Modals'; import { HOW_TO_USE_DERIV_P2P_URL, INTRODUCING_DERIV_P2P_URL } from '@/constants'; import { useModalManager } from '@/hooks/custom-hooks'; -import { StandalonePlayFillIcon } from '@deriv/quill-icons'; +import { + DerivLightP2pAppImageIcon as UseDerivP2PIcon, + DerivLightP2pBannerImageIcon as IntroducingDerivP2PIcon, + StandalonePlayFillIcon, +} from '@deriv/quill-icons'; import { Localize } from '@deriv-com/translations'; import { Text, useDevice } from '@deriv-com/ui'; import { Carousel } from '../../components'; diff --git a/src/pages/orders/screens/OrderDetails/OrderDetails.scss b/src/pages/orders/screens/OrderDetails/OrderDetails.scss index f8e7515f..1aa6816d 100644 --- a/src/pages/orders/screens/OrderDetails/OrderDetails.scss +++ b/src/pages/orders/screens/OrderDetails/OrderDetails.scss @@ -1,6 +1,6 @@ .order-details { overflow: auto; - height: calc(100% - 27rem); + height: calc(100% - 17rem); @include mobile-or-tablet-screen { position: absolute; diff --git a/src/pages/orders/screens/OrderDetails/OrderDetails.tsx b/src/pages/orders/screens/OrderDetails/OrderDetails.tsx index 1fbb9fef..59c411e2 100644 --- a/src/pages/orders/screens/OrderDetails/OrderDetails.tsx +++ b/src/pages/orders/screens/OrderDetails/OrderDetails.tsx @@ -139,7 +139,7 @@ const OrderDetails = () => { return ( -
+
{shouldShowLostFundsBanner && ( diff --git a/src/pages/orders/screens/OrdersChatSection/OrdersChatSection.scss b/src/pages/orders/screens/OrdersChatSection/OrdersChatSection.scss index 72e10260..1d4215bf 100644 --- a/src/pages/orders/screens/OrdersChatSection/OrdersChatSection.scss +++ b/src/pages/orders/screens/OrdersChatSection/OrdersChatSection.scss @@ -16,10 +16,10 @@ &__full-page { position: absolute; - top: 0; + top: 1rem; left: 0; z-index: 1; - height: calc(100vh - 8rem); + height: calc(100% - 9rem); & .mobile-wrapper { &__body { @@ -35,11 +35,13 @@ } &--closed { - height: calc(100vh - 5rem); + height: calc(100% - 5rem); & .mobile-wrapper { &__footer { padding: 1.6rem; + margin-top: -1rem; + background-color: #fff; } } }