fix: added popup for virtual accounnt on smarttrader homepage and wit…

…hdrawal section
binary-com · Jan 27, 2023 · 39163d0 · 39163d0
1 parent ef50173
commit 39163d0
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/src/javascript/app/base/header.js b/src/javascript/app/base/header.js
@@ -149,20 +149,21 @@ const Header = (() => {
                 return;
             }
 
-            const showUpgrade = (url, params, localized_text) => {
+            const showUpgrade = (localized_text) => {
                 applyToAllElements(upgrade_msg, (el) => {
                     el.setVisibility(1);
                     applyToAllElements('a', (ele) => {
-                        ele.html(createElement('span', { text: localized_text })).setVisibility(1).setAttribute('href', Url.urlFor(url, params));
+                        ele.html(createElement('span', { text: localized_text })).setVisibility(1);
+                        ele.addEventListener('click', showGoToDerivAlertPopup);
                     }, '', el);
                 });
             };
 
-            const showUpgradeBtn = (url, params, localized_text) => {
+            const showUpgradeBtn = (localized_text) => {
                 applyToAllElements(upgrade_msg, (el) => {
                     el.setVisibility(1);
                     applyToAllElements('a.button', (ele) => {
-                        ele.html(createElement('span', { text: localized_text })).setVisibility(1).setAttribute('href', Url.urlFor(url, params));
+                        ele.html(createElement('span', { text: localized_text })).setVisibility(1).addEventListener('click', showGoToDerivAlertPopup);
                     }, '', el);
                 });
             };
@@ -197,11 +198,8 @@ const Header = (() => {
                 });
 
                 if (show_upgrade_msg) {
-                    const upgrade_url = upgrade_info.can_upgrade_to.length > 1
-                        ? 'user/accounts'
-                        : 'new_account/real_account';
-                    showUpgrade(upgrade_url, `account_type=${upgrade_info.can_upgrade_to[0]}`, upgrade_link_txt);
-                    showUpgradeBtn(upgrade_url, `account_type=${upgrade_info.can_upgrade_to[0]}`, upgrade_btn_txt);
+                    showUpgrade(upgrade_link_txt);
+                    showUpgradeBtn(upgrade_btn_txt);
                 } else {
                     applyToAllElements(upgrade_msg, (el) => {
                         applyToAllElements('a', (ele) => {
@@ -214,11 +212,8 @@ const Header = (() => {
                 }
             } else if (show_upgrade_msg) {
                 getElementById('virtual-wrapper').setVisibility(0);
-                const upgrade_url = upgrade_info.can_upgrade_to.length > 1
-                    ? 'user/accounts'
-                    : 'new_account/real_account';
-                showUpgrade(upgrade_url, `account_type=${upgrade_info.can_upgrade_to[0]}`, upgrade_link_txt);
-                showUpgradeBtn(upgrade_url, `account_type=${upgrade_info.can_upgrade_to[0]}`, upgrade_btn_txt);
+                showUpgrade(upgrade_link_txt);
+                showUpgradeBtn(upgrade_btn_txt);
 
                 if (/new_account/.test(window.location.href)) {
                     showHidePulser(0);

diff --git a/src/javascript/app/pages/cashier/cashier.js b/src/javascript/app/pages/cashier/cashier.js
@@ -342,6 +342,10 @@ const Cashier = (() => {
                         Header.showGoToDerivAlertPopup();
                         return false;
                     });
+                    el_paymentmethod_withdraw.on('click', () => {
+                        Header.showGoToDerivAlertPopup();
+                        return false;
+                    });
                 }
             });
         }

diff --git a/src/sass/_common/header.scss b/src/sass/_common/header.scss
@@ -22,6 +22,7 @@ body #topbar {
         color: $COLOR_WHITE;
         white-space: nowrap;
         text-decoration: none;
+        cursor: pointer;
     }
     #select_language {
         top: -3px;