fixing creation of real sibling accounts when on virtual account. (#6734)

Co-authored-by: Hubert Koster <hubertkoster@Huberts-MacBook-Pro.local>

Author: hubert-deriv

src/javascript/app/pages/user/accounts.js

@@ -11,7 +11,8 @@ const urlFor               = require('../../../_common/url').urlFor;
 
 const Accounts = (() => {
     let landing_company;
-    const form_id = '#new_accounts';
+    const form_id          = '#new_accounts';
+    const has_real_account = Client.hasAccountType('real');
 
     const TableHeaders = (() => {
         let table_headers;
@@ -48,12 +49,12 @@ const Accounts = (() => {
 
             let element_to_show = '#no_new_accounts_wrapper';
             const upgrade_info  = Client.getUpgradeInfo();
-            if (upgrade_info.can_upgrade) {
+            if (upgrade_info.can_upgrade && !has_real_account) {
                 populateNewAccounts(upgrade_info);
                 element_to_show = '#new_accounts_wrapper';
             }
 
-            if (upgrade_info.can_open_multi) {
+            if (upgrade_info.can_open_multi || has_real_account && Client.get('is_virtual')) {
                 populateMultiAccount();
             } else if (!can_change_currency) {
                 doneLoading(element_to_show);

src/javascript/app/pages/user/get_currency.js

@@ -5,10 +5,7 @@ const GetCurrency = (() => {
     const getCurrenciesOfOtherAccounts = (is_different_company = false) => {
         const all_loginids     = Client.getAllLoginids();
         const other_currencies = [];
-        // console.log(Client.get('landing_company_shortcode'))
         const current_landing_company_shortcode = Client.get('landing_company_shortcode');
-        // console.log(Client.get('loginid'))
-        // console.log(all_loginids)
         all_loginids.forEach((loginid) => {
             // if it's not current client or under a different landing company, consider the currency
             if (is_different_company) {
@@ -54,34 +51,39 @@ const GetCurrency = (() => {
     };
 
     const getCurrencies = (landing_company, all_fiat) => {
-        const client_currency = Client.get('currency');
-        const is_crypto       = Currency.isCryptocurrency(client_currency);
-        const currency_values = getCurrencyValues();
+        let currencies_to_show = [];
+        const current_client_currency = Client.get('currency');
+        const is_crypto               = Currency.isCryptocurrency(current_client_currency);
+        const currency_values         = getCurrencyValues();
+        const is_virtual              = Client.get('is_virtual');
+        const has_real_account        = Client.hasAccountType('real');
+        const all_client_accounts     = Client.getAllAccountsObject();
+        const all_client_currencies   = Object.values(all_client_accounts).map(account => account.currency);
 
         const allowed_currencies =
               Client.getLandingCompanyValue({ real: 1 }, landing_company, 'legal_allowed_currencies');
 
         const available_crypto =
-              currency_values.cryptocurrencies.filter(c =>
-                  currency_values.other_currencies.concat(is_crypto ? client_currency : []).indexOf(c) < 0 &&
-                  allowed_currencies.indexOf(c) > -1);
-        const can_open_crypto  = available_crypto.length;
+            currency_values.cryptocurrencies.filter(c =>
+                currency_values.other_currencies.concat(is_crypto ?
+                    current_client_currency : all_client_currencies).indexOf(c) < 0 &&
+                        allowed_currencies.indexOf(c) > -1);
 
-        let currencies_to_show = [];
+        const can_open_crypto = available_crypto.length;
 
         // only allow client to open more sub accounts if the last currency is not to be reserved for master account
-        if ((client_currency && (can_open_crypto || !currency_values.has_fiat)) ||
-            (!client_currency && (available_crypto.length > 1 || (can_open_crypto && !currency_values.has_fiat)))) {
+        if ((current_client_currency && (can_open_crypto || !currency_values.has_fiat)) ||
+            (!current_client_currency && (available_crypto.length > 1 ||
+                (can_open_crypto && !currency_values.has_fiat)))) {
             // if have sub account with fiat currency, or master account is fiat currency, only show cryptocurrencies
             // else show all
-            const is_virtual = Client.get('is_virtual');
 
             currencies_to_show =
-                !all_fiat && (currency_values.has_fiat || (!is_crypto && client_currency && !is_virtual)) ?
+                !all_fiat && (currency_values.has_fiat || (!is_crypto && current_client_currency && has_real_account)) ?
                     available_crypto : allowed_currencies;
             // remove client's currency and sub account currencies from list of currencies to show
             const currencies_to_compare = is_virtual ?
-                currency_values.other_currencies : currency_values.other_currencies.concat(client_currency);
+                currency_values.other_currencies : currency_values.other_currencies.concat(current_client_currency);
             currencies_to_show = currencies_to_show.filter(c => currencies_to_compare.indexOf(c) < 0);
         }
 
@@ -90,12 +92,12 @@ const GetCurrency = (() => {
 
     const getAllCurrencies = (landing_company) => {
         const allowed_currencies =
-              Client.getLandingCompanyValue({ real: 1 }, landing_company, 'legal_allowed_currencies');
-        const currency_values = getCurrencyValues();
-        const client_currency = Client.get('currency');
-        const is_virtual = Client.get('is_virtual');
-        const currencies_to_compare = is_virtual ?
-            currency_values.other_currencies : currency_values.other_currencies.concat(client_currency);
+            Client.getLandingCompanyValue({ real: 1 }, landing_company, 'legal_allowed_currencies');
+        const currency_values         = getCurrencyValues();
+        const current_client_currency = Client.get('currency');
+        const is_virtual              = Client.get('is_virtual');
+        const currencies_to_compare   = is_virtual ?
+            currency_values.other_currencies : currency_values.other_currencies.concat(current_client_currency);
 
         return allowed_currencies.filter(c => currencies_to_compare.indexOf(c) < 0);
     };

src/javascript/app/pages/user/set_currency.js

@@ -81,9 +81,8 @@ const SetCurrency = (() => {
 
         onSelection($currency_list, $error, true);
     };
-
     const getAvailableCurrencies = (landing_company, payout_currencies) =>
-        Client.get('landing_company_shortcode') === 'svg' ? GetCurrency.getCurrencies(landing_company) : payout_currencies;
+        Client.hasSvgAccount() ? GetCurrency.getCurrencies(landing_company) : payout_currencies;
 
     const getCurrencyChangeOptions = (landing_company) => {
         const allowed_currencies = Client.getLandingCompanyValue(Client.get('loginid'), landing_company, 'legal_allowed_currencies');
@@ -103,7 +102,6 @@ const SetCurrency = (() => {
             const $wrapper = $('<div/>', { class: 'gr-2 gr-4-m currency_wrapper', id: c });
             const $image   = $('<div/>').append($('<img/>', { src: Url.urlForStatic(`images/pages/set_currency/${c.toLowerCase()}.svg`) }));
             const $name    = $('<div/>', { class: 'currency-name' });
-
             if (Currency.isCryptocurrency(c)) {
                 const $display_name = $('<span/>', {
                     text: Currency.getCurrencyName(c) || c,