likhith/track js reading loginid of undefined (binary-com#6452)

* fix: added a fallback case if virtual account is not available * fix: added fallback to missing objects containing loginid Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com>
mahdiyeh-deriv · Sep 21, 2022 · 5b8451e · 5b8451e
1 parent df36349
commit 5b8451e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/packages/core/src/App/Containers/AccountSwitcher/account-switcher.jsx b/packages/core/src/App/Containers/AccountSwitcher/account-switcher.jsx
@@ -56,12 +56,12 @@ const AccountSwitcher = props => {
     }, [getMaxAccountsDisplayed]);
 
     React.useEffect(() => {
-        const vrtc_loginid = props.account_list.find(account => account.is_virtual).loginid;
-
-        getExchangeRate(props.accounts[vrtc_loginid].currency, props.obj_total_balance.currency).then(res =>
-            setExchangedRate(res)
-        );
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        const vrtc_loginid = props.account_list.find(account => account.is_virtual)?.loginid;
+        if (vrtc_loginid) {
+            getExchangeRate(props.accounts[vrtc_loginid].currency, props.obj_total_balance.currency).then(res =>
+                setExchangedRate(res)
+            );
+        }
     }, []);
 
     React.useEffect(() => {

diff --git a/packages/core/src/App/Containers/RealAccountSignup/choose-currency.jsx b/packages/core/src/App/Containers/RealAccountSignup/choose-currency.jsx
@@ -91,7 +91,7 @@ const ChooseCurrency = ({
     const doSwitch = async value => {
         const target_account = account_list.filter(account => account.title === value);
         const loginid = target_account.map(x => x.loginid)[0];
-        await switchAccount(loginid);
+        if (loginid) await switchAccount(loginid);
     };
 
     const onSubmit = async obj => {

diff --git a/packages/p2p/src/utils/orders.js b/packages/p2p/src/utils/orders.js
@@ -61,7 +61,7 @@ export default class ExtendedOrderDetails {
     }
 
     get is_my_ad() {
-        return this.order_details.advertiser_details.loginid === this.loginid;
+        return this.order_details?.advertiser_details?.loginid === this.loginid;
     }
 
     get is_inactive_order() {