Merge branch 'develop' of github.com:binary-com/deriv-app into niloof…

…ar/76877/dropdown-component-ts-migration
niloofar-deriv · Jan 24, 2023 · e3d754e · e3d754e
2 parents c7bf806 + 137c3d7
commit e3d754e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/packages/appstore/src/components/total-assets/total-assets.tsx b/packages/appstore/src/components/total-assets/total-assets.tsx
@@ -50,9 +50,11 @@ const TotalAssets = ({ category }: TTotalAssets) => {
             currency: string,
             setExchangeRate: React.Dispatch<React.SetStateAction<number>>
         ) => {
-            getExchangeRate(currency, account_total_balance_currency).then((res: number) => {
-                setExchangeRate(res);
-            });
+            if (currency) {
+                getExchangeRate(currency, account_total_balance_currency).then((res: number) => {
+                    setExchangeRate(res);
+                });
+            }
         };
         if (category === 'real') {
             getCurrentExchangeRate(cfd_real_currency, setExchangedRateCfdReal);

diff --git a/packages/core/src/App/Containers/AccountSwitcher/account-switcher.jsx b/packages/core/src/App/Containers/AccountSwitcher/account-switcher.jsx
@@ -69,9 +69,11 @@ const AccountSwitcher = props => {
 
     React.useEffect(() => {
         const getCurrentExchangeRate = (currency, setExchangeRate) => {
-            props.getExchangeRate(currency, account_total_balance_currency).then(res => {
-                setExchangeRate(res);
-            });
+            if (currency) {
+                props.getExchangeRate(currency, account_total_balance_currency).then(res => {
+                    setExchangeRate(res);
+                });
+            }
         };
         if (cfd_real_currency !== account_total_balance_currency) {
             getCurrentExchangeRate(cfd_real_currency, setExchangedRateCfdReal);