From 591e7f6936987cb3c1f834427d4c56d87ec19e33 Mon Sep 17 00:00:00 2001
From: Prince <prince@deriv.com>
Date: Sat, 19 Oct 2024 16:50:09 +0400
Subject: [PATCH 1/6] fix: add livechat widget call check

---
 .../Components/poi/status/limited/limited.tsx    |  2 +-
 .../account/src/Configs/poi-error-config.tsx     |  2 +-
 .../wallets-migration-failed.tsx                 |  2 +-
 .../cashier-locked/cashier-locked-provider.tsx   | 16 ++++++++--------
 .../side-notes/side-note-faq/side-note-faq.tsx   |  2 +-
 .../cashier-onboarding-side-note-fiat.tsx        |  2 +-
 .../src/modules/deposit-fiat/deposit-fiat.tsx    |  2 +-
 .../open-livechat-link/open-livechat-link.tsx    |  2 +-
 .../one-time-deposit-modal-content.tsx           |  2 +-
 .../change-account-currency.jsx                  |  2 +-
 .../RealAccountSignup/signup-error-content.jsx   |  7 +++++--
 .../src/App/Containers/Redirect/redirect.jsx     |  2 +-
 packages/core/src/Stores/notification-store.js   | 14 +++++++-------
 .../hooks/src/useIsLiveChatWidgetAvailable.ts    |  2 +-
 packages/hooks/src/useLiveChat.ts                |  2 +-
 .../dp2p-blocked/dp2p-blocked-description.tsx    |  2 +-
 .../ad-visibility-error-modal.tsx                |  2 +-
 .../constants/phone-number-verification.tsx      |  2 +-
 .../NeedHelpMessage/NeedHelpMessage.tsx          |  2 +-
 .../DepositLocked/DepositLockedContent.tsx       |  4 ++--
 .../WithdrawalLocked/WithdrawalLockedContent.tsx |  2 +-
 21 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/packages/account/src/Components/poi/status/limited/limited.tsx b/packages/account/src/Components/poi/status/limited/limited.tsx
index 2ecc3383d653..8a00dbaa05ba 100644
--- a/packages/account/src/Components/poi/status/limited/limited.tsx
+++ b/packages/account/src/Components/poi/status/limited/limited.tsx
@@ -13,7 +13,7 @@ export const POILimited = () => (
                     <span
                         key={0}
                         className='link link--orange'
-                        onClick={() => window.LiveChatWidget.call('maximize')}
+                        onClick={() => window.LiveChatWidget?.call('maximize')}
                     />,
                 ]}
             />
diff --git a/packages/account/src/Configs/poi-error-config.tsx b/packages/account/src/Configs/poi-error-config.tsx
index 7857c92c1c6f..5de8fdf86989 100644
--- a/packages/account/src/Configs/poi-error-config.tsx
+++ b/packages/account/src/Configs/poi-error-config.tsx
@@ -5,7 +5,7 @@ import { Localize } from '@deriv/translations';
 import { DerivLightNameDobPoiIcon, DerivLightDobPoiIcon, DerivLightNamePoiIcon } from '@deriv/quill-icons';
 import { getIDVDocumentType } from '../Helpers/utils';
 
-const handleOnClick = () => window.LiveChatWidget.call('maximize');
+const handleOnClick = () => window.LiveChatWidget?.call('maximize');
 
 export const GENERIC_ERROR_MESSAGE = (
     <Localize i18n_default_text='Sorry, an internal error occurred. Hit the above checkbox to try again.' />
diff --git a/packages/appstore/src/components/modals/wallets-migration-failed/wallets-migration-failed.tsx b/packages/appstore/src/components/modals/wallets-migration-failed/wallets-migration-failed.tsx
index 264c6166284a..3128265a566a 100644
--- a/packages/appstore/src/components/modals/wallets-migration-failed/wallets-migration-failed.tsx
+++ b/packages/appstore/src/components/modals/wallets-migration-failed/wallets-migration-failed.tsx
@@ -16,7 +16,7 @@ const WalletsMigrationFailed = observer(() => {
     };
 
     const handleLivechatButtonClick = () => {
-        window.LiveChatWidget.call('maximize');
+        window.LiveChatWidget?.call('maximize');
         setWalletsMigrationFailedPopup(false);
     };
 
diff --git a/packages/cashier/src/components/cashier-locked/cashier-locked-provider.tsx b/packages/cashier/src/components/cashier-locked/cashier-locked-provider.tsx
index 53afe1f1405b..e0824673dc59 100644
--- a/packages/cashier/src/components/cashier-locked/cashier-locked-provider.tsx
+++ b/packages/cashier/src/components/cashier-locked/cashier-locked-provider.tsx
@@ -130,7 +130,7 @@ const getMessage = ({
                             <span
                                 key={0}
                                 className='link link--orange'
-                                onClick={() => window.LiveChatWidget.call('maximize')}
+                                onClick={() => window.LiveChatWidget?.call('maximize')}
                             />,
                         ]}
                     />
@@ -147,7 +147,7 @@ const getMessage = ({
                             <span
                                 key={0}
                                 className='link link--orange'
-                                onClick={() => window.LiveChatWidget.call('maximize')}
+                                onClick={() => window.LiveChatWidget?.call('maximize')}
                             />,
                         ]}
                     />
@@ -378,7 +378,7 @@ const getMessage = ({
                             <span
                                 key={0}
                                 className='link link--orange'
-                                onClick={() => window.LiveChatWidget.call('maximize')}
+                                onClick={() => window.LiveChatWidget?.call('maximize')}
                             />,
                         ]}
                     />
@@ -395,7 +395,7 @@ const getMessage = ({
                             <span
                                 key={0}
                                 className='link link--orange'
-                                onClick={() => window.LiveChatWidget.call('maximize')}
+                                onClick={() => window.LiveChatWidget?.call('maximize')}
                             />,
                         ]}
                     />
@@ -471,7 +471,7 @@ const getMessage = ({
                             <span
                                 key={0}
                                 className='link link--orange'
-                                onClick={() => window.LiveChatWidget.call('maximize')}
+                                onClick={() => window.LiveChatWidget?.call('maximize')}
                             />,
                         ]}
                     />
@@ -488,7 +488,7 @@ const getMessage = ({
                             <span
                                 key={0}
                                 className='link link--orange'
-                                onClick={() => window.LiveChatWidget.call('maximize')}
+                                onClick={() => window.LiveChatWidget?.call('maximize')}
                             />,
                         ]}
                     />
@@ -505,7 +505,7 @@ const getMessage = ({
                             <span
                                 key={0}
                                 className='link link--orange'
-                                onClick={() => window.LiveChatWidget.call('maximize')}
+                                onClick={() => window.LiveChatWidget?.call('maximize')}
                             />,
                         ]}
                     />
@@ -531,7 +531,7 @@ const getMessage = ({
                     <span
                         key={0}
                         className='link link--orange'
-                        onClick={() => window.LiveChatWidget.call('maximize')}
+                        onClick={() => window.LiveChatWidget?.call('maximize')}
                     />,
                 ]}
             />
diff --git a/packages/cashier/src/components/side-notes/side-note-faq/side-note-faq.tsx b/packages/cashier/src/components/side-notes/side-note-faq/side-note-faq.tsx
index 78fe6aeb4055..7d46da17c886 100644
--- a/packages/cashier/src/components/side-notes/side-note-faq/side-note-faq.tsx
+++ b/packages/cashier/src/components/side-notes/side-note-faq/side-note-faq.tsx
@@ -14,7 +14,7 @@ const SideNoteFAQ = ({ transaction_type }: TSideNoteFAQProps) => {
     const { isMobile } = useDevice();
     const { is_eu } = client;
 
-    const onClickHandler = () => window.LiveChatWidget.call('maximize');
+    const onClickHandler = () => window.LiveChatWidget?.call('maximize');
 
     const deposit_faq_list = useMemo(() => {
         return [
diff --git a/packages/cashier/src/modules/cashier-onboarding/components/cashier-onboarding-side-notes/cashier-onboarding-side-note-fiat.tsx b/packages/cashier/src/modules/cashier-onboarding/components/cashier-onboarding-side-notes/cashier-onboarding-side-note-fiat.tsx
index 86cfe0348dd1..03380c78ad82 100644
--- a/packages/cashier/src/modules/cashier-onboarding/components/cashier-onboarding-side-notes/cashier-onboarding-side-note-fiat.tsx
+++ b/packages/cashier/src/modules/cashier-onboarding/components/cashier-onboarding-side-notes/cashier-onboarding-side-note-fiat.tsx
@@ -19,7 +19,7 @@ const CashierOnboardingSideNoteFiat: React.FC = observer(() => {
                             <a
                                 key={0}
                                 className='link link--orange'
-                                onClick={() => window.LiveChatWidget.call('maximize')}
+                                onClick={() => window.LiveChatWidget?.call('maximize')}
                             />
                         ),
                     ]}
diff --git a/packages/cashier/src/modules/deposit-fiat/deposit-fiat.tsx b/packages/cashier/src/modules/deposit-fiat/deposit-fiat.tsx
index b1027bfdbdfb..f048c884f02e 100644
--- a/packages/cashier/src/modules/deposit-fiat/deposit-fiat.tsx
+++ b/packages/cashier/src/modules/deposit-fiat/deposit-fiat.tsx
@@ -11,7 +11,7 @@ const DepositFiat: React.FC = observer(() => {
     const { common, traders_hub } = useStore();
     const { is_from_derivgo } = common;
     const { is_low_risk_cr_eu_real } = traders_hub;
-    const onClickHandler = () => window.LiveChatWidget.call('maximize');
+    const onClickHandler = () => window.LiveChatWidget?.call('maximize');
 
     return (
         <PageContainer
diff --git a/packages/components/src/components/open-livechat-link/open-livechat-link.tsx b/packages/components/src/components/open-livechat-link/open-livechat-link.tsx
index 68c9bfdc4d97..76fc8f65dde7 100644
--- a/packages/components/src/components/open-livechat-link/open-livechat-link.tsx
+++ b/packages/components/src/components/open-livechat-link/open-livechat-link.tsx
@@ -13,7 +13,7 @@ const OpenLiveChatLink = ({ children, text_size, className }: React.PropsWithChi
     <button
         type='button'
         className={clsx('open-livechat__link', className)}
-        onClick={() => window.LiveChatWidget.call('maximize')}
+        onClick={() => window.LiveChatWidget?.call('maximize')}
     >
         <Text size={text_size || 'xs'} weight='bold' color='brand-red-coral'>
             {children || <Localize i18n_default_text='live chat' />}
diff --git a/packages/core/src/App/Containers/OneTimeDepositModal/one-time-deposit-modal-content.tsx b/packages/core/src/App/Containers/OneTimeDepositModal/one-time-deposit-modal-content.tsx
index 99e7cd03fb2d..3929b63759e2 100644
--- a/packages/core/src/App/Containers/OneTimeDepositModal/one-time-deposit-modal-content.tsx
+++ b/packages/core/src/App/Containers/OneTimeDepositModal/one-time-deposit-modal-content.tsx
@@ -9,7 +9,7 @@ import DepositCrypto from '@deriv/cashier/src/modules/deposit-crypto/components/
 export const OneTimeDepositModalContent = ({ is_crypto_provider = false }: { is_crypto_provider?: boolean }) => {
     const { isDesktop } = useDevice();
 
-    const onLiveChatClick = () => window.LiveChatWidget.call('maximize');
+    const onLiveChatClick = () => window.LiveChatWidget?.call('maximize');
 
     return (
         <div
diff --git a/packages/core/src/App/Containers/RealAccountSignup/change-account-currency.jsx b/packages/core/src/App/Containers/RealAccountSignup/change-account-currency.jsx
index 40984964d0c5..0373ce2171c1 100644
--- a/packages/core/src/App/Containers/RealAccountSignup/change-account-currency.jsx
+++ b/packages/core/src/App/Containers/RealAccountSignup/change-account-currency.jsx
@@ -32,7 +32,7 @@ const ChangeAccountCurrency = observer(
                         className='link link--orange'
                         onClick={() => {
                             closeRealAccountSignup();
-                            window.LiveChatWidget.call('maximize');
+                            window.LiveChatWidget?.call('maximize');
                         }}
                     />,
                 ]}
diff --git a/packages/core/src/App/Containers/RealAccountSignup/signup-error-content.jsx b/packages/core/src/App/Containers/RealAccountSignup/signup-error-content.jsx
index 346dd109bb90..136e83ded9b9 100644
--- a/packages/core/src/App/Containers/RealAccountSignup/signup-error-content.jsx
+++ b/packages/core/src/App/Containers/RealAccountSignup/signup-error-content.jsx
@@ -53,7 +53,7 @@ const Message = ({ code, message, details }) => {
                             <span
                                 className='chat-inline'
                                 key={0}
-                                onClick={() => window.LiveChatWidget.call('maximize')}
+                                onClick={() => window.LiveChatWidget?.call('maximize')}
                             />,
                         ]}
                     />
@@ -105,7 +105,10 @@ const ErrorCTA = ({ code, onConfirm }) => {
             return <TryAgain text={localize('Try a different currency')} onConfirm={onConfirm} />;
         case 'DuplicateAccount':
             return (
-                <TryAgain text={localize('Go to live chat')} onConfirm={() => window.LiveChatWidget.call('maximize')} />
+                <TryAgain
+                    text={localize('Go to live chat')}
+                    onConfirm={() => window.LiveChatWidget?.call('maximize')}
+                />
             );
         case 'InputValidationFailed':
         case 'PoBoxInAddress':
diff --git a/packages/core/src/App/Containers/Redirect/redirect.jsx b/packages/core/src/App/Containers/Redirect/redirect.jsx
index f31909f72637..242e76f48c9d 100644
--- a/packages/core/src/App/Containers/Redirect/redirect.jsx
+++ b/packages/core/src/App/Containers/Redirect/redirect.jsx
@@ -45,7 +45,7 @@ const Redirect = observer(() => {
     }
 
     const openLivechat = () => {
-        window.LiveChatWidget.call('maximize');
+        window.LiveChatWidget?.call('maximize');
     };
 
     const url_query_string = window.location.search;
diff --git a/packages/core/src/Stores/notification-store.js b/packages/core/src/Stores/notification-store.js
index f868e19756ab..57e6793e6510 100644
--- a/packages/core/src/Stores/notification-store.js
+++ b/packages/core/src/Stores/notification-store.js
@@ -823,7 +823,7 @@ export default class NotificationStore extends BaseStore {
                 message: localize('Please contact us via live chat to unlock it.'),
                 action: {
                     onClick: () => {
-                        window.LiveChatWidget.call('maximize');
+                        window.LiveChatWidget?.call('maximize');
                     },
                     text: localize('Go to live chat'),
                 },
@@ -1077,7 +1077,7 @@ export default class NotificationStore extends BaseStore {
                 message: localize('Please contact us via live chat to enable withdrawals.'),
                 action: {
                     onClick: () => {
-                        window.LiveChatWidget.call('maximize');
+                        window.LiveChatWidget?.call('maximize');
                     },
                     text: localize('Go to live chat'),
                 },
@@ -1273,7 +1273,7 @@ export default class NotificationStore extends BaseStore {
                     ),
                     action: {
                         onClick: () => {
-                            window.LiveChatWidget.call('maximize');
+                            window.LiveChatWidget?.call('maximize');
                         },
                         text: localize('Go to live chat'),
                     },
@@ -1386,7 +1386,7 @@ export default class NotificationStore extends BaseStore {
                 message: localize('Please contact us via live chat.'),
                 action: {
                     onClick: () => {
-                        window.LiveChatWidget.call('maximize');
+                        window.LiveChatWidget?.call('maximize');
                     },
                     text: localize('Go to live chat'),
                 },
@@ -1398,7 +1398,7 @@ export default class NotificationStore extends BaseStore {
                 message: localize('Please contact us via live chat to enable withdrawals.'),
                 action: {
                     onClick: () => {
-                        window.LiveChatWidget.call('maximize');
+                        window.LiveChatWidget?.call('maximize');
                     },
                     text: localize('Go to live chat'),
                 },
@@ -1573,7 +1573,7 @@ export default class NotificationStore extends BaseStore {
                 ),
                 action: {
                     onClick: async () => {
-                        window.LiveChatWidget.call('maximize');
+                        window.LiveChatWidget?.call('maximize');
                     },
                     text: localize('Go to LiveChat'),
                 },
@@ -1741,7 +1741,7 @@ export default class NotificationStore extends BaseStore {
             : {
                   text: localize('Contact live chat'),
                   onClick: () => {
-                      window.LiveChatWidget.call('maximize');
+                      window.LiveChatWidget?.call('maximize');
                   },
               };
 
diff --git a/packages/hooks/src/useIsLiveChatWidgetAvailable.ts b/packages/hooks/src/useIsLiveChatWidgetAvailable.ts
index a8a4bf7031d4..0c2255969546 100644
--- a/packages/hooks/src/useIsLiveChatWidgetAvailable.ts
+++ b/packages/hooks/src/useIsLiveChatWidgetAvailable.ts
@@ -4,7 +4,7 @@ const useIsLiveChatWidgetAvailable = () => {
     const [is_livechat_available, setIsLivechatAvailable] = useState(false);
 
     useEffect(() => {
-        window.LiveChatWidget.on('ready', data => {
+        window.LiveChatWidget?.on('ready', data => {
             if (data.state.availability === 'online') setIsLivechatAvailable(true);
         });
     }, []);
diff --git a/packages/hooks/src/useLiveChat.ts b/packages/hooks/src/useLiveChat.ts
index 44310642c145..3d63130d6944 100644
--- a/packages/hooks/src/useLiveChat.ts
+++ b/packages/hooks/src/useLiveChat.ts
@@ -38,7 +38,7 @@ const useLiveChat = (client_information: TLiveChatClientInformation) => {
 
     useEffect(() => {
         if (is_client_store_initialized && cs_chat_livechat) {
-            window.LiveChatWidget.init();
+            window.LiveChatWidget?.init();
         }
     }, [is_client_store_initialized, cs_chat_livechat]);
 
diff --git a/packages/p2p/src/components/dp2p-blocked/dp2p-blocked-description.tsx b/packages/p2p/src/components/dp2p-blocked/dp2p-blocked-description.tsx
index ad8ad941cea5..2bc7728f2b51 100644
--- a/packages/p2p/src/components/dp2p-blocked/dp2p-blocked-description.tsx
+++ b/packages/p2p/src/components/dp2p-blocked/dp2p-blocked-description.tsx
@@ -34,7 +34,7 @@ const Dp2pBlockedDescription = () => {
                     <span
                         key={0}
                         className='link link--orange'
-                        onClick={() => window.LiveChatWidget.call('maximize')}
+                        onClick={() => window.LiveChatWidget?.call('maximize')}
                     />,
                 ]}
             />
diff --git a/packages/p2p/src/components/modal-manager/modals/ad-visibility-error-modal/ad-visibility-error-modal.tsx b/packages/p2p/src/components/modal-manager/modals/ad-visibility-error-modal/ad-visibility-error-modal.tsx
index f82692d2ffd1..0153fa909c37 100644
--- a/packages/p2p/src/components/modal-manager/modals/ad-visibility-error-modal/ad-visibility-error-modal.tsx
+++ b/packages/p2p/src/components/modal-manager/modals/ad-visibility-error-modal/ad-visibility-error-modal.tsx
@@ -49,7 +49,7 @@ const AdVisibilityErrorModal = ({ error_code }: TAdVisibilityErrorModalProps) =>
                                 <a
                                     key={2}
                                     className='link link--orange'
-                                    onClick={() => window.LiveChatWidget.call('maximize')}
+                                    onClick={() => window.LiveChatWidget?.call('maximize')}
                                 />,
                             ]}
                         />
diff --git a/packages/shared/src/utils/constants/phone-number-verification.tsx b/packages/shared/src/utils/constants/phone-number-verification.tsx
index c1e3086c21cd..c8d3d27a5a13 100644
--- a/packages/shared/src/utils/constants/phone-number-verification.tsx
+++ b/packages/shared/src/utils/constants/phone-number-verification.tsx
@@ -34,7 +34,7 @@ export const getUseRequestPhoneNumberOTPErrorMessage = (
                         <span
                             key={0}
                             className='phone-verification__card--inputfield__livechat'
-                            onClick={() => window.LiveChatWidget.call('maximize')}
+                            onClick={() => window.LiveChatWidget?.call('maximize')}
                         />,
                     ]}
                 />
diff --git a/packages/wallets/src/features/accounts/modules/TaxInformation/components/NeedHelpMessage/NeedHelpMessage.tsx b/packages/wallets/src/features/accounts/modules/TaxInformation/components/NeedHelpMessage/NeedHelpMessage.tsx
index adca42a7272a..0ae52dd3eb2f 100644
--- a/packages/wallets/src/features/accounts/modules/TaxInformation/components/NeedHelpMessage/NeedHelpMessage.tsx
+++ b/packages/wallets/src/features/accounts/modules/TaxInformation/components/NeedHelpMessage/NeedHelpMessage.tsx
@@ -3,7 +3,7 @@ import { Localize } from '@deriv-com/translations';
 import { InlineMessage, Text } from '@deriv-com/ui';
 
 const NeedHelpMessage = () => {
-    const onClickLiveChat = () => window.LiveChatWidget.call('maximize');
+    const onClickLiveChat = () => window.LiveChatWidget?.call('maximize');
 
     return (
         <div className='wallets-tax-information__message'>
diff --git a/packages/wallets/src/features/cashier/modules/DepositLocked/DepositLockedContent.tsx b/packages/wallets/src/features/cashier/modules/DepositLocked/DepositLockedContent.tsx
index 863cd6ced9e5..5090c93a2378 100644
--- a/packages/wallets/src/features/cashier/modules/DepositLocked/DepositLockedContent.tsx
+++ b/packages/wallets/src/features/cashier/modules/DepositLocked/DepositLockedContent.tsx
@@ -87,7 +87,7 @@ const getDepositLockedDesc = ({
                         <button
                             className='wallets-link wallets-link__variant--bold'
                             key={0}
-                            onClick={() => window.LiveChatWidget.call('maximize')}
+                            onClick={() => window.LiveChatWidget?.call('maximize')}
                         />,
                     ]}
                     i18n_default_text='You have reached the withdrawal limit. You have chosen to exclude yourself from trading on our website until {{excludedUntil}}. If you are unable to place a trade or deposit after your self-exclusion period, please contact us via <0>live chat</0>.'
@@ -109,7 +109,7 @@ const getDepositLockedDesc = ({
                         <button
                             className='wallets-link wallets-link__variant--bold'
                             key={0}
-                            onClick={() => window.LiveChatWidget.call('maximize')}
+                            onClick={() => window.LiveChatWidget?.call('maximize')}
                         />,
                     ]}
                     i18n_default_text='Please contact us via <0>live chat</0>.'
diff --git a/packages/wallets/src/features/cashier/modules/WithdrawalLocked/WithdrawalLockedContent.tsx b/packages/wallets/src/features/cashier/modules/WithdrawalLocked/WithdrawalLockedContent.tsx
index 5bfc53fb05fb..b80ddfac0aff 100644
--- a/packages/wallets/src/features/cashier/modules/WithdrawalLocked/WithdrawalLockedContent.tsx
+++ b/packages/wallets/src/features/cashier/modules/WithdrawalLocked/WithdrawalLockedContent.tsx
@@ -101,7 +101,7 @@ const getWithdrawalLockedDesc = ({
                         <button
                             className='wallets-link wallets-link__variant--bold'
                             key={0}
-                            onClick={() => window.LiveChatWidget.call('maximize')}
+                            onClick={() => window.LiveChatWidget?.call('maximize')}
                         />,
                     ]}
                     i18n_default_text='Unfortunately, you can only make deposits. Please contact us via <0>live chat</0> to enable withdrawals.'

From c21b8d85273199bf636ee9b5429b409115cd1bec Mon Sep 17 00:00:00 2001
From: Prince <prince@deriv.com>
Date: Sat, 19 Oct 2024 19:37:15 +0400
Subject: [PATCH 2/6] fix: whatsapp issue on freshchats

---
 .../src/App/Components/Elements/WhatsApp/whatsapp.tsx     | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/core/src/App/Components/Elements/WhatsApp/whatsapp.tsx b/packages/core/src/App/Components/Elements/WhatsApp/whatsapp.tsx
index 729aa86764f9..da3babc848ce 100644
--- a/packages/core/src/App/Components/Elements/WhatsApp/whatsapp.tsx
+++ b/packages/core/src/App/Components/Elements/WhatsApp/whatsapp.tsx
@@ -3,14 +3,18 @@ import { Popover, Icon } from '@deriv/components';
 import { localize } from '@deriv/translations';
 import { useDevice } from '@deriv-com/ui';
 import { URLConstants } from '@deriv-com/utils';
-import { useIsLiveChatWidgetAvailable } from '@deriv/hooks';
+import { useGrowthbookGetFeatureValue, useIsLiveChatWidgetAvailable } from '@deriv/hooks';
 
 const WhatsApp = ({ showPopover, onClick }: { showPopover?: boolean; onClick?: () => void }) => {
     const { isDesktop } = useDevice();
 
     const { is_livechat_available } = useIsLiveChatWidgetAvailable();
 
-    if (!is_livechat_available) return null;
+    const [enable_freshworks_live_chat] = useGrowthbookGetFeatureValue({
+        featureFlag: 'enable_freshworks_live_chat',
+    });
+
+    if (!is_livechat_available && !enable_freshworks_live_chat) return null;
 
     if (!isDesktop)
         return (

From 40b93f1c778064211ba16816e71f56194a0657f8 Mon Sep 17 00:00:00 2001
From: Prince <prince@deriv.com>
Date: Sun, 20 Oct 2024 12:17:00 +0400
Subject: [PATCH 3/6] chore: pass country to growthbook on login using
 cloudflare check

---
 packages/core/src/Stores/client-store.js   |  6 +++---
 packages/core/src/Utils/Analytics/index.ts | 17 +----------------
 packages/utils/src/getCountry.ts           | 17 +++++++++++++++++
 packages/utils/src/index.ts                |  1 +
 4 files changed, 22 insertions(+), 19 deletions(-)
 create mode 100644 packages/utils/src/getCountry.ts

diff --git a/packages/core/src/Stores/client-store.js b/packages/core/src/Stores/client-store.js
index 2a0757625183..2bc6c9a2141d 100644
--- a/packages/core/src/Stores/client-store.js
+++ b/packages/core/src/Stores/client-store.js
@@ -32,7 +32,7 @@ import {
     getUrlP2P,
 } from '@deriv/shared';
 import { Analytics } from '@deriv-com/analytics';
-import { URLConstants } from '@deriv-com/utils';
+import { URLConstants, getCountry } from '@deriv-com/utils';
 
 import { getLanguage, localize, getRedirectionLanguage } from '@deriv/translations';
 
@@ -1789,7 +1789,7 @@ export default class ClientStore extends BaseStore {
         const broker = LocalStore?.get('active_loginid')
             ?.match(/[a-zA-Z]+/g)
             ?.join('');
-        setTimeout(() => {
+        setTimeout(async () => {
             const analytics_config = {
                 account_type: broker === 'null' ? 'unlogged' : broker,
                 residence_country: this.residence,
@@ -1798,7 +1798,7 @@ export default class ClientStore extends BaseStore {
                 language: getLanguage(),
                 device_language: navigator?.language || 'en-EN',
                 user_language: getLanguage().toLowerCase(),
-                country: Cookies.get('clients_country') || Cookies?.getJSON('website_status')?.clients_country,
+                country: await getCountry(),
                 utm_source: ppc_campaign_cookies?.utm_source,
                 utm_medium: ppc_campaign_cookies?.utm_medium,
                 utm_campaign: ppc_campaign_cookies?.utm_campaign,
diff --git a/packages/core/src/Utils/Analytics/index.ts b/packages/core/src/Utils/Analytics/index.ts
index d50d46786673..2990ac9b1772 100644
--- a/packages/core/src/Utils/Analytics/index.ts
+++ b/packages/core/src/Utils/Analytics/index.ts
@@ -4,6 +4,7 @@ import { getLanguage } from '@deriv/translations';
 import { LocalStore, getAppId } from '@deriv/shared';
 import { MAX_MOBILE_WIDTH } from '../../Constants';
 import FIREBASE_INIT_DATA from '../../../../api/src/remote_config.json';
+import { getCountry } from '@deriv/utils';
 
 export const AnalyticsInitializer = async () => {
     const account_type = LocalStore?.get('active_loginid')
@@ -24,22 +25,6 @@ export const AnalyticsInitializer = async () => {
                       }
                     : Cookies.getJSON('utm_data');
 
-            /*
-                Temp solution to fetch country and handle experiments without causing inconsistencies to the users. 
-            */
-
-            const getCountry = async () => {
-                try {
-                    const response = await fetch('https://www.cloudflare.com/cdn-cgi/trace').catch(() => null);
-                    const text = response ? await response.text().catch(() => '') : '';
-                    const entries = text ? text.split('\n').map(v => v.split('=', 2)) : [];
-                    const data = entries.length ? Object.fromEntries(entries) : {};
-                    return data?.loc?.toLowerCase() ?? '';
-                } catch {
-                    return '';
-                }
-            };
-
             const config = {
                 growthbookKey: flags.marketing_growthbook ? process.env.GROWTHBOOK_CLIENT_KEY : undefined,
                 growthbookDecryptionKey: flags.marketing_growthbook ? process.env.GROWTHBOOK_DECRYPTION_KEY : undefined,
diff --git a/packages/utils/src/getCountry.ts b/packages/utils/src/getCountry.ts
new file mode 100644
index 000000000000..87af822bf755
--- /dev/null
+++ b/packages/utils/src/getCountry.ts
@@ -0,0 +1,17 @@
+/*
+Temp solution for growthbook to fetch country and handle experiments/fratures without causing inconsistencies to the UI. 
+*/
+
+const getCountry = async () => {
+    try {
+        const response = await fetch('https://www.cloudflare.com/cdn-cgi/trace').catch(() => null);
+        const text = response ? await response.text().catch(() => '') : '';
+        const entries = text ? text.split('\n').map(v => v.split('=', 2)) : [];
+        const data = entries.length ? Object.fromEntries(entries) : {};
+        return data?.loc?.toLowerCase() ?? '';
+    } catch {
+        return '';
+    }
+};
+
+export default getCountry;
diff --git a/packages/utils/src/index.ts b/packages/utils/src/index.ts
index 1993d63747d8..4fb0407b2467 100644
--- a/packages/utils/src/index.ts
+++ b/packages/utils/src/index.ts
@@ -9,6 +9,7 @@ export { default as groupTransactionsByDay } from './groupTransactionsByDay';
 export { default as getTruncatedString } from './getTruncatedString';
 export { default as unFormatLocaleString } from './unFormatLocaleString';
 export { default as getLoginHistoryFormattedData } from './getLoginHistoryFormattedData';
+export { default as getCountry } from './getCountry';
 export * from './parse-url';
 export * from './moment';
 export * from './files';

From fcbd649ab3f45ec846243ac2a09b74cb3ee1a402 Mon Sep 17 00:00:00 2001
From: Prince <prince@deriv.com>
Date: Mon, 21 Oct 2024 08:47:11 +0400
Subject: [PATCH 4/6] fix: import issue

---
 packages/core/src/Stores/client-store.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/core/src/Stores/client-store.js b/packages/core/src/Stores/client-store.js
index 2bc6c9a2141d..069302d1b698 100644
--- a/packages/core/src/Stores/client-store.js
+++ b/packages/core/src/Stores/client-store.js
@@ -32,7 +32,8 @@ import {
     getUrlP2P,
 } from '@deriv/shared';
 import { Analytics } from '@deriv-com/analytics';
-import { URLConstants, getCountry } from '@deriv-com/utils';
+import { URLConstants } from '@deriv-com/utils';
+import { getCountry } from '@deriv/utils';
 
 import { getLanguage, localize, getRedirectionLanguage } from '@deriv/translations';
 

From 727e3507a46e6eef8386e8992a2ae0ed29cf3aa3 Mon Sep 17 00:00:00 2001
From: Prince <prince@deriv.com>
Date: Mon, 21 Oct 2024 09:14:50 +0400
Subject: [PATCH 5/6] chore: added test case for getCountry

---
 .../utils/src/__tests__/getCountry.spec.ts    | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 packages/utils/src/__tests__/getCountry.spec.ts

diff --git a/packages/utils/src/__tests__/getCountry.spec.ts b/packages/utils/src/__tests__/getCountry.spec.ts
new file mode 100644
index 000000000000..d12047edd8b5
--- /dev/null
+++ b/packages/utils/src/__tests__/getCountry.spec.ts
@@ -0,0 +1,38 @@
+import getCountry from '../getCountry';
+
+describe('getCountry', () => {
+    let fetchSpy: jest.SpyInstance;
+
+    beforeEach(() => {
+        fetchSpy = jest.spyOn(global, 'fetch');
+    });
+
+    afterEach(() => {
+        fetchSpy.mockRestore();
+    });
+
+    it('should return the country code in lowercase when available', async () => {
+        fetchSpy.mockResolvedValue({
+            text: async () => 'loc=US\nother=info\n',
+        } as Response);
+
+        const country = await getCountry();
+        expect(country).toBe('us');
+    });
+
+    it('should return an empty string if the loc field is not present', async () => {
+        fetchSpy.mockResolvedValue({
+            text: async () => 'other=info\n',
+        } as Response);
+
+        const country = await getCountry();
+        expect(country).toBe('');
+    });
+
+    it('should return an empty string if the fetch fails', async () => {
+        fetchSpy.mockRejectedValue(new Error('Fetch failed'));
+
+        const country = await getCountry();
+        expect(country).toBe('');
+    });
+});

From ea4eb83bd0e044180afa58e12d596e119e355885 Mon Sep 17 00:00:00 2001
From: Prince <prince@deriv.com>
Date: Mon, 21 Oct 2024 09:51:19 +0400
Subject: [PATCH 6/6] fix: test error

---
 packages/utils/src/__tests__/getCountry.spec.ts | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/packages/utils/src/__tests__/getCountry.spec.ts b/packages/utils/src/__tests__/getCountry.spec.ts
index d12047edd8b5..4107d895c9db 100644
--- a/packages/utils/src/__tests__/getCountry.spec.ts
+++ b/packages/utils/src/__tests__/getCountry.spec.ts
@@ -1,36 +1,35 @@
 import getCountry from '../getCountry';
 
 describe('getCountry', () => {
-    let fetchSpy: jest.SpyInstance;
-
     beforeEach(() => {
-        fetchSpy = jest.spyOn(global, 'fetch');
+        global.fetch = jest.fn() as jest.Mock;
     });
 
     afterEach(() => {
-        fetchSpy.mockRestore();
+        jest.resetAllMocks();
     });
 
     it('should return the country code in lowercase when available', async () => {
-        fetchSpy.mockResolvedValue({
+        // Mock fetch response
+        (global.fetch as jest.Mock).mockResolvedValue({
             text: async () => 'loc=US\nother=info\n',
-        } as Response);
+        });
 
         const country = await getCountry();
         expect(country).toBe('us');
     });
 
     it('should return an empty string if the loc field is not present', async () => {
-        fetchSpy.mockResolvedValue({
+        (global.fetch as jest.Mock).mockResolvedValue({
             text: async () => 'other=info\n',
-        } as Response);
+        });
 
         const country = await getCountry();
         expect(country).toBe('');
     });
 
     it('should return an empty string if the fetch fails', async () => {
-        fetchSpy.mockRejectedValue(new Error('Fetch failed'));
+        (global.fetch as jest.Mock).mockRejectedValue(new Error('Fetch failed'));
 
         const country = await getCountry();
         expect(country).toBe('');