Hubert / Changing button names from back to cancel. (#6527)

* changing button names from back to cancel.

* merging and solving conflicts

* fixing flickering loading screen after clicking cancel button.

* restarting circleci

* restarting circleci

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

Author: hubert-deriv

src/javascript/app/pages/user/metatrader/metatrader.ui.js

@@ -633,9 +633,6 @@ const MetaTraderUI = (() => {
             $form.find('#view_3').find('#trading_password_new_user').setVisibility(1);
             if (has_mt5_account) {
                 $form.find('#trading_password_input').setVisibility(0);
-                $form.find('#new_user_cancel_button').on('click', () => {
-                    location.reload();
-                });
                 $form.find('#has_mt5_new_user_btn_submit_new_account').setVisibility(1);
             } else {
                 $form.find('#new_user_btn_submit_new_account').setVisibility(1);

src/templates/app/user/metatrader.jsx

@@ -323,7 +323,7 @@ const Metatrader = () => (
                                         </button>
                                     </div>
                                     <div id='view_3-buttons_new_user' className='gr-padding-10 center-text'>
-                                        <button className='button button-secondary btn-back' id='new_user_cancel_button'>
+                                        <button className='button button-secondary btn-cancel' id='new_user_cancel_button'>
                                             {it.L('Cancel')}
                                         </button>
                                         <a className='button button-primary invisible' id='has_mt5_new_user_btn_submit_new_account' href={it.url_for('user/security/change_passwordws')}>
@@ -352,7 +352,7 @@ const Metatrader = () => (
                                     <div id='ddl_trade_server' type='radio' />
                                     <div id='view_2-buttons' className='gr-padding-10 center-text'>
                                         <a className='button button-secondary btn-back' href='javascript:;'>
-                                            <span>{it.L('Back')}</span>
+                                            <span>{it.L('Cancel')}</span>
                                         </a>
                                         <a className='button btn-next' href='javascript:;'>
                                             <span>{it.L('Next')}</span>