Merge branch 'master' into remove_ctyptocurrency_market

Author: mahdiyeh-deriv

package-lock.json

@@ -109,9 +109,9 @@
     "ws": "7.0.0"
   },
   "dependencies": {
-    "@binary-com/binary-document-uploader": "^2.4.4",
+    "@binary-com/binary-document-uploader": "^2.4.6",
     "@binary-com/binary-style": "^0.2.25",
-    "@binary-com/webtrader-charts": "0.5.18",
+    "@binary-com/webtrader-charts": "0.5.19",
     "@deriv/dashboard": "0.0.4",
     "@deriv/p2p": "^0.5.1",
     "@livechat/customer-sdk": "^2.0.4",

package.json

@@ -72,6 +72,7 @@ module.exports = [
 
     // ==================== Section: "static" ====================
     ['404',                                     'static/404',                                  'full_width', '404'],
+    ['deactivated-account',                     'static/deactivated_account',                  'full_width', 'Account Deactivated'],
     ['home',                                    'static/home',                                 'full_width', 'Online trading platform for binary options on forex, stock indices, commodities and Synthetic indices'],
     ['keep-safe',                               'static/keep_safe',                            'full_width', 'Keep Safe'],
     ['tour',                                    'static/tour',                                 'full_width', 'Tour'],

scripts/config/pages.js

@@ -56,6 +56,8 @@ module.exports = [
     'Binance USD',
     'Binary Coin',
     'Binary Password Reset',
+    'Binary options trading is not available in your country.',
+    'Binary options trading is not available in your financial account.',
     'Binary password',
     'Bitcoin',
     'Blurry photo detected',
@@ -525,13 +527,9 @@ module.exports = [
     'Sorry, account signup is not available in your country.',
     'Sorry, an error occurred while processing your account.',
     'Sorry, an error occurred while processing your request.',
-    'Sorry, but binary options trading is not available in your country.',
-    'Sorry, but binary options trading is not available in your financial account.',
     'Sorry, deposits for this currency are currently disabled.',
     'Sorry, no mobile phone bills',
-    'Sorry, this feature is available to virtual accounts only.',
     'Sorry, this feature is not available in your jurisdiction.',
-    'Sorry, this page is not available in your country of residence.',
     'Sorry, withdrawals for this currency are currently disabled.',
     'Spot',
     'Spot Time',
@@ -601,6 +599,7 @@ module.exports = [
     'This contract is only available on [_1]DTrader[_2].',
     'This contract lost',
     'This contract won',
+    'This feature is available to virtual accounts only.',
     'This feature is not relevant to virtual-money accounts.',
     'This field is required.',
     'This is a staging server - For testing purposes only',
@@ -609,6 +608,7 @@ module.exports = [
     'This is a very common password',
     'This is similar to a commonly used password',
     'This is your [_1] account.',
+    'This page is not available in your country of residence.',
     'This page is only available to logged out clients.',
     'This password is on the blacklist',
     'Thursday',

scripts/js_texts/extracted_strings_app.js

@@ -4,14 +4,16 @@ const getLanguage         = require('../language').get;
 const isMobile            = require('../os_detect').isMobile;
 const isStorageSupported  = require('../storage').isStorageSupported;
 const LocalStore          = require('../storage').LocalStore;
+const removeCookies       = require('../storage').removeCookies;
 const urlForCurrentDomain = require('../url').urlForCurrentDomain;
 const isLoginPages        = require('../utility').isLoginPages;
 const TrafficSource       = require('../../app/common/traffic_source');
 const getAppId            = require('../../config').getAppId;
 
 const Login = (() => {
     const redirectToLogin = (reset_password) => {
-        if ((!Client.isLoggedIn() && !isLoginPages() && isStorageSupported(sessionStorage)) || reset_password) {
+        removeCookies('hide_guide');
+        if (!Client.isLoggedIn() && !isLoginPages() && isStorageSupported(sessionStorage) || reset_password) {
             sessionStorage.setItem('redirect_url', window.location.href);
             window.location.href = loginUrl();
         }

src/images/pages/deactivated_account/lock.svg

@@ -102,12 +102,12 @@ const BinaryLoader = (() => {
 
     const error_messages = {
         login            : () => localize('Please [_1]log in[_2] or [_3]sign up[_4] to view this page.', [`<a href="${'javascript:;'}">`, '</a>', `<a href="${urlFor('new-account')}">`, '</a>']),
-        only_virtual     : () => localize('Sorry, this feature is available to virtual accounts only.'),
+        only_virtual     : () => localize('This feature is available to virtual accounts only.'),
         only_real        : () => localize('This feature is not relevant to virtual-money accounts.'),
         not_authenticated: () => localize('This page is only available to logged out clients.'),
-        no_mf            : () => localize('Sorry, but binary options trading is not available in your financial account.'),
-        options_blocked  : () => localize('Sorry, but binary options trading is not available in your country.'),
-        residence_blocked: () => localize('Sorry, this page is not available in your country of residence.'),
+        no_mf            : () => localize('Binary options trading is not available in your financial account.'),
+        options_blocked  : () => localize('Binary options trading is not available in your country.'),
+        residence_blocked: () => localize('This page is not available in your country of residence.'),
     };
 
     const loadHandler = (this_page) => {
@@ -148,6 +148,9 @@ const BinaryLoader = (() => {
                 }
             });
         }
+        if (this_page === 'deactivated-account' && Client.isLoggedIn()) {
+            displayMessage(error_messages.not_deactivated());
+        }
 
         BinarySocket.wait('authorize').then(() => {
             if (config.no_blocked_country && Client.isLoggedIn() && Client.isOptionsBlocked()) {
@@ -181,6 +184,7 @@ const BinaryLoader = (() => {
         if (!content) {
             return;
         }
+        content.classList.add('container');
 
         const div_container = createElement('div', { class: 'logged_out_title_container', html: Client.isAccountOfType('financial') || Client.isOptionsBlocked() ? '' : content.getElementsByTagName('h1')[0] || '' });
         const div_notice = createElement('p', { class: 'center-text notice-msg', html: localized_message });

src/javascript/_autogenerated/ach.js

@@ -55,6 +55,7 @@ const VideoFacility           = require('../pages/user/video_facility');
 // const Charity            = require('../../static/pages/charity');
 const Contact             = require('../../static/pages/contact');
 // const Contact2            = require('../../static/pages/contact_2');
+const DeactivatedAccount  = require('../../static/pages/deactivated_account');
 const GetStarted          = require('../../static/pages/get_started');
 const Home                = require('../../static/pages/home');
 const KeepSafe            = require('../../static/pages/keep_safe');
@@ -142,6 +143,7 @@ const pages_config = {
     'binary-options'         : { module: GetStarted.BinaryOptions },
     // 'contact-2'              : { module: Contact2 },
     'contract-specifications': { module: TabSelector },
+    'deactivated-account'    : { module: DeactivatedAccount },
     'get-started'            : { module: TabSelector },
     'how-to-trade-mt5'       : { module: TabSelector },
     'ib-faq'                 : { module: StaticPages.IBProgrammeFAQ },

src/javascript/_autogenerated/es.js

@@ -119,7 +119,7 @@ const Client = (() => {
 
         if (response.logout !== 1) return;
         removeCookies('login', 'loginid', 'loginid_list', 'email', 'residence', 'settings'); // backward compatibility
-        removeCookies('reality_check', 'affiliate_token', 'affiliate_tracking', 'onfido_token');
+        removeCookies('reality_check', 'affiliate_token', 'affiliate_tracking', 'onfido_token', 'hide_guide');
         // clear elev.io session storage
         sessionStorage.removeItem('_elevaddon-6app');
         sessionStorage.removeItem('_elevaddon-6create');

src/javascript/_autogenerated/fr.js

@@ -46,7 +46,6 @@ const Guide = (() => {
 
         makeButton();
     };
-
     /*
      *  do not show the guide button if its close (X) has been clicked before
      */

src/javascript/_autogenerated/id.js

@@ -776,7 +776,8 @@ const Authenticate = (() => {
     };
 
     const showSuccess = () => {
-        BinarySocket.send({ get_account_status: 1 }, { forced: true }).then(() => {
+        BinarySocket.send({ get_account_status: 1 }, { forced: true }).then(response => {
+            authentication_object = response.get_account_status.authentication;
             Header.displayAccountStatus();
             removeButtonLoading();
             $button.setVisibility(0);
@@ -788,7 +789,8 @@ const Authenticate = (() => {
     };
 
     const showSuccessUns = () => {
-        BinarySocket.send({ get_account_status: 1 }, { forced: true }).then(() => {
+        BinarySocket.send({ get_account_status: 1 }, { forced: true }).then(response => {
+            authentication_object = response.get_account_status.authentication;
             Header.displayAccountStatus();
             removeButtonLoadingUns();
             $button_uns.setVisibility(0);
@@ -904,6 +906,9 @@ const Authenticate = (() => {
         const type_pending = type === 'identity' ? 'poa' : 'poi';
         const description_status = status !== 'verified';
 
+        $(`#text_verified_${type_pending}_required, #text_pending_${type_pending}_required`).setVisibility(0);
+        $(`#button_verified_${type_pending}_required, #button_pending_${type_pending}_required`).setVisibility(0);
+
         if (needs_verification.includes(type)) {
             $(`#text_${status}_${type_required}_required`).setVisibility(1);
             $(`#button_${status}_${type_required}_required`).setVisibility(1);
@@ -921,7 +926,8 @@ const Authenticate = (() => {
             onfido.tearDown();
             $('#authentication_loading').setVisibility(1);
             setTimeout(() => {
-                BinarySocket.send({ get_account_status: 1 }, { forced: true }).then(() => {
+                BinarySocket.send({ get_account_status: 1 }, { forced: true }).then(response => {
+                    authentication_object = response.get_account_status.authentication;
                     $('#msg_personal_details').setVisibility(0);
                     $('#upload_complete').setVisibility(1);
                     Header.displayAccountStatus();

src/javascript/_autogenerated/it.js

@@ -52,7 +52,7 @@ const PortfolioInit = (() => {
         const $div      = $('<div/>');
         $div.append($('<tr/>', { class: `tr-first ${new_class} ${data.contract_id}`, id: data.contract_id })
             .append($('<td/>', { class: 'ref' }).append($(`<span ${GetAppDetails.showTooltip(data.app_id, oauth_apps[data.app_id])} data-balloon-position="right">${data.transaction_id}</span>`)))
-            .append($('<td/>', { class: 'payout' }).append($('<strong/>', { html: +data.payout ? formatMoney(data.currency, data.payout) : '-' })))
+            .append($('<td/>', { class: `payout ${!data.payout ? 'is_empty' : ''}` }).append($('<strong/>', { html: +data.payout ? formatMoney(data.currency, data.payout) : '-' })))
             .append($('<td/>', { class: 'details', text: data.longcode }))
             .append($('<td/>', { class: 'purchase' }).append($('<strong/>', { html: formatMoney(data.currency, data.buy_price) })))
             .append($('<td/>', { class: 'indicative' }).append($('<strong/>', { class: 'indicative_price', text: '--.--' })))

src/javascript/_autogenerated/pl.js

@@ -181,16 +181,7 @@ const AccountClosure = (() => {
                 }
                 el_step_2_submit.setAttribute('disabled', false);
             } else {
-                el_submit_loading.setVisibility(0);
-                showStep(3);
-                window.scrollTo({ top: 0, behavior: 'smooth' });
-
-                sessionStorage.setItem('closingAccount', 1);
-                setTimeout(() => {
-                    // we need to clear all stored client data by performing a logout action and then redirect to home
-                    // otherwise it will think that client is still logged in and redirect to trading page
-                    Client.sendLogoutRequest(false, Url.urlFor('home'));
-                }, 10000);
+                Client.sendLogoutRequest(false, Url.urlFor('deactivated-account'));
             }
         });
     };

src/javascript/_autogenerated/pt.js

@@ -0,0 +1,24 @@
+const Url        = require('../../../javascript/_common/url.js');
+const Client     = require('../../app/base/client');
+const BinaryPjax = require('../../app/base/binary_pjax');
+
+const DeactivatedAccount = (() => {
+    const onLoad = () => {
+        const redirect_home = Url.urlFor('home');
+        const redirect_trading = Url.urlFor('trading');
+        setTimeout(() => {
+            if (Client.isLoggedIn()) {
+                BinaryPjax.load(redirect_trading);
+            } else {
+                BinaryPjax.load(redirect_home);
+            }
+            
+        }, 5000);
+    };
+
+    return {
+        onLoad,
+    };
+})();
+
+module.exports = DeactivatedAccount;

src/javascript/_autogenerated/ru.js

@@ -380,7 +380,7 @@ input[type=checkbox] {
 
 .logged_out_title_container {
     margin-top: 40px;
-    margin-bottom: 30px;
+    margin-bottom: 40px;
 }
 
 button .barspinner.white {

src/javascript/_autogenerated/vi.js

@@ -60,6 +60,9 @@ table {
         &[data-balloon] {
             border-bottom: 3px solid $COLOR_LIGHT_GRAY;
         }
+        &.is_empty {
+            text-align: center;
+        }
     }
     .w-80 {
         width: 80px;

src/javascript/_autogenerated/zh_cn.js

@@ -1642,6 +1642,41 @@ body #not_authenticated_financial ul.checked > li {
     }
 }
 
+.deactivated-account-content {
+    text-align: center;
+
+    .close-user-account {
+        height: 25vh;
+
+        .msg_main_modal {
+            .notice-msg {
+                background-color: transparent;
+                height: auto;
+                margin: auto;
+
+                img {
+                    width: 4rem;
+                    margin-bottom: 1rem;
+                }
+                p {
+                    font-weight: 500;
+                }
+                h1 {
+                    @media (max-width: 500px) {
+                        font-size: 30px;
+                    }
+                }
+                @media (max-width: 500px) {
+                    width: 90%;
+                }
+            }
+        }
+        @media (max-width: 500px) {
+            margin-bottom: 5rem;
+        }
+    }
+}
+
 .account-closure {
     .notice-msg-wrapper {
         background-color: $COLOR_YELLOW;

src/javascript/_autogenerated/zh_tw.js

@@ -0,0 +1,19 @@
+import React from 'react';
+
+const DeactivatedAccount = () => (
+    <div id='msg_main' className='center-text gr-gutter gr-padding-30 close-user-account'>
+        <div className='msg_main_modal'>
+            <div className='notice-msg'>
+                <img className='responsive' src={it.url_for('images/pages/deactivated_account/lock.svg')} alt='Lock image' />
+                <h1>
+                    {it.L('We\'re sorry to see you leave.')}
+                </h1>
+                <p>
+                    {it.L('Your account is now deactivated.')}
+                </p>
+            </div>
+        </div>
+    </div>
+);
+
+export default DeactivatedAccount;