Update pushDataLayer to check logged in state of user (#16561)

* chore: update pushDataLayer to check logged in state of user * Update packages/core/src/Stores/gtm-store.js Co-authored-by: Ali(Ako) Hosseini <[email protected]> * chore: callbacks to async/await * chore: add optional chaining --------- Co-authored-by: Ali(Ako) Hosseini <[email protected]>
deriv-com · Oct 16, 2024 · b3c2b8e · b3c2b8e
1 parent 2990e29
commit b3c2b8e
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 19 deletions.
diff --git a/packages/account/src/Components/poi/idv-status/idv-failed/idv-failed.tsx b/packages/account/src/Components/poi/idv-status/idv-failed/idv-failed.tsx
@@ -127,7 +127,7 @@ const IdvFailed = ({
 
     React.useEffect(() => {
         const initializeFormValues = async (required_fields: string[]) => {
-            await WS.wait('get_settings');
+            await WS?.wait('get_settings');
             const form_data = filterObjProperties(account_settings, required_fields);
             if (form_data.date_of_birth) {
                 form_data.date_of_birth = toMoment(form_data.date_of_birth).format('YYYY-MM-DD');

diff --git a/...s/poi/poi-confirm-with-example-form-container/poi-confirm-with-example-form-container.tsx b/...s/poi/poi-confirm-with-example-form-container/poi-confirm-with-example-form-container.tsx
@@ -54,8 +54,9 @@ const PoiConfirmWithExampleFormContainer = ({
     const side_note_image = <DerivLightNameDobPoiIcon height='195px' width='285px' />;
 
     React.useEffect(() => {
-        const initializeFormValues = () => {
-            WS.wait('get_settings').then(() => {
+        const initializeFormValues = async () => {
+            try {
+                await WS?.wait('get_settings');
                 const visible_settings = ['first_name', 'last_name', 'date_of_birth'];
                 const form_initial_values = filterObjProperties(account_settings, visible_settings);
                 if (form_initial_values.date_of_birth) {
@@ -69,7 +70,10 @@ const PoiConfirmWithExampleFormContainer = ({
                     form_initial_values,
                 });
                 setIsLoading(false);
-            });
+            } catch (e) {
+                // eslint-disable-next-line no-console
+                console.error(e);
+            }
         };
 
         initializeFormValues();

diff --git a/packages/account/src/Sections/Assessment/FinancialAssessment/financial-assessment.tsx b/packages/account/src/Sections/Assessment/FinancialAssessment/financial-assessment.tsx
@@ -237,8 +237,9 @@ const FinancialAssessment = observer(() => {
             setIsLoading(false);
             history.push(routes.personal_details);
         } else {
-            WS.authorized.storage.getFinancialAssessment().then((data: GetFinancialAssessmentResponse) => {
-                WS.wait('get_account_status').then(() => {
+            WS.authorized.storage.getFinancialAssessment().then(async (data: GetFinancialAssessmentResponse) => {
+                try {
+                    await WS.wait('get_account_status');
                     setHasTradingExperience(
                         (is_financial_account || is_trading_experience_incomplete) && !is_svg && !is_mf
                     );
@@ -255,7 +256,10 @@ const FinancialAssessment = observer(() => {
                     }
                     if (data?.get_financial_assessment) setInitialFormValues(data.get_financial_assessment);
                     setIsLoading(false);
-                });
+                } catch (e) {
+                    // eslint-disable-next-line no-console
+                    console.error(e);
+                }
             });
         }
 

diff --git a/packages/account/src/Sections/Verification/ProofOfAddress/proof-of-address-form.tsx b/packages/account/src/Sections/Verification/ProofOfAddress/proof-of-address-form.tsx
@@ -65,7 +65,7 @@ const ProofOfAddressForm = observer(
         const { localize } = useTranslations();
 
         React.useEffect(() => {
-            fetchResidenceList?.().then(() => {
+            fetchResidenceList?.().then(async () => {
                 Promise.all([fetchStatesList(), WS.wait('get_settings')]).then(() => {
                     setFormValues({
                         address_line_1: account_settings.address_line_1 ?? '',

diff --git a/packages/cashier/src/pages/account-transfer/account-transfer.tsx b/packages/cashier/src/pages/account-transfer/account-transfer.tsx
@@ -44,9 +44,15 @@ const AccountTransfer = observer(({ onClickDeposit, onClickNotes, onClose }: TAc
 
     React.useEffect(() => {
         onMount();
-        WS.wait('authorize', 'website_status', 'get_settings', 'paymentagent_list').then(() => {
-            setIsLoadingStatus(false);
-        });
+        (async () => {
+            try {
+                await WS.wait('authorize', 'website_status', 'get_settings', 'paymentagent_list');
+                setIsLoadingStatus(false);
+            } catch (e) {
+                // eslint-disable-next-line no-console
+                console.error(e);
+            }
+        })();
 
         return () => {
             setAccountTransferAmount('');

diff --git a/packages/core/src/Services/socket-general.js b/packages/core/src/Services/socket-general.js
@@ -148,7 +148,7 @@ const BinarySocketGeneral = (() => {
     };
 
     const setBalanceActiveAccount = flow(function* (obj_balance) {
-        yield BinarySocket.wait('website_status');
+        yield BinarySocket?.wait('website_status');
         client_store.setBalanceActiveAccount(obj_balance);
     });
 

diff --git a/packages/core/src/Stores/client-store.js b/packages/core/src/Stores/client-store.js
@@ -1828,7 +1828,7 @@ export default class ClientStore extends BaseStore {
     }
 
     broadcastAccountChangeAfterAuthorize() {
-        return BinarySocket.wait('authorize').then(() => {
+        return BinarySocket?.wait('authorize')?.then(() => {
             this.broadcastAccountChange();
         });
     }
@@ -1879,7 +1879,7 @@ export default class ClientStore extends BaseStore {
 
         if (should_switch_socket_connection) {
             BinarySocket.closeAndOpenNewConnection();
-            await BinarySocket.wait('authorize');
+            await BinarySocket?.wait('authorize');
         } else {
             await WS.forgetAll('balance');
             await BinarySocket.authorize(this.getToken());

diff --git a/packages/core/src/Stores/common-store.js b/packages/core/src/Stores/common-store.js
@@ -122,7 +122,7 @@ export default class CommonStore extends BaseStore {
         if (key === 'EN') {
             window.localStorage.setItem('i18n_language', key);
         }
-        await WS.wait('authorize');
+        await WS?.wait('authorize');
         return new Promise((resolve, reject) => {
             WS.setSettings({
                 set_settings: 1,

diff --git a/packages/core/src/Stores/contract-replay-store.js b/packages/core/src/Stores/contract-replay-store.js
@@ -56,7 +56,7 @@ export default class ContractReplayStore extends BaseStore {
     };
 
     subscribeProposalOpenContract = () => {
-        WS.wait('authorize').then(() => {
+        WS?.wait('authorize')?.then(() => {
             this.handleSubscribeProposalOpenContract(this.contract_id, this.populateConfig);
         });
     };

diff --git a/packages/core/src/Stores/gtm-store.js b/packages/core/src/Stores/gtm-store.js
@@ -80,8 +80,8 @@ export default class GTMStore extends BaseStore {
      * @param {object} data
      */
     async pushDataLayer(data) {
-        if (this.is_gtm_applicable) {
-            BinarySocket.wait('authorize').then(() => {
+        if (this.is_gtm_applicable && this.root_store?.client?.is_logged_in) {
+            BinarySocket?.wait('authorize')?.then(() => {
                 const gtm_object = { ...this.common_variables, ...data };
                 if (!gtm_object.event) return;
 

diff --git a/packages/core/src/_common/base/socket_base.js b/packages/core/src/_common/base/socket_base.js
@@ -553,7 +553,7 @@ const proxyForAuthorize = obj =>
             if (target[field] && typeof target[field] !== 'function') {
                 return proxyForAuthorize(target[field]);
             }
-            return (...args) => BinarySocketBase?.wait('authorize').then(() => target[field](...args));
+            return (...args) => BinarySocketBase?.wait('authorize')?.then(() => target[field](...args));
         },
     });