Merge branch 'master' of github.com:binary-com/binary-static into replacing_reset_password_text

Author: mitchell-deriv

scripts/config/pages.js

@@ -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/js_texts/extracted_strings_app.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',

src/images/pages/deactivated_account/lock.svg

@@ -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/javascript/_autogenerated/ach.js

@@ -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()) {

src/javascript/_autogenerated/es.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/fr.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/id.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/it.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/pl.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/pt.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/ru.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;

src/javascript/_autogenerated/vi.js

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: binary-static\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"PO-Revision-Date: 2021-06-01 09:32\n"
+"PO-Revision-Date: 2021-06-02 07:58\n"
 "Last-Translator: \n"
 "Language-Team: Acholi\n"
 "MIME-Version: 1.0\n"
@@ -1009,6 +1009,9 @@ msgstr "crwdns45895:0crwdne45895:0"
 msgid "Account Closure"
 msgstr "crwdns85223:0crwdne85223:0"
 
+msgid "Account Deactivated"
+msgstr "crwdns163208:0crwdne163208:0"
+
 msgid "Account Deposit Currency"
 msgstr "crwdns46002:0crwdne46002:0"
 
@@ -2182,6 +2185,12 @@ msgstr "crwdns53614:0crwdne53614:0"
 msgid "Binary options trading frequency"
 msgstr "crwdns53616:0crwdne53616:0"
 
+msgid "Binary options trading is not available in your country."
+msgstr "crwdns163210:0crwdne163210:0"
+
+msgid "Binary options trading is not available in your financial account."
+msgstr "crwdns163212:0crwdne163212:0"
+
 msgid "Binary options trading is relatively easy. You can purchase a contract in just three steps:"
 msgstr "crwdns42035:0crwdne42035:0"
 
@@ -10306,12 +10315,6 @@ msgstr "crwdns39806:0crwdne39806:0"
 msgid "Sorry, an error occurred while processing your request."
 msgstr "crwdns39807:0crwdne39807:0"
 
-msgid "Sorry, but binary options trading is not available in your country."
-msgstr "crwdns161634:0crwdne161634:0"
-
-msgid "Sorry, but binary options trading is not available in your financial account."
-msgstr "crwdns68770:0crwdne68770:0"
-
 msgid "Sorry, deposits for this currency are currently disabled."
 msgstr "crwdns90076:0crwdne90076:0"
 
@@ -10321,15 +10324,9 @@ msgstr "crwdns87372:0crwdne87372:0"
 msgid "Sorry, no mobile phone bills"
 msgstr "crwdns158518:0crwdne158518:0"
 
-msgid "Sorry, this feature is available to virtual accounts only."
-msgstr "crwdns39808:0crwdne39808:0"
-
 msgid "Sorry, this feature is not available in your jurisdiction."
 msgstr "crwdns39809:0crwdne39809:0"
 
-msgid "Sorry, this page is not available in your country of residence."
-msgstr "crwdns162194:0crwdne162194:0"
-
 msgid "Sorry, withdrawals for this currency are currently disabled."
 msgstr "crwdns90078:0crwdne90078:0"
 
@@ -12577,6 +12574,9 @@ msgstr "crwdns118290:0%1crwdne118290:0"
 msgid "This document (the \"Agreement\") sets out the terms and conditions between \"the Company\", which is Deriv Services Ltd, and the person who has applied for this programme (\"the Affiliate\"), in relation to the Affiliate's application to set up an affiliate account (and membership of the affiliate programme if the Affiliate's application is deemed successful)."
 msgstr "crwdns118292:0crwdne118292:0"
 
+msgid "This feature is available to virtual accounts only."
+msgstr "crwdns163214:0crwdne163214:0"
+
 msgid "This feature is not relevant to virtual-money accounts."
 msgstr "crwdns40159:0crwdne40159:0"
 
@@ -12643,6 +12643,9 @@ msgstr "crwdns56146:0%1crwdne56146:0"
 msgid "This obligation encompasses the prohibition of unlawful payments or the granting of any form of unlawful benefits to public officials, business partners, employees, family members, or any other partners."
 msgstr "crwdns55786:0crwdne55786:0"
 
+msgid "This page is not available in your country of residence."
+msgstr "crwdns163216:0crwdne163216:0"
+
 msgid "This page is only available to logged out clients."
 msgstr "crwdns52504:0crwdne52504:0"
 
@@ -14749,6 +14752,9 @@ msgstr "crwdns40729:0crwdne40729:0"
 msgid "Your account is fully authenticated and your withdrawal limits have been lifted."
 msgstr "crwdns40731:0crwdne40731:0"
 
+msgid "Your account is now deactivated."
+msgstr "crwdns163218:0crwdne163218:0"
+
 msgid "Your account is now deactived."
 msgstr "crwdns162570:0crwdne162570:0"